PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update WebViewAppPickerTest to sdk 26

Browse Source 
Test: make RunSettingsRoboTests -j40
Change-Id: I78bc9c11f713343eb2565f34a8137c3575e741d9
This commit is contained in:
jeffreyhuang
2017-12-01 15:50:06 -08:00
parent 7ec34c1781
commit 8db0979651
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
View File

@@ -17,7 +17,9 @@
package com.android.settings.webview; package com.android.settings.webview;
import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS; import static android.provider.Settings.ACTION_WEBVIEW_SETTINGS;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any; import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.eq; import static org.mockito.Matchers.eq;
@@ -43,7 +45,6 @@ import android.os.UserManager;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.applications.defaultapps.DefaultAppInfo; import com.android.settings.applications.defaultapps.DefaultAppInfo;
import com.android.settings.core.instrumentation.MetricsFeatureProvider; import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.widget.RadioButtonPreference; import com.android.settings.widget.RadioButtonPreference;
import com.android.settings.wrapper.UserPackageWrapper; import com.android.settings.wrapper.UserPackageWrapper;
@@ -62,16 +63,16 @@ import org.robolectric.util.ReflectionHelpers;
import java.util.Arrays; import java.util.Arrays;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O)
public class WebViewAppPickerTest { public class WebViewAppPickerTest {
private Context mContext = RuntimeEnvironment.application; private Context mContext;
private UserInfo mFirstUser; private UserInfo mFirstUser;
private UserInfo mSecondUser; private UserInfo mSecondUser;
private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME"; private final static String DEFAULT_PACKAGE_NAME = "DEFAULT_PACKAGE_NAME";
@Mock(answer = Answers.RETURNS_DEEP_STUBS) @Mock
private Activity mActivity; private Activity mActivity;
@Mock @Mock
private UserManager mUserManager; private UserManager mUserManager;
@@ -90,8 +91,8 @@ public class WebViewAppPickerTest {
@Before @Before
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mActivity); mContext = spy(RuntimeEnvironment.application);
when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager); doReturn(mUserManager).when(mContext).getSystemService(Context.USER_SERVICE);
mFirstUser = new UserInfo(0, "FIRST_USER", 0); mFirstUser = new UserInfo(0, "FIRST_USER", 0);
mSecondUser = new UserInfo(0, "SECOND_USER", 0); mSecondUser = new UserInfo(0, "SECOND_USER", 0);
mPicker = new WebViewAppPicker(); mPicker = new WebViewAppPicker();
@@ -168,7 +169,7 @@ public class WebViewAppPickerTest {
@Test @Test
public void testDisabledPackageShownAsDisabled() { public void testDisabledPackageShownAsDisabled() {
String disabledReason = "disabled"; String disabledReason = "disabled";
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager, DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason); createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
RadioButtonPreference mockPreference = mock(RadioButtonPreference.class); RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -183,7 +184,7 @@ public class WebViewAppPickerTest {
@Test @Test
public void testEnabledPackageShownAsEnabled() { public void testEnabledPackageShownAsEnabled() {
String disabledReason = ""; String disabledReason = "";
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager, DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason); createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
RadioButtonPreference mockPreference = mock(RadioButtonPreference.class); RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -198,7 +199,7 @@ public class WebViewAppPickerTest {
@Test @Test
public void testDisabledPackageShowsDisabledReasonSummary() { public void testDisabledPackageShowsDisabledReasonSummary() {
String disabledReason = "disabled"; String disabledReason = "disabled";
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager, DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason); createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
RadioButtonPreference mockPreference = mock(RadioButtonPreference.class); RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -214,7 +215,7 @@ public class WebViewAppPickerTest {
@Test @Test
public void testEnabledPackageShowsEmptySummary() { public void testEnabledPackageShowsEmptySummary() {
String disabledReason = null; String disabledReason = null;
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager, DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason); createApplicationInfo(DEFAULT_PACKAGE_NAME), disabledReason);
RadioButtonPreference mockPreference = mock(RadioButtonPreference.class); RadioButtonPreference mockPreference = mock(RadioButtonPreference.class);
@@ -228,14 +229,14 @@ public class WebViewAppPickerTest {
@Test @Test
public void testFinishIfNotAdmin() { public void testFinishIfNotAdmin() {
doReturn(false).when(mUserManager).isAdminUser(); doReturn(false).when(mUserManager).isAdminUser();
mPicker.onAttach((Context) mActivity); mPicker.onAttach(mContext);
verify(mActivity, times(1)).finish(); verify(mActivity, times(1)).finish();
} }
@Test @Test
public void testNotFinishedIfAdmin() { public void testNotFinishedIfAdmin() {
doReturn(true).when(mUserManager).isAdminUser(); doReturn(true).when(mUserManager).isAdminUser();
mPicker.onAttach((Context) mActivity); mPicker.onAttach(mContext);
verify(mActivity, never()).finish(); verify(mActivity, never()).finish();
} }
@@ -348,7 +349,7 @@ public class WebViewAppPickerTest {
PackageItemInfo mockPackageItemInfo = mock(PackageItemInfo.class); PackageItemInfo mockPackageItemInfo = mock(PackageItemInfo.class);
mockPackageItemInfo.packageName = DEFAULT_PACKAGE_NAME; mockPackageItemInfo.packageName = DEFAULT_PACKAGE_NAME;
when(mockPackageItemInfo.loadLabel(any())).thenReturn("myPackage"); when(mockPackageItemInfo.loadLabel(any())).thenReturn("myPackage");
DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mActivity, mPackageManager, DefaultAppInfo webviewAppInfo = mPicker.createDefaultAppInfo(mContext, mPackageManager,
mockPackageItemInfo, "" /* disabledReason */); mockPackageItemInfo, "" /* disabledReason */);
PackageInfo packageInfo = new PackageInfo(); PackageInfo packageInfo = new PackageInfo();