Merge "Prepare tests for impending robolectric merge"

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() {

tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java

@@ -95,11 +95,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,

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

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

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();
     }
 

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);

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();

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);
     }
 

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

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);
     }

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);

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",

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()),