Merge "Move multivalentTests that are currently failing deviceless" into main (99eb42b3) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt→packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt

+47 −47

Original line number	Diff line number	Diff line
		@@ -185,7 +185,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		dreamsComplicationComponent,
		dreamOverlayComponent,
		complicationComponent,
		ambientTouchComponent
		ambientTouchComponent,
		)
		}

		@@ -194,7 +194,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		dreamsComplicationComponent,
		dreamOverlayComponent,
		complicationComponent,
		ambientTouchComponent
		ambientTouchComponent,
		)
		}
		}
		@@ -204,7 +204,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory,
		dreamOverlayComponentFactory: DreamOverlayComponent.Factory,
		complicationComponentFactory: ComplicationComponent.Factory,
		ambientTouchComponentFactory: AmbientTouchComponent.Factory
		ambientTouchComponentFactory: AmbientTouchComponent.Factory,
		): EnvironmentComponents {
		val dreamOverlayComponent = mock<DreamOverlayComponent>()
		whenever(dreamOverlayComponent.getDreamOverlayContainerViewController())
		@@ -241,7 +241,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		dreamComplicationComponent,
		dreamOverlayComponent,
		complicationComponent,
		ambientTouchComponent
		ambientTouchComponent,
		)
		}

		@@ -259,7 +259,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamComplicationComponentFactory,
		mDreamOverlayComponentFactory,
		mComplicationComponentFactory,
		mAmbientTouchComponentFactory
		mAmbientTouchComponentFactory,
		)

		whenever(mDreamOverlayContainerViewController.containerView)
		@@ -271,7 +271,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		ViewCaptureAwareWindowManager(
		mWindowManager,
		mLazyViewCapture,
		isViewCaptureEnabled = false
		isViewCaptureEnabled = false,
		)
		mService =
		DreamOverlayService(
		@@ -295,7 +295,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallbackController,
		kosmos.keyguardInteractor,
		gestureInteractor,
		WINDOW_NAME
		WINDOW_NAME,
		)
		}

		@@ -323,7 +323,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		verify(mUiEventLogger).log(DreamOverlayService.DreamOverlayEvent.DREAM_OVERLAY_ENTER_START)
		@@ -341,7 +341,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		verify(mWindowManager).addView(any(), any())
		@@ -361,7 +361,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		verify(mWindowManager).addView(any(), any())
		@@ -384,7 +384,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		verify(mDreamOverlayContainerViewController).init()
		@@ -403,7 +403,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		verify(mDreamOverlayContainerViewParent).removeView(mDreamOverlayContainerView)
		@@ -419,7 +419,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(mService.shouldShowComplications()).isTrue()
		@@ -435,7 +435,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -448,7 +448,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)

		mMainExecutor.runAllReady()
		@@ -476,7 +476,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		LOW_LIGHT_COMPONENT.flattenToString(),
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(mService.dreamComponent).isEqualTo(LOW_LIGHT_COMPONENT)
		@@ -493,7 +493,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		HOME_CONTROL_PANEL_DREAM_COMPONENT.flattenToString(),
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(mService.dreamComponent).isEqualTo(HOME_CONTROL_PANEL_DREAM_COMPONENT)
		@@ -510,7 +510,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		LOW_LIGHT_COMPONENT.flattenToString(),
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -545,7 +545,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		// Immediately end the dream.
		client.endDream()
		@@ -577,7 +577,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -597,7 +597,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		LOW_LIGHT_COMPONENT.flattenToString(),
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -649,7 +649,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		verify(mWindowManager, Mockito.never()).addView(any(), any())
		@@ -673,7 +673,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -694,7 +694,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -724,7 +724,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		mService.onWakeUp()
		@@ -748,7 +748,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		val paramsCaptor = ArgumentCaptor.forClass(WindowManager.LayoutParams::class.java)
		@@ -774,7 +774,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -800,7 +800,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		// Set communal available, verify that overlay callback is informed.
		kosmos.setCommunalAvailable(true)
		@@ -829,7 +829,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -850,7 +850,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -870,7 +870,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		true /shouldShowComplication/
		true, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -894,14 +894,14 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(lifecycleRegistry.mLifecycles)
		.containsExactly(
		Lifecycle.State.CREATED,
		Lifecycle.State.STARTED,
		Lifecycle.State.RESUMED
		Lifecycle.State.RESUMED,
		)
		}

		@@ -925,7 +925,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		testScope.runCurrent()
		mMainExecutor.runAllReady()
		@@ -942,7 +942,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		mService.onDestroy()
		@@ -952,7 +952,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		Lifecycle.State.CREATED,
		Lifecycle.State.STARTED,
		Lifecycle.State.RESUMED,
		Lifecycle.State.DESTROYED
		Lifecycle.State.DESTROYED,
		)
		}

		@@ -966,7 +966,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
		@@ -998,7 +998,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
		@@ -1030,7 +1030,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
		@@ -1066,7 +1066,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		assertThat(lifecycleRegistry.currentState).isEqualTo(Lifecycle.State.RESUMED)
		@@ -1101,7 +1101,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -1130,7 +1130,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		true /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -1148,7 +1148,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -1181,7 +1181,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()

		@@ -1214,7 +1214,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamComplicationComponentFactory,
		mDreamOverlayComponentFactory,
		mComplicationComponentFactory,
		mAmbientTouchComponentFactory
		mAmbientTouchComponentFactory,
		)

		mService.onEndDream()
		@@ -1223,7 +1223,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamComplicationComponentFactory,
		mDreamOverlayComponentFactory,
		mComplicationComponentFactory,
		mAmbientTouchComponentFactory
		mAmbientTouchComponentFactory,
		)

		client.startDream(
		@@ -1231,7 +1231,7 @@ class DreamOverlayServiceTest : SysuiTestCase() {
		mDreamOverlayCallback,
		DREAM_COMPONENT,
		false /isPreview/,
		false /shouldShowComplication/
		false, /shouldShowComplication/
		)
		mMainExecutor.runAllReady()
		environmentComponents.verifyNoMoreInteractions()

packages/SystemUI/multivalentTests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt→packages/SystemUI/tests/src/com/android/systemui/education/domain/interactor/KeyboardTouchpadStatsInteractorTest.kt

+0 −0

File moved.

View file

packages/SystemUI/multivalentTests/src/com/android/systemui/lifecycle/HydratorTest.kt→packages/SystemUI/tests/src/com/android/systemui/lifecycle/HydratorTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -59,11 +59,11 @@ class HydratorTest : SysuiTestCase() {
		Column {
		Text(
		"upstreamStateFlow=${viewModel.stateBackedByStateFlow}",
		Modifier.testTag("upstreamStateFlow")
		Modifier.testTag("upstreamStateFlow"),
		)
		Text(
		"upstreamFlow=${viewModel.stateBackedByFlow}",
		Modifier.testTag("upstreamFlow")
		Modifier.testTag("upstreamFlow"),
		)
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt→packages/SystemUI/tests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsUserActionsViewModelTest.kt

+0 −0

File moved.

View file

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt→packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/domain/interactor/HeadsUpNotificationInteractorTest.kt

+0 −0

File moved.

View file