Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1fc96ea9 authored by James Lemieux's avatar James Lemieux
Browse files

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
parent bd088c42

tests/robotests/src/com/android/settings/applications/appinfo/AppMemoryPreferenceControllerTest.java

+0 −5
Original line number Diff line number Diff line
@@ -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

+0 −5
Original line number Diff line number Diff line
@@ -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,

tests/robotests/src/com/android/settings/development/DevelopmentSettingsDashboardFragmentTest.java

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -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

+0 −1
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ public class RedactionInterstitialTest { 


    @After

    public void tearDown() {

        ShadowUserManager.getShadow().reset();

        ShadowRestrictedLockUtilsInternal.reset();

    }