diff options
43 files changed, 226 insertions, 57 deletions
diff --git a/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java b/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java new file mode 100644 index 000000000000..b597868fb22b --- /dev/null +++ b/packages/SystemUI/tests/src/com/android/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java @@ -0,0 +1,128 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package com.android; + +import static org.junit.Assert.assertFalse; + +import android.support.test.filters.LargeTest; +import android.support.test.filters.MediumTest; +import android.support.test.filters.SmallTest; +import android.support.test.internal.runner.ClassPathScanner; +import android.support.test.internal.runner.ClassPathScanner.ChainedClassNameFilter; +import android.support.test.internal.runner.ClassPathScanner.ExternalClassNameFilter; +import android.support.test.internal.runner.TestLoader; +import android.testing.AndroidTestingRunner; +import android.text.TextUtils; +import android.util.Log; + +import com.android.systemui.SysuiBaseFragmentTest; +import com.android.systemui.SysuiTestCase; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; + +/** + * This is named AAAPlusPlusVerifySysuiRequiredTestPropertiesTest for two reasons. + * a) Its so awesome it deserves an AAA++ + * b) It should run first to draw attention to itself. + * + * For trues though: this test verifies that all the sysui tests extend the right classes. + * This matters because including tests with different context implementations in the same + * test suite causes errors, such as the incorrect settings provider being cached. + * For an example, see {@link com.android.systemui.DependencyTest}. + */ +@RunWith(AndroidTestingRunner.class) +@SmallTest +public class AAAPlusPlusVerifySysuiRequiredTestPropertiesTest extends SysuiTestCase { + + private static final String TAG = "AAA++VerifyTest"; + + private static final Class[] BASE_CLS_WHITELIST = { + SysuiTestCase.class, + SysuiBaseFragmentTest.class, + }; + + private static final Class[] SUPPORTED_SIZES = { + SmallTest.class, + MediumTest.class, + LargeTest.class, + android.test.suitebuilder.annotation.SmallTest.class, + android.test.suitebuilder.annotation.MediumTest.class, + android.test.suitebuilder.annotation.LargeTest.class, + }; + + @Test + public void testAllClassInheritance() { + boolean anyClassWrong = false; + TestLoader loader = new TestLoader(); + for (String className : getClassNamesFromClassPath()) { + Class<?> cls = loader.loadIfTest(className); + if (cls == null) continue; + + boolean hasParent = false; + for (Class<?> parent : BASE_CLS_WHITELIST) { + if (parent.isAssignableFrom(cls)) { + hasParent = true; + break; + } + } + boolean hasSize = hasSize(cls); + if (!hasSize) { + anyClassWrong = true; + Log.e(TAG, cls.getName() + " does not have size annotation, such as @SmallTest"); + } + if (!hasParent) { + anyClassWrong = true; + Log.e(TAG, cls.getName() + " does not extend any of " + getClsStr()); + } + } + + assertFalse("All sysui test classes must have size and extend one of " + getClsStr(), + anyClassWrong); + } + + private boolean hasSize(Class<?> cls) { + for (int i = 0; i < SUPPORTED_SIZES.length; i++) { + if (cls.getDeclaredAnnotation(SUPPORTED_SIZES[i]) != null) return true; + } + return false; + } + + private Collection<String> getClassNamesFromClassPath() { + ClassPathScanner scanner = new ClassPathScanner(mContext.getPackageCodePath()); + + ChainedClassNameFilter filter = new ChainedClassNameFilter(); + + filter.add(new ExternalClassNameFilter()); + filter.add(s -> s.startsWith("com.android.systemui") + || s.startsWith("com.android.keyguard")); + try { + return scanner.getClassPathEntries(filter); + } catch (IOException e) { + Log.e(TAG, "Failed to scan classes", e); + } + return Collections.emptyList(); + } + + private String getClsStr() { + return TextUtils.join(",", Arrays.asList(BASE_CLS_WHITELIST) + .stream().map(cls -> cls.getSimpleName()).toArray()); + } +} diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java index 1c9f8133a15f..855adb451020 100644 --- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java +++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockAccessibilityDelegateTest.java @@ -19,26 +19,26 @@ package com.android.keyguard; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import android.content.Context; -import android.support.test.InstrumentationRegistry; +import android.support.test.filters.SmallTest; import android.text.TextUtils; import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityNodeInfo; import android.widget.TextView; +import com.android.systemui.SysuiTestCase; + import org.junit.Before; import org.junit.Test; import java.util.List; -public class KeyguardClockAccessibilityDelegateTest { +@SmallTest +public class KeyguardClockAccessibilityDelegateTest extends SysuiTestCase { - private Context mContext; private TextView mView; @Before public void setUp() throws Exception { - mContext = InstrumentationRegistry.getContext(); mView = new TextView(mContext); mView.setText(R.string.keyguard_widget_12_hours_format); mView.setContentDescription(mContext.getString(R.string.keyguard_widget_12_hours_format)); diff --git a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java index c297ae840bb9..3426e117ab13 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/DependencyTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.os.Looper; +import android.support.test.filters.SmallTest; import com.android.systemui.Dependency.DependencyKey; import com.android.systemui.statusbar.policy.FlashlightController; @@ -30,6 +31,7 @@ import org.junit.Test; import java.io.PrintWriter; +@SmallTest public class DependencyTest extends SysuiTestCase { public static final DependencyKey<Dumpable> DUMPABLE = new DependencyKey<>("dumpable"); diff --git a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java index 0aac1c01e175..9b675295d26a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java +++ b/packages/SystemUI/tests/src/com/android/systemui/SysuiTestCase.java @@ -20,6 +20,7 @@ import android.os.Handler; import android.os.Looper; import android.os.MessageQueue; import android.support.test.InstrumentationRegistry; +import android.support.test.filters.SmallTest; import android.testing.LeakCheck; import android.util.Log; diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java index d20360234c74..7519b2d572ab 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java @@ -43,6 +43,7 @@ import android.testing.AndroidTestingRunner; import android.view.Display; import com.android.internal.hardware.AmbientDisplayConfiguration; +import com.android.systemui.SysuiTestCase; import com.android.systemui.util.wakelock.WakeLockFake; import android.testing.UiThreadTest; @@ -54,7 +55,7 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidTestingRunner.class) @UiThreadTest -public class DozeMachineTest { +public class DozeMachineTest extends SysuiTestCase { DozeMachine mMachine; diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java index ada8ac085527..720e9f0a62d5 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java @@ -25,13 +25,14 @@ import static org.mockito.Mockito.when; import android.support.test.filters.SmallTest; import android.view.Display; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.phone.DozeParameters; import org.junit.Before; import org.junit.Test; @SmallTest -public class DozeScreenStatePreventingAdapterTest { +public class DozeScreenStatePreventingAdapterTest extends SysuiTestCase { private DozeMachine.Service mInner; private DozeScreenStatePreventingAdapter mWrapper; diff --git a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java index 8934460c380e..97d9080093f8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java @@ -32,6 +32,7 @@ import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import com.android.internal.hardware.AmbientDisplayConfiguration; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.phone.DozeParameters; import com.android.systemui.util.wakelock.WakeLock; import com.android.systemui.util.wakelock.WakeLockFake; @@ -44,8 +45,7 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class DozeTriggersTest { - private Context mContext; +public class DozeTriggersTest extends SysuiTestCase { private DozeTriggers mTriggers; private DozeMachine mMachine; private DozeHostFake mHost; @@ -65,7 +65,6 @@ public class DozeTriggersTest { @Before public void setUp() throws Exception { mInstrumentation = InstrumentationRegistry.getInstrumentation(); - mContext = InstrumentationRegistry.getContext(); mMachine = mock(DozeMachine.class); mHost = new DozeHostFake(); mConfig = DozeConfigurationUtil.createMockConfig(); diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityControllerTest.java index 0f2878bd2dd4..5fb0a3ef9b2b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityControllerTest.java @@ -40,6 +40,7 @@ import android.os.UserHandle; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; import com.android.systemui.keyguard.WorkLockActivity; import com.android.systemui.keyguard.WorkLockActivityController; import com.android.systemui.recents.misc.SystemServicesProxy; @@ -58,7 +59,7 @@ import org.mockito.MockitoAnnotations; */ @SmallTest @RunWith(AndroidJUnit4.class) -public class WorkLockActivityControllerTest { +public class WorkLockActivityControllerTest extends SysuiTestCase { private static final int USER_ID = 333; private static final int TASK_ID = 444; diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityTest.java b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityTest.java index 9b868dbff714..9f3573f6a4ee 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityTest.java @@ -33,6 +33,7 @@ import android.content.Intent; import android.graphics.Color; import android.os.Looper; +import com.android.systemui.SysuiTestCase; import com.android.systemui.keyguard.WorkLockActivity; import org.junit.Before; @@ -46,7 +47,7 @@ import org.mockito.MockitoAnnotations; */ @SmallTest @RunWith(AndroidJUnit4.class) -public class WorkLockActivityTest { +public class WorkLockActivityTest extends SysuiTestCase { private static final @UserIdInt int USER_ID = 270; private static final String TASK_LABEL = "task label"; diff --git a/packages/SystemUI/tests/src/com/android/systemui/plugins/VersionInfoTest.java b/packages/SystemUI/tests/src/com/android/systemui/plugins/VersionInfoTest.java index 984980049e44..0b4d9b525c1b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/plugins/VersionInfoTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/plugins/VersionInfoTest.java @@ -17,6 +17,8 @@ package com.android.systemui.plugins; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import android.support.test.filters.SmallTest; + import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.VersionInfo.InvalidVersionException; import com.android.systemui.plugins.annotations.Requires; @@ -28,6 +30,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +@SmallTest public class VersionInfoTest extends SysuiTestCase { @Rule diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java index 0a945ab23618..7cbe98594d68 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSDetailTest.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.test.filters.FlakyTest; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -45,7 +45,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @RunWithLooper -@FlakyTest +@SmallTest public class QSDetailTest extends SysuiTestCase { private MetricsLogger mMetricsLogger; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java index 09c5725ed72c..402b12d6e9e2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterTest.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.support.test.filters.FlakyTest; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -40,7 +40,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @RunWithLooper -@FlakyTest +@SmallTest public class QSFooterTest extends LeakCheckedTest { private QSFooter mFooter; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java index 601d4e235ffb..0b7da1f145b2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSFragmentTest.java @@ -29,6 +29,7 @@ import com.android.systemui.Dependency; import com.android.systemui.R; import android.os.Parcelable; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import com.android.systemui.SysuiBaseFragmentTest; @@ -50,7 +51,7 @@ import android.widget.FrameLayout; @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) -@FlakyTest +@SmallTest public class QSFragmentTest extends SysuiBaseFragmentTest { private MetricsLogger mMockMetricsLogger; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java index 5f6fc33d6e34..e5ff866acb3c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/QSPanelTest.java @@ -16,10 +16,10 @@ package com.android.systemui.qs; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -import android.support.test.filters.FlakyTest; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -38,7 +38,7 @@ import java.util.Collections; @RunWith(AndroidTestingRunner.class) @RunWithLooper -@FlakyTest +@SmallTest public class QSPanelTest extends SysuiTestCase { private MetricsLogger mMetricsLogger; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileAdapterTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileAdapterTest.java index 6e7d99e49ec1..0239ab090dfc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileAdapterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/customize/TileAdapterTest.java @@ -18,6 +18,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -33,6 +34,7 @@ import java.util.Collections; @RunWith(AndroidTestingRunner.class) @RunWithLooper +@SmallTest public class TileAdapterTest extends SysuiTestCase { private TileAdapter mTileAdapter; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java index 59483f2df5bb..f9f4f497a2ec 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSIconViewImplTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.when; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.service.quicksettings.Tile; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.UiThreadTest; import android.widget.ImageView; @@ -39,6 +40,7 @@ import org.mockito.ArgumentMatcher; @RunWith(AndroidTestingRunner.class) @UiThreadTest +@SmallTest public class QSIconViewImplTest extends SysuiTestCase { private QSIconViewImpl mIconView; diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java index 9ed9d28cd96c..0500a546856d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.Intent; import android.metrics.LogMaker; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -48,6 +49,7 @@ import org.mockito.ArgumentMatcher; @RunWith(AndroidTestingRunner.class) @RunWithLooper +@SmallTest public class QSTileImplTest extends SysuiTestCase { public static final int POSITION = 14; diff --git a/packages/SystemUI/tests/src/com/android/systemui/settings/CurrentUserTrackerTest.java b/packages/SystemUI/tests/src/com/android/systemui/settings/CurrentUserTrackerTest.java index 9e15a054d22f..17d7a4183b16 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/settings/CurrentUserTrackerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/settings/CurrentUserTrackerTest.java @@ -17,6 +17,7 @@ package com.android.systemui.settings; import android.content.Intent; +import android.support.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; @@ -26,6 +27,7 @@ import org.junit.Test; /** * Testing functionality of the current user tracker */ +@SmallTest public class CurrentUserTrackerTest extends SysuiTestCase { private CurrentUserTracker mTracker; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java index c13d13b8a6fe..8cacb4bc84b9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import android.content.ComponentName; import android.graphics.Rect; import android.os.Bundle; +import android.support.test.filters.SmallTest; import com.android.internal.statusbar.StatusBarIcon; import com.android.systemui.SysuiTestCase; @@ -31,6 +32,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +@SmallTest public class CommandQueueTest extends SysuiTestCase { private CommandQueue mCommandQueue; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java index a3a0a6f2c8d8..1161987d2f2c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/ExpandableNotificationRowTest.java @@ -29,6 +29,7 @@ import android.support.test.runner.AndroidJUnit4; import android.view.View; import com.android.systemui.statusbar.stack.NotificationChildrenContainer; +import com.android.systemui.SysuiTestCase; import org.junit.Assert; import org.junit.Before; @@ -38,16 +39,13 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -@FlakyTest -public class ExpandableNotificationRowTest { +public class ExpandableNotificationRowTest extends SysuiTestCase { - private Context mContext; private ExpandableNotificationRow mGroup; private NotificationTestHelper mNotificationTestHelper; @Before public void setUp() throws Exception { - mContext = InstrumentationRegistry.getTargetContext(); mNotificationTestHelper = new NotificationTestHelper(mContext); mGroup = mNotificationTestHelper.createGroup(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationContentViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationContentViewTest.java index fecf90181fa2..8dcc4082c65c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationContentViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationContentViewTest.java @@ -35,18 +35,17 @@ import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; +import com.android.systemui.SysuiTestCase; + @SmallTest @RunWith(AndroidJUnit4.class) -@FlakyTest -public class NotificationContentViewTest { +public class NotificationContentViewTest extends SysuiTestCase { NotificationContentView mView; - Context mContext; @Before @UiThreadTest public void setup() { - mContext = InstrumentationRegistry.getTargetContext(); mView = new NotificationContentView(mContext, null); ExpandableNotificationRow row = new ExpandableNotificationRow(mContext, null); ExpandableNotificationRow mockRow = spy(row); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java index 00f2b1872a91..fc9b608005fe 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java @@ -26,6 +26,7 @@ import android.view.View; import android.widget.RemoteViews; import com.android.systemui.R; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.notification.NotificationCustomViewWrapper; import com.android.systemui.statusbar.notification.NotificationViewWrapper; @@ -37,16 +38,13 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -@FlakyTest -public class NotificationCustomViewWrapperTest { +public class NotificationCustomViewWrapperTest extends SysuiTestCase { - private Context mContext; private ExpandableNotificationRow mRow; @Before @UiThreadTest public void setUp() { - mContext = InstrumentationRegistry.getTargetContext(); mRow = new ExpandableNotificationRow(mContext, null); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java index 9249df662daf..e0d8042238d2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationMenuRowTest.java @@ -16,6 +16,7 @@ package com.android.systemui.statusbar; import static junit.framework.Assert.assertTrue; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -30,6 +31,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) +@SmallTest public class NotificationMenuRowTest extends LeakCheckedTest { @Before diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java index f9f40a6a69b0..33de3ad7fd00 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java @@ -33,6 +33,7 @@ import android.support.test.runner.AndroidJUnit4; import android.widget.RemoteViews; import com.android.systemui.R; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.NotificationTestHelper; @@ -47,17 +48,14 @@ import java.util.concurrent.CountDownLatch; @SmallTest @RunWith(AndroidJUnit4.class) -@FlakyTest -public class NotificationInflaterTest { +public class NotificationInflaterTest extends SysuiTestCase { - private Context mContext; private NotificationInflater mNotificationInflater; private Notification.Builder mBuilder; private ExpandableNotificationRow mRow; @Before public void setUp() throws Exception { - mContext = InstrumentationRegistry.getTargetContext(); mBuilder = new Notification.Builder(mContext).setSmallIcon( R.drawable.ic_person) .setContentTitle("Title") diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java index 7a72afdbdfd4..ebeb24c881a2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationViewWrapperTest.java @@ -18,9 +18,11 @@ package com.android.systemui.statusbar.notification; import android.content.Context; import android.support.test.InstrumentationRegistry; +import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import android.view.View; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.ExpandableNotificationRow; import org.junit.Before; @@ -28,14 +30,8 @@ import org.junit.Test; import org.junit.runner.RunWith; @RunWith(AndroidJUnit4.class) -public class NotificationViewWrapperTest { - - private Context mContext; - - @Before - public void setUp() throws Exception { - mContext = InstrumentationRegistry.getTargetContext(); - } +@SmallTest +public class NotificationViewWrapperTest extends SysuiTestCase { @Test public void constructor_doesntUseViewContext() throws Exception { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/VisualStabilityManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/VisualStabilityManagerTest.java index e4c4373548d4..95ce0d89cd2c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/VisualStabilityManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/VisualStabilityManagerTest.java @@ -20,6 +20,7 @@ import android.service.notification.StatusBarNotification; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.NotificationData; import com.android.systemui.statusbar.notification.VisibilityLocationProvider; @@ -37,7 +38,7 @@ import static org.mockito.Mockito.when; @SmallTest @RunWith(AndroidJUnit4.class) -public class VisualStabilityManagerTest { +public class VisualStabilityManagerTest extends SysuiTestCase { private VisualStabilityManager mVisualStabilityManager = new VisualStabilityManager(); private VisualStabilityManager.Callback mCallback = mock(VisualStabilityManager.Callback.class); diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java index e41a827098c6..0937ce27501c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/AutoTileManagerTest.java @@ -22,6 +22,8 @@ import static org.mockito.Mockito.verify; import com.android.internal.app.NightDisplayController; import com.android.systemui.Prefs; import com.android.systemui.Prefs.Key; + +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import com.android.systemui.SysuiTestCase; import com.android.systemui.qs.QSTileHost; @@ -33,6 +35,7 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; @RunWith(AndroidTestingRunner.class) +@SmallTest public class AutoTileManagerTest extends SysuiTestCase { private QSTileHost mQsTileHost; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java index 6ddbffccaa96..66524cc2b193 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CollapsedStatusBarFragmentTest.java @@ -21,6 +21,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.app.StatusBarManager; +import android.support.test.filters.SmallTest; import android.view.View; import android.view.ViewPropertyAnimator; @@ -39,6 +40,7 @@ import org.mockito.Mockito; @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) +@SmallTest public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest { private NotificationIconAreaController mMockNotificiationAreaController; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java index ee104402e706..e89ff9733388 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/DozeParametersTest.java @@ -18,6 +18,8 @@ package com.android.systemui.statusbar.phone; import android.support.test.runner.AndroidJUnit4; import android.test.suitebuilder.annotation.SmallTest; + +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.phone.DozeParameters.IntInOutMatcher; import org.junit.Test; import org.junit.runner.RunWith; @@ -28,7 +30,7 @@ import static junit.framework.Assert.fail; @SmallTest @RunWith(AndroidJUnit4.class) -public class DozeParametersTest { +public class DozeParametersTest extends SysuiTestCase { @Test public void test_inOutMatcher_defaultIn() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java index 53d842a01ed2..a120cecb55e8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NavigationBarFragmentTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.Looper; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.LeakCheck.Tracker; import android.view.Display; @@ -46,6 +47,7 @@ import org.mockito.stubbing.Answer; @RunWith(AndroidTestingRunner.class) @RunWithLooper(setAsMainLooper = true) +@SmallTest public class NavigationBarFragmentTest extends SysuiBaseFragmentTest { public NavigationBarFragmentTest() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java index ecae39a61c29..5db77925b25e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarIconControllerTest.java @@ -18,6 +18,7 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper.RunWithLooper; import android.view.ViewGroup; @@ -36,6 +37,7 @@ import org.junit.runner.RunWith; @RunWith(AndroidTestingRunner.class) @RunWithLooper +@SmallTest public class StatusBarIconControllerTest extends LeakCheckedTest { @Before diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BluetoothControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BluetoothControllerImplTest.java index f516d74f4062..2eb95603cef0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BluetoothControllerImplTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BluetoothControllerImplTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.when; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothProfile; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -40,6 +41,7 @@ import java.util.List; @RunWith(AndroidTestingRunner.class) @RunWithLooper +@SmallTest public class BluetoothControllerImplTest extends SysuiTestCase { private LocalBluetoothManager mMockBluetoothManager; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java index 3ed1681644f2..cb2063967639 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackHandlerTest.java @@ -20,6 +20,7 @@ import android.support.test.runner.AndroidJUnit4; import android.telephony.SubscriptionInfo; import android.test.suitebuilder.annotation.SmallTest; import com.android.systemui.R; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.policy.NetworkController.EmergencyListener; import com.android.systemui.statusbar.policy.NetworkController.IconState; import com.android.systemui.statusbar.policy.NetworkController.SignalCallback; @@ -40,7 +41,7 @@ import static org.mockito.Matchers.eq; @SmallTest @RunWith(AndroidJUnit4.class) -public class CallbackHandlerTest { +public class CallbackHandlerTest extends SysuiTestCase { private CallbackHandler mHandler; private HandlerThread mHandlerThread; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java index 3e79a0404026..3d79d5bce839 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/ExtensionControllerTest.java @@ -20,6 +20,8 @@ import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import android.support.test.filters.SmallTest; + import com.android.systemui.Dependency; import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.OverlayPlugin; @@ -34,6 +36,7 @@ import org.junit.Test; import java.util.Map; import java.util.function.Consumer; +@SmallTest public class ExtensionControllerTest extends SysuiTestCase { private PluginManager mPluginManager; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyButtonViewTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyButtonViewTest.java index 21fddf2106d4..f85923522b34 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyButtonViewTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/KeyButtonViewTest.java @@ -21,6 +21,7 @@ import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.FIELD_ import static org.mockito.ArgumentMatchers.argThat; import android.metrics.LogMaker; +import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; import android.testing.TestableLooper.RunWithLooper; @@ -40,6 +41,7 @@ import java.util.Objects; @RunWith(AndroidTestingRunner.class) @RunWithLooper +@SmallTest public class KeyButtonViewTest extends SysuiTestCase { private KeyButtonView mKeyButtonView; diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationChildrenContainerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationChildrenContainerTest.java index 4932ba145536..e6c8815b9e21 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationChildrenContainerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationChildrenContainerTest.java @@ -25,6 +25,7 @@ import android.support.test.runner.AndroidJUnit4; import android.view.NotificationHeaderView; import android.view.View; +import com.android.systemui.SysuiTestCase; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.NotificationTestHelper; @@ -36,17 +37,14 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -@FlakyTest -public class NotificationChildrenContainerTest { +public class NotificationChildrenContainerTest extends SysuiTestCase { - private Context mContext; private ExpandableNotificationRow mGroup; private int mId; private NotificationTestHelper mNotificationTestHelper; @Before public void setUp() throws Exception { - mContext = InstrumentationRegistry.getTargetContext(); mNotificationTestHelper = new NotificationTestHelper(mContext); mGroup = mNotificationTestHelper.createGroup(); } diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java index 9a825c1d4543..a3b258fb2ea2 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/leak/GarbageMonitorTest.java @@ -27,13 +27,15 @@ import static org.mockito.Mockito.when; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class GarbageMonitorTest { +public class GarbageMonitorTest extends SysuiTestCase { private LeakReporter mLeakReporter; private TrackedGarbage mTrackedGarbage; diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakDetectorTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakDetectorTest.java index 11722fe60f5c..f1965a223dbc 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakDetectorTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakDetectorTest.java @@ -20,6 +20,7 @@ package com.android.systemui.util.leak; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; import com.android.systemui.util.leak.ReferenceTestUtils.CollectionWaiter; import org.junit.Before; @@ -35,7 +36,7 @@ import java.util.Collection; @SmallTest @RunWith(AndroidJUnit4.class) -public class LeakDetectorTest { +public class LeakDetectorTest extends SysuiTestCase { private LeakDetector mLeakDetector; diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakReporterTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakReporterTest.java index 11948498e760..6711ce8afa35 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakReporterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/leak/LeakReporterTest.java @@ -24,6 +24,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import android.app.NotificationManager; +import android.support.test.filters.MediumTest; import android.support.test.runner.AndroidJUnit4; import com.android.systemui.SysuiTestCase; @@ -38,6 +39,7 @@ import java.io.File; import java.io.PrintWriter; @RunWith(AndroidJUnit4.class) +@MediumTest public class LeakReporterTest extends SysuiTestCase { private LeakDetector mLeakDetector; diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/leak/ReferenceTestUtilsTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/leak/ReferenceTestUtilsTest.java index 9da67b799a59..b8a3e39f665c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/leak/ReferenceTestUtilsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/leak/ReferenceTestUtilsTest.java @@ -21,12 +21,14 @@ import static org.junit.Assert.assertEquals; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; + import org.junit.Test; import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class ReferenceTestUtilsTest { +public class ReferenceTestUtilsTest extends SysuiTestCase { @Test public void testCollectionWaiter_doesntBlockIndefinitely() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/leak/WeakIdentityHashMapTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/leak/WeakIdentityHashMapTest.java index fb1c1aaef60b..9787df91f5de 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/leak/WeakIdentityHashMapTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/leak/WeakIdentityHashMapTest.java @@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; import com.android.systemui.util.leak.ReferenceTestUtils.CollectionWaiter; import org.junit.Before; @@ -31,7 +32,7 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class WeakIdentityHashMapTest { +public class WeakIdentityHashMapTest extends SysuiTestCase { WeakIdentityHashMap<Object, Object> mMap; diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/SettableWakeLockTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/SettableWakeLockTest.java index f6692eb6cf96..39316eda1565 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/SettableWakeLockTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/SettableWakeLockTest.java @@ -24,13 +24,15 @@ import static org.junit.Assert.assertFalse; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class SettableWakeLockTest { +public class SettableWakeLockTest extends SysuiTestCase { private WakeLockFake mFake; private SettableWakeLock mSettable; diff --git a/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/WakeLockTest.java b/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/WakeLockTest.java index 53944997b17c..9b7c5970270f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/WakeLockTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/util/wakelock/WakeLockTest.java @@ -25,6 +25,8 @@ import android.support.test.InstrumentationRegistry; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; +import com.android.systemui.SysuiTestCase; + import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -32,7 +34,7 @@ import org.junit.runner.RunWith; @SmallTest @RunWith(AndroidJUnit4.class) -public class WakeLockTest { +public class WakeLockTest extends SysuiTestCase { WakeLock mWakeLock; PowerManager.WakeLock mInner; |