Merge "Disable scene_container for additional legacy test classes + tests... (eb737b68) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/KeyguardUnlockAnimationControllerTest.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.defaultDeviceState
		import com.android.systemui.deviceStateManager
		import com.android.systemui.flags.DisableSceneContainer
		import com.android.systemui.flags.FeatureFlags
		import com.android.systemui.shared.system.smartspace.ILauncherUnlockAnimationController
		import com.android.systemui.statusbar.NotificationShadeWindowController
		@@ -54,6 +55,7 @@ import org.mockito.kotlin.whenever
		@RunWith(AndroidJUnit4::class)
		@RunWithLooper
		@SmallTest
		@DisableSceneContainer // Class is unused in flexi.
		class KeyguardUnlockAnimationControllerTest : SysuiTestCase() {
		private lateinit var keyguardUnlockAnimationController: KeyguardUnlockAnimationController

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/InWindowLauncherUnlockAnimationInteractorTest.kt

+5 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.flags.DisableSceneContainer
		import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
		import com.android.systemui.keyguard.data.repository.inWindowLauncherUnlockAnimationRepository
		@@ -46,7 +47,7 @@ import org.mockito.MockitoAnnotations
		@RunWith(AndroidJUnit4::class)
		class InWindowLauncherUnlockAnimationInteractorTest : SysuiTestCase() {
		private val kosmos = testKosmos()
		private val underTest =
		private val underTest by lazy {
		InWindowLauncherUnlockAnimationInteractor(
		kosmos.inWindowLauncherUnlockAnimationRepository,
		kosmos.applicationCoroutineScope,
		@@ -55,6 +56,7 @@ class InWindowLauncherUnlockAnimationInteractorTest : SysuiTestCase() {
		{ kosmos.keyguardSurfaceBehindRepository },
		kosmos.activityManagerWrapper,
		)
		}
		private val testScope = kosmos.testScope
		private lateinit var transitionRepository: FakeKeyguardTransitionRepository
		@Mock private lateinit var activityManagerWrapper: ActivityManagerWrapper
		@@ -72,6 +74,7 @@ class InWindowLauncherUnlockAnimationInteractorTest : SysuiTestCase() {
		}

		@Test
		@DisableSceneContainer
		fun testTransitioningToGoneWithInWindowAnimation_trueIfTopActivityIsLauncher_andTransitioningToGone() =
		testScope.runTest {
		transitionToGoneThenLockscreen(withLauncherUnderneath = true)
		@@ -226,6 +229,7 @@ class InWindowLauncherUnlockAnimationInteractorTest : SysuiTestCase() {
		}

		@Test
		@DisableSceneContainer
		fun testShouldStartInWindowAnimation_trueOnceSurfaceAvailable_falseWhenTransitionEnds() =
		testScope.runTest {
		transitionToGoneThenLockscreen(withLauncherUnderneath = true)

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,6 @@ import android.content.Context;
		import android.os.PowerManager;
		import android.os.PowerManager.WakeLock;
		import android.os.RemoteException;
		import android.platform.test.annotations.DisableFlags;
		import android.platform.test.annotations.EnableFlags;
		import android.telephony.TelephonyManager;
		import android.testing.AndroidTestingRunner;
		@@ -97,6 +96,7 @@ import com.android.systemui.communal.ui.viewmodel.CommunalTransitionViewModel;
		import com.android.systemui.dreams.DreamOverlayStateController;
		import com.android.systemui.dreams.ui.viewmodel.DreamViewModel;
		import com.android.systemui.dump.DumpManager;
		import com.android.systemui.flags.DisableSceneContainer;
		import com.android.systemui.flags.FakeFeatureFlags;
		import com.android.systemui.flags.SystemPropertiesHelper;
		import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionBootInteractor;
		@@ -153,6 +153,7 @@ import org.mockito.MockitoAnnotations;
		@RunWith(AndroidTestingRunner.class)
		@TestableLooper.RunWithLooper
		@SmallTest
		@DisableSceneContainer // Class is deprecated in flexi.
		public class KeyguardViewMediatorTest extends SysuiTestCase {

		private static final boolean ENABLE_NEW_KEYGUARD_SHELL_TRANSITIONS =

packages/SystemUI/tests/src/com/android/systemui/keyguard/KeyguardViewMediatorTestKt.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ import com.android.systemui.concurrency.fakeExecutor
		import com.android.systemui.dreams.DreamOverlayStateController
		import com.android.systemui.dreams.ui.viewmodel.dreamViewModel
		import com.android.systemui.dump.dumpManager
		import com.android.systemui.flags.DisableSceneContainer
		import com.android.systemui.flags.featureFlagsClassic
		import com.android.systemui.flags.systemPropertiesHelper
		import com.android.systemui.jank.interactionJankMonitor
		@@ -96,6 +97,7 @@ import org.mockito.kotlin.verify
		@SmallTest
		@RunWithLooper(setAsMainLooper = true)
		@RunWith(AndroidTestingRunner::class)
		@DisableSceneContainer // Class is deprecated in flexi.
		class KeyguardViewMediatorTestKt : SysuiTestCase() {
		private val kosmos =
		testKosmos().useUnconfinedTestDispatcher().also {