Merge "Migrate dream tests to robolectric pilot tests" into main (74a961d0) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+17 −0

Original line number	Diff line number	Diff line
		@@ -331,6 +331,23 @@ filegroup {
		"tests/src/com/android/systemui/communal/data/repository/CommunalWidgetRepositoryImplTest.kt",
		"tests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt",
		"tests/src/com/android/systemui/communal/ui/view/layout/blueprints/DefaultCommunalBlueprintTest.kt",

		/* Dream tests */
		"tests/src/com/android/systemui/dreams/complication/HideComplicationTouchHandlerTest.java",
		"tests/src/com/android/systemui/dreams/conditions/AssistantAttentionConditionTest.java",
		"tests/src/com/android/systemui/dreams/conditions/DreamConditionTest.java",
		"tests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java",
		"tests/src/com/android/systemui/dreams/touch/scrim/ScrimManagerTest.java",
		"tests/src/com/android/systemui/dreams/touch/BouncerSwipeTouchHandlerTest.java",
		"tests/src/com/android/systemui/dreams/touch/ShadeTouchHandlerTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt",
		"tests/src/com/android/systemui/dreams/DreamOverlayCallbackControllerTest.kt",
		"tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayNotificationCountProviderTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayStatusBarItemsProviderTest.java",
		"tests/src/com/android/systemui/dreams/DreamOverlayStatusBarViewControllerTest.java",
		],
		path: "tests/src",
		}

packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -3,9 +3,10 @@ package com.android.systemui.dreams
		import android.animation.Animator
		import android.animation.AnimatorSet
		import android.animation.ValueAnimator
		import android.testing.AndroidTestingRunner
		import android.view.View
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.RoboPilotTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.complication.ComplicationHostViewController
		import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel
		@@ -29,8 +30,9 @@ import org.mockito.Mockito.times
		import org.mockito.Mockito.verify
		import org.mockito.MockitoAnnotations

		@RoboPilotTest
		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		@RunWith(AndroidJUnit4::class)
		class DreamOverlayAnimationsControllerTest : SysuiTestCase() {

		companion object {

packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayCallbackControllerTest.kt

+4 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,9 @@
		*/
		package com.android.systemui.dreams

		import android.testing.AndroidTestingRunner
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.RoboPilotTest
		import com.android.systemui.SysuiTestCase
		import com.google.common.truth.Truth.assertThat
		import org.junit.Before
		@@ -29,8 +30,9 @@ import org.mockito.Mockito.times
		import org.mockito.Mockito.verify
		import org.mockito.MockitoAnnotations

		@RoboPilotTest
		@SmallTest
		@RunWith(AndroidTestingRunner::class)
		@RunWith(AndroidJUnit4::class)
		class DreamOverlayCallbackControllerTest : SysuiTestCase() {

		@Mock private lateinit var callback: DreamOverlayCallbackController.Callback

packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -28,21 +28,22 @@ import static org.mockito.Mockito.when;
		import android.content.res.Resources;
		import android.graphics.Region;
		import android.os.Handler;
		import android.testing.AndroidTestingRunner;
		import android.view.AttachedSurfaceControl;
		import android.view.ViewGroup;
		import android.view.ViewRootImpl;
		import android.view.ViewTreeObserver;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		import com.android.dream.lowlight.LowLightTransitionCoordinator;
		import com.android.keyguard.BouncerPanelExpansionCalculator;
		import com.android.systemui.RoboPilotTest;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.complication.ComplicationHostViewController;
		import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController;
		import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor;
		import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback;
		import com.android.systemui.complication.ComplicationHostViewController;
		import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController;
		import com.android.systemui.statusbar.BlurUtils;

		import org.junit.Before;
		@@ -52,8 +53,9 @@ import org.mockito.ArgumentCaptor;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@RoboPilotTest
		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@RunWith(AndroidJUnit4.class)
		public class DreamOverlayContainerViewControllerTest extends SysuiTestCase {
		private static final int MAX_BURN_IN_OFFSET = 20;
		private static final long BURN_IN_PROTECTION_UPDATE_INTERVAL = 10;

packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayNotificationCountProviderTest.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -22,10 +22,11 @@ import static org.mockito.Mockito.when;

		import android.service.notification.NotificationListenerService;
		import android.service.notification.StatusBarNotification;
		import android.testing.AndroidTestingRunner;

		import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		import com.android.systemui.RoboPilotTest;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.statusbar.NotificationListener;
		import com.android.systemui.statusbar.NotificationListener.NotificationHandler;
		@@ -37,8 +38,9 @@ import org.mockito.ArgumentCaptor;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;

		@RoboPilotTest
		@SmallTest
		@RunWith(AndroidTestingRunner.class)
		@RunWith(AndroidJUnit4.class)
		public class DreamOverlayNotificationCountProviderTest extends SysuiTestCase {
		@Mock
		NotificationListener mNotificationListener;