From 1fc96ea98d4e1e9e873fedcd07ec002d64c2c1ea Mon Sep 17 00:00:00 2001 From: James Lemieux Date: Mon, 19 Nov 2018 16:48:58 -0800 Subject: [PATCH] Prepare tests for impending robolectric merge Setting's ShadowUserManager.reset() was unnecessary and collided with a newly introduced reset() method in its super class. It has been removed. Test: make -j56 RunSettingsGoogleRoboTests && make -j56 RunSettingsRoboTests && make -j56 RunSettingsLibRoboTests Change-Id: I63c50eca0de3581fd4f64f4862233446f5937d0c --- .../AppMemoryPreferenceControllerTest.java | 5 ----- .../settings/datausage/DataUsageSummaryTest.java | 5 ----- .../DevelopmentSettingsDashboardFragmentTest.java | 1 - .../DevelopmentSwitchBarControllerTest.java | 1 - .../notification/RedactionInterstitialTest.java | 1 - .../EncryptionStatusPreferenceControllerTest.java | 5 ----- ...trictedEncryptionPreferenceControllerTest.java | 5 ----- .../slices/SlicesDatabaseAccessorTest.java | 1 - .../system/SystemDashboardFragmentTest.java | 1 - .../testutils/shadow/ShadowUserManager.java | 15 +-------------- ...AddUserWhenLockedPreferenceControllerTest.java | 5 ----- .../users/EditUserInfoControllerTest.java | 5 ----- .../settings/users/UserCapabilitiesTest.java | 5 ----- 13 files changed, 1 insertion(+), 54 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java index 733e22ebf6b..ed77bd96030 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java @@ -77,11 +77,6 @@ public class AppMemoryPreferenceControllerTest { when(mFragment.getActivity()).thenReturn(mActivity); } - @After - public void tearDown() { - ShadowUserManager.getShadow().reset(); - } - @Test @Config(qualifiers = "mcc999") public void getAvailabilityStatus_developmentSettingsEnabled_shouldReturnAvailable() { diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java index 49e3e864c9f..3813aa5e0d1 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java @@ -91,11 +91,6 @@ public class DataUsageSummaryTest { .createSummaryProvider(mActivity, mSummaryLoader); } - @After - public void tearDown() { - ShadowUserManager.getShadow().reset(); - } - @Test public void formatUsage_shouldLookLikeFormatFileSize() { SettingsShadowResources.overrideResource(com.android.internal.R.string.fileSizeSuffix, diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java index a3abb073472..d2c9b65455d 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java @@ -75,7 +75,6 @@ public class DevelopmentSettingsDashboardFragmentTest { @After public void tearDown() { ShadowEnableDevelopmentSettingWarningDialog.reset(); - mShadowUserManager.reset(); } @Test diff --git a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java index 688db762832..da0dcaf9ef5 100644 --- a/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/DevelopmentSwitchBarControllerTest.java @@ -70,7 +70,6 @@ public class DevelopmentSwitchBarControllerTest { @After public void tearDown() { ShadowUtils.reset(); - ShadowUserManager.getShadow().reset(); } @Test diff --git a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java index b62495c9fe8..2f273aed9e2 100644 --- a/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java +++ b/tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java @@ -48,7 +48,6 @@ public class RedactionInterstitialTest { @After public void tearDown() { - ShadowUserManager.getShadow().reset(); ShadowRestrictedLockUtilsInternal.reset(); } diff --git a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java index 8221b1547b4..c7fdeae5bc1 100644 --- a/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/EncryptionStatusPreferenceControllerTest.java @@ -57,11 +57,6 @@ public class EncryptionStatusPreferenceControllerTest { mPreference = new Preference(mContext); } - @After - public void tearDown() { - mShadowUserManager.reset(); - } - @Test public void isAvailable_admin_true() { mShadowUserManager.setIsAdminUser(true); diff --git a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java index 6bd5e1fc34d..8c7eaa54181 100644 --- a/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/security/RestrictedEncryptionPreferenceControllerTest.java @@ -63,11 +63,6 @@ public class RestrictedEncryptionPreferenceControllerTest { mUserManager = ShadowUserManager.getShadow(); } - @After - public void tearDown() { - mUserManager.reset(); - } - @Test public void isAvailable_noRestriction_shouldReturnTrue() { assertThat(mCredentialStoragePreferenceController.isAvailable()).isTrue(); diff --git a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java index bebf7978f48..f628c87b39d 100644 --- a/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java +++ b/tests/robotests/src/com/android/settings/slices/SlicesDatabaseAccessorTest.java @@ -90,7 +90,6 @@ public class SlicesDatabaseAccessorTest { @After public void cleanUp() { - ShadowUserManager.getShadow().reset(); DatabaseTestUtils.clearDb(mContext); } diff --git a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java index 5f787a968a9..2785c66266e 100644 --- a/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/system/SystemDashboardFragmentTest.java @@ -48,7 +48,6 @@ public class SystemDashboardFragmentTest { @After public void tearDown() { SettingsShadowResources.reset(); - ShadowUserManager.getShadow().reset(); } @Test diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java index 61278f38529..ccfcc2d7055 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUserManager.java @@ -49,19 +49,6 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager private int[] profileIdsForUser = new int[0]; private boolean mUserSwitchEnabled; - - @Resetter - public void reset() { - mUserInfos.clear(); - mRestrictions.clear(); - mUserProfileInfos.clear(); - mRestrictionSources.clear(); - mManagedProfiles.clear(); - mIsQuietModeEnabled = false; - mUserSwitchEnabled = false; - profileIdsForUser = new int[0]; - } - public void setUserInfo(int userHandle, UserInfo userInfo) { mUserInfos.put(userHandle, userInfo); } @@ -90,7 +77,7 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager } @Implementation - public List getUserProfiles(){ + public List getUserProfiles() { int[] userIds = getProfileIds(UserHandle.myUserId(), true /* enabledOnly */); List result = new ArrayList<>(userIds.length); for (int userId : userIds) { diff --git a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java index 2bd12c30c5b..e31dce283ab 100644 --- a/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/AddUserWhenLockedPreferenceControllerTest.java @@ -63,11 +63,6 @@ public class AddUserWhenLockedPreferenceControllerTest { mController = new AddUserWhenLockedPreferenceController(mContext, "fake_key"); } - @After - public void tearDown() { - mUserManager.reset(); - } - @Test public void displayPref_NotAdmin_shouldNotDisplay() { mUserManager.setUserInfo(0, mUserInfo); diff --git a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java index 97b3e69e06a..73046887528 100644 --- a/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java +++ b/tests/robotests/src/com/android/settings/users/EditUserInfoControllerTest.java @@ -105,11 +105,6 @@ public class EditUserInfoControllerTest { mController = new TestEditUserInfoController(); } - @After - public void tearDown() { - mUserManager.reset(); - } - @Test public void photoControllerOnActivityResult_whenWaiting_isCalled() { mController.createDialog(mFragment, mCurrentIcon, "test user", diff --git a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java index c8d36857e57..894def75a67 100644 --- a/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java +++ b/tests/robotests/src/com/android/settings/users/UserCapabilitiesTest.java @@ -45,11 +45,6 @@ public class UserCapabilitiesTest { mUserManager = ShadowUserManager.getShadow(); } - @After - public void tearDown() { - mUserManager.reset(); - } - @Test public void disallowUserSwitch_restrictionIsSet_true() { mUserManager.setUserRestriction(UserHandle.of(UserHandle.myUserId()),