From 739b0eef10b9701282712f905a4904cad54ad2c8 Mon Sep 17 00:00:00 2001 From: Daniel Nishi Date: Thu, 17 Aug 2017 14:34:05 -0700 Subject: [PATCH] Move the Robolectric shadow config up. In my testing, this reduces the runtime of the Robolectric Settings test suite on my Z840 workstation from 440 seconds to 402 seconds on average. By avoiding having a method-level Robolectric shadow import, we avoid going down a code path which needs to add more shadows later in the Robolectric execution. Bug: 64808827 Test: Settings robotests still pass Change-Id: I7b40d73b30306ae3f9759281afbd7f7266579e24 --- .../settings/DeviceInfoSettingsTest.java | 7 +++++-- .../com/android/settings/MasterClearTest.java | 9 +++++---- .../android/settings/SecuritySettingsTest.java | 9 +++++---- .../AccountHeaderPreferenceControllerTest.java | 7 +++++-- .../AccountPreferenceControllerTest.java | 13 ------------- .../applications/InstalledAppDetailsTest.java | 8 +++++--- .../SuggestionFeatureProviderImplTest.java | 16 +++++----------- ...nagementSwitchPreferenceControllerTest.java | 9 +++++---- .../AutoRotatePreferenceControllerTest.java | 8 +++++--- ...estureSettingsPreferenceControllerTest.java | 8 +++++--- .../MobileNetworkPreferenceControllerTest.java | 7 +++++-- .../search/DatabaseIndexingManagerTest.java | 18 +++++++++--------- .../security/ConfigureKeyGuardDialogTest.java | 7 +++++-- .../FactoryResetPreferenceControllerTest.java | 8 +++++--- .../widget/RtlCompatibleViewPagerTest.java | 7 +++++-- 15 files changed, 74 insertions(+), 67 deletions(-) diff --git a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java index 51034dd3d25..c5a18339a76 100644 --- a/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java +++ b/tests/robotests/src/com/android/settings/DeviceInfoSettingsTest.java @@ -45,7 +45,11 @@ import org.robolectric.annotation.Config; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = ShadowUtils.class +) public class DeviceInfoSettingsTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -83,7 +87,6 @@ public class DeviceInfoSettingsTest { } @Test - @Config(shadows = ShadowUtils.class) public void testNonIndexableKeys_existInXmlLayout() { final Context context = RuntimeEnvironment.application; final List niks = DeviceInfoSettings.SEARCH_INDEX_DATA_PROVIDER diff --git a/tests/robotests/src/com/android/settings/MasterClearTest.java b/tests/robotests/src/com/android/settings/MasterClearTest.java index 21b8e475dea..838b1e88f69 100644 --- a/tests/robotests/src/com/android/settings/MasterClearTest.java +++ b/tests/robotests/src/com/android/settings/MasterClearTest.java @@ -33,7 +33,6 @@ import android.os.Bundle; import android.provider.Settings; import android.view.LayoutInflater; import android.view.View; -import android.widget.CheckBox; import android.widget.LinearLayout; import android.widget.ScrollView; @@ -46,12 +45,15 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowActivity; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {ShadowUtils.class} +) public class MasterClearTest { @Mock @@ -144,7 +146,6 @@ public class MasterClearTest { } @Test - @Config(shadows = { ShadowUtils.class }) public void testInitiateMasterClear_inDemoMode_sendsIntent() { ShadowUtils.setIsDemoUser(true); diff --git a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java index 5838642b635..3d0d5a1f9c2 100644 --- a/tests/robotests/src/com/android/settings/SecuritySettingsTest.java +++ b/tests/robotests/src/com/android/settings/SecuritySettingsTest.java @@ -60,7 +60,11 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {ShadowLockPatternUtils.class} +) public class SecuritySettingsTest { private static final String MOCK_SUMMARY = "summary"; @@ -181,9 +185,6 @@ public class SecuritySettingsTest { } @Test - @Config (shadows = { - ShadowLockPatternUtils.class, - }) public void testNonIndexableKeys_existInXmlLayout() { final Context context = spy(RuntimeEnvironment.application); UserManager manager = mock(UserManager.class); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java index 4dce0c69a5f..34ac1839ec6 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountHeaderPreferenceControllerTest.java @@ -50,7 +50,11 @@ import org.robolectric.annotation.Implements; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = AccountHeaderPreferenceControllerTest.ShadowAuthenticatorHelper.class +) public class AccountHeaderPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -83,7 +87,6 @@ public class AccountHeaderPreferenceControllerTest { } @Test - @Config(shadows = ShadowAuthenticatorHelper.class) public void onResume_shouldDisplayAccountInEntityHeader() { final Lifecycle lifecycle = new Lifecycle(); final Account account = new Account("name1@abc.com", "com.abc"); diff --git a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java index f4f093a296d..139bee79f6d 100644 --- a/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/AccountPreferenceControllerTest.java @@ -111,7 +111,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_linkedUser_shouldAddOneAccountCategory() { final UserInfo info = new UserInfo(1, "user 1", 0); when(mUserManager.isManagedProfile()).thenReturn(false); @@ -124,7 +123,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_oneProfile_shouldAddOneAccountCategory() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -138,7 +136,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_twoProfiles_shouldAddTwoAccountCategory() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -153,7 +150,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_noProfileChange_shouldNotAddOrRemoveAccountCategory() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -171,7 +167,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_oneNewProfile_shouldAddOneAccountCategory() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -189,7 +184,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_oneProfileRemoved_shouldRemoveOneAccountCategory() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -207,7 +201,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_oneProfile_shouldSetAccountTitleWithUserName() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", UserInfo.FLAG_MANAGED_PROFILE)); @@ -226,7 +219,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_noPreferenceScreen_shouldNotCrash() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -244,7 +236,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_noPreferenceManager_shouldNotCrash() { when(mFragment.getPreferenceManager()).thenReturn(null); final List infos = new ArrayList<>(); @@ -337,7 +328,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_twoAccountsOfSameType_shouldAddThreePreferences() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -417,7 +407,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_noAccountChange_shouldNotAddAccountPreference() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -498,7 +487,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_oneNewAccountType_shouldAddOneAccountPreference() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); @@ -534,7 +522,6 @@ public class AccountPreferenceControllerTest { } @Test - @Config(shadows = {ShadowAccountManager.class, ShadowContentResolver.class}) public void onResume_oneAccountRemoved_shouldRemoveOneAccountPreference() { final List infos = new ArrayList<>(); infos.add(new UserInfo(1, "user 1", 0)); diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java index e20a43556ab..1de7c9f3a4b 100644 --- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java @@ -83,7 +83,11 @@ import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = InstalledAppDetailsTest.ShadowUtils.class +) public final class InstalledAppDetailsTest { private static final String PACKAGE_NAME = "test_package_name"; @@ -491,7 +495,6 @@ public final class InstalledAppDetailsTest { } @Test - @Config(shadows = ShadowUtils.class) public void handleDisableable_appIsEnabled_buttonShouldWork() { final ApplicationInfo info = new ApplicationInfo(); info.packageName = "pkg"; @@ -513,7 +516,6 @@ public final class InstalledAppDetailsTest { } @Test - @Config(shadows = ShadowUtils.class) public void handleDisableable_appIsEnabledAndInKeepEnabledWhitelist_buttonShouldNotWork() { final ApplicationInfo info = new ApplicationInfo(); info.packageName = "pkg"; diff --git a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java index 59b918a936f..45d04a45657 100644 --- a/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java @@ -69,9 +69,11 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, - shadows = ShadowSecureSettings.class) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {ShadowSecureSettings.class, SettingsShadowResources.class} +) public class SuggestionFeatureProviderImplTest { private static final String DOUBLE_TWIST_SENSOR_NAME = "double_twist_sensor_name"; @@ -115,7 +117,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() { SettingsShadowResources.overrideResource( com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, false); @@ -126,7 +127,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_doubleTapPower_falseWhenNotVisited() { SettingsShadowResources.overrideResource( com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true); @@ -138,7 +138,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_doubleTapPower_trueWhenVisited() { SettingsShadowResources.overrideResource( com.android.internal.R.bool.config_cameraDoubleTapPowerGestureEnabled, true); @@ -151,7 +150,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_doubleTwist_trueWhenNotAvailable() { SettingsShadowResources.overrideResource( R.string.gesture_double_twist_sensor_name, "nonexistant name"); @@ -164,7 +162,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_ambientDisplay_falseWhenNotVisited() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_dozeComponent, "foo"); @@ -178,7 +175,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_ambientDisplay_trueWhenVisited() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_dozeComponent, "foo"); @@ -193,7 +189,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_ambientDisplayPickup_falseWhenNotVisited() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_dozeComponent, "foo"); @@ -207,7 +202,6 @@ public class SuggestionFeatureProviderImplTest { } @Test - @Config(shadows = SettingsShadowResources.class) public void isSuggestionCompleted_ambientDisplayPickup_trueWhenVisited() { SettingsShadowResources.overrideResource( com.android.internal.R.string.config_dozeComponent, "foo"); diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java index 6b0bed1f595..b737d1f6341 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceControllerTest.java @@ -52,7 +52,11 @@ import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {SettingsShadowSystemProperties.class} +) public class AutomaticStorageManagementSwitchPreferenceControllerTest { @Mock @@ -86,7 +90,6 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { } @Test - @Config(shadows = {SettingsShadowSystemProperties.class}) public void isAvailable_shouldAlwaysReturnFalse_forLowRamDevice() { SettingsShadowSystemProperties.set("ro.config.low_ram", "true"); assertThat(mController.isAvailable()).isFalse(); @@ -160,7 +163,6 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { } - @Config(shadows = {SettingsShadowSystemProperties.class}) @Test public void togglingOnShouldNotTriggerWarningFragmentIfEnabledByDefault() { FragmentTransaction transaction = mock(FragmentTransaction.class); @@ -174,7 +176,6 @@ public class AutomaticStorageManagementSwitchPreferenceControllerTest { verify(transaction, never()).add(any(), eq(ActivationWarningFragment.TAG)); } - @Config(shadows = {SettingsShadowSystemProperties.class}) @Test public void togglingOnShouldTriggerWarningFragmentIfEnabledByDefaultAndDisabledByPolicy() { FragmentTransaction transaction = mock(FragmentTransaction.class); diff --git a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java index 6d9cbab317c..06fd2972ef6 100644 --- a/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/AutoRotatePreferenceControllerTest.java @@ -45,7 +45,11 @@ import static org.mockito.Matchers.anyString; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = ShadowSystemSettings.class +) public class AutoRotatePreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -88,7 +92,6 @@ public class AutoRotatePreferenceControllerTest { } @Test - @Config(shadows = ShadowSystemSettings.class) public void updatePreference_settingsIsOff_shouldTurnOffToggle() { Settings.System.putIntForUser(mContentResolver, Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT); @@ -99,7 +102,6 @@ public class AutoRotatePreferenceControllerTest { } @Test - @Config(shadows = ShadowSystemSettings.class) public void updatePreference_settingsIsOn_shouldTurnOnToggle() { Settings.System.putIntForUser(mContentResolver, Settings.System.ACCELEROMETER_ROTATION, 1, UserHandle.USER_CURRENT); diff --git a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java index 6767346527b..7633ce902ff 100644 --- a/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/gestures/AssistGestureSettingsPreferenceControllerTest.java @@ -43,7 +43,11 @@ import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = ShadowSecureSettings.class +) public class AssistGestureSettingsPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -86,7 +90,6 @@ public class AssistGestureSettingsPreferenceControllerTest { } @Test - @Config(shadows = ShadowSecureSettings.class) public void testSetValue_updatesCorrectly() { int newValue = 1; ContentResolver resolver = mContext.getContentResolver(); @@ -99,7 +102,6 @@ public class AssistGestureSettingsPreferenceControllerTest { } @Test - @Config(shadows = ShadowSecureSettings.class) public void testGetValue_correctValueReturned() { int currentValue = 1; ContentResolver resolver = mContext.getContentResolver(); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 66e357b53a5..2c11e0c21dd 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -47,7 +47,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = ShadowRestrictedLockUtilsWrapper.class +) public class MobileNetworkPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) @@ -88,7 +92,6 @@ public class MobileNetworkPreferenceControllerTest { } @Test - @Config(shadows = ShadowRestrictedLockUtilsWrapper.class) public void wifiOnly_prefIsNotAvailable() { when(mUserManager.isAdminUser()).thenReturn(true); when(mUserManager.hasUserRestriction(anyString(), any(UserHandle.class))) diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index 3641368cb96..70ed568447d 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -79,8 +79,15 @@ import java.util.Map; import java.util.Set; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION, - shadows = {ShadowRunnableAsyncTask.class}) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = { + ShadowRunnableAsyncTask.class, + ShadowDatabaseIndexingUtils.class, + ShadowContentResolver.class + } +) public class DatabaseIndexingManagerTest { private final String localeStr = "en_US"; @@ -747,7 +754,6 @@ public class DatabaseIndexingManagerTest { // Test new public indexing flow @Test - @Config(shadows = {ShadowDatabaseIndexingUtils.class}) public void testPerformIndexing_fullIndex_getsDataFromProviders() { DummyProvider provider = new DummyProvider(); provider.onCreate(); @@ -767,7 +773,6 @@ public class DatabaseIndexingManagerTest { } @Test - @Config(shadows = {ShadowDatabaseIndexingUtils.class,}) public void testPerformIndexing_incrementalIndex_noDataAdded() { final List providerInfo = getDummyResolveInfo(); skipFullIndex(providerInfo); @@ -792,7 +797,6 @@ public class DatabaseIndexingManagerTest { } @Test - @Config(shadows = {ShadowDatabaseIndexingUtils.class,}) public void testPerformIndexing_localeChanged_databaseDropped() { DummyProvider provider = new DummyProvider(); provider.onCreate(); @@ -830,7 +834,6 @@ public class DatabaseIndexingManagerTest { } @Test - @Config(shadows = {ShadowDatabaseIndexingUtils.class,}) public void testPerformIndexing_onOta_FullIndex() { DummyProvider provider = new DummyProvider(); provider.onCreate(); @@ -851,7 +854,6 @@ public class DatabaseIndexingManagerTest { } @Test - @Config(shadows = {ShadowDatabaseIndexingUtils.class,}) public void testPerformIndexing_onPackageChange_shouldFullIndex() { final List providers = getDummyResolveInfo(); final String buildNumber = Build.FINGERPRINT; @@ -873,7 +875,6 @@ public class DatabaseIndexingManagerTest { } @Test - @Config(shadows = {ShadowDatabaseIndexingUtils.class,}) public void testPerformIndexing_onOta_buildNumberIsCached() { DummyProvider provider = new DummyProvider(); provider.onCreate(); @@ -1017,7 +1018,6 @@ public class DatabaseIndexingManagerTest { } @Test - @Config(shadows = {ShadowContentResolver.class}) public void testEmptyNonIndexableKeys_emptyDataKeyResources_addedToDatabase() { insertSpecialCase(TITLE_ONE, true /* enabled */, null /* dataReferenceKey */); diff --git a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java index 1a37decf67b..1809e880d09 100644 --- a/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java +++ b/tests/robotests/src/com/android/settings/security/ConfigureKeyGuardDialogTest.java @@ -34,11 +34,14 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = ShadowEventLogWriter.class +) public class ConfigureKeyGuardDialogTest { @Test - @Config(shadows = ShadowEventLogWriter.class) public void displayDialog_clickPositiveButton_launchSetNewPassword() { final FragmentController fragmentController = Robolectric.buildFragment(ConfigureKeyGuardDialog.class); diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java index 7310ae09eee..b986e4f7f54 100644 --- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java @@ -37,7 +37,11 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {ShadowSecureSettings.class, ShadowUtils.class} +) public class FactoryResetPreferenceControllerTest { private static final String FACTORY_RESET_KEY = "factory_reset"; @@ -72,7 +76,6 @@ public class FactoryResetPreferenceControllerTest { } @Test - @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class }) public void isAvailable_nonSystemUser() { when(mUserManager.isAdminUser()).thenReturn(false); ShadowUtils.setIsDemoUser(false); @@ -81,7 +84,6 @@ public class FactoryResetPreferenceControllerTest { } @Test - @Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class }) public void isAvailable_demoUser() { when(mUserManager.isAdminUser()).thenReturn(false); ShadowUtils.setIsDemoUser(true); diff --git a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java index ea27d051f74..78afc43026c 100644 --- a/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java +++ b/tests/robotests/src/com/android/settings/widget/RtlCompatibleViewPagerTest.java @@ -34,7 +34,11 @@ import org.robolectric.shadows.ShadowApplication; import static com.google.common.truth.Truth.assertThat; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config( + manifest = TestConfig.MANIFEST_PATH, + sdk = TestConfig.SDK_VERSION, + shadows = {ShadowTextUtils.class} +) public class RtlCompatibleViewPagerTest { private Locale mLocaleEn; @@ -51,7 +55,6 @@ public class RtlCompatibleViewPagerTest { } @Test - @Config(shadows = {ShadowTextUtils.class}) public void testGetCurrentItem_shouldMaintainIndexDuringLocaleChange() { testRtlCompatibleInner(0); testRtlCompatibleInner(1);