Merge "Prepare tests for impending robolectric merge"

2018-11-20 17:49:57 +00:00
parent 1e24cb02dc 1fc96ea98d
commit 3673833417
13 changed files with 1 additions and 54 deletions
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/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,