diff options
7 files changed, 27 insertions, 26 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt b/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt index 4f7610ab7d72..f98c1309b24f 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt @@ -25,7 +25,6 @@ import com.android.systemui.dagger.GlobalRootComponent import com.android.systemui.dagger.SysUIComponent import com.android.systemui.dump.dumpManager import com.android.systemui.flags.systemPropertiesHelper -import com.android.systemui.kosmos.Kosmos import com.android.systemui.process.processWrapper import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat @@ -48,7 +47,7 @@ class SystemUIApplicationTest : SysuiTestCase() { @get:Rule val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT) - val kosmos = Kosmos() + val kosmos = testKosmos() @Mock private lateinit var initializer: SystemUIInitializer @Mock private lateinit var rootComponent: GlobalRootComponent @Mock private lateinit var sysuiComponent: SysUIComponent @@ -56,9 +55,13 @@ class SystemUIApplicationTest : SysuiTestCase() { @Mock private lateinit var initController: InitController class StartableA : TestableStartable() + class StartableB : TestableStartable() + class StartableC : TestableStartable() + class StartableD : TestableStartable() + class StartableE : TestableStartable() val dependencyMap: Map<Class<*>, Set<Class<out CoreStartable>>> = @@ -114,7 +117,7 @@ class SystemUIApplicationTest : SysuiTestCase() { .thenReturn( mutableMapOf( StartableA::class.java to Provider { startableA }, - StartableB::class.java to Provider { startableB } + StartableB::class.java to Provider { startableB }, ) ) app.onCreate() @@ -130,7 +133,7 @@ class SystemUIApplicationTest : SysuiTestCase() { mutableMapOf( StartableC::class.java to Provider { startableC }, StartableA::class.java to Provider { startableA }, - StartableB::class.java to Provider { startableB } + StartableB::class.java to Provider { startableB }, ) ) app.onCreate() @@ -150,7 +153,7 @@ class SystemUIApplicationTest : SysuiTestCase() { StartableC::class.java to Provider { startableC }, StartableD::class.java to Provider { startableD }, StartableA::class.java to Provider { startableA }, - StartableB::class.java to Provider { startableB } + StartableB::class.java to Provider { startableB }, ) ) app.onCreate() diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt index 1268de0f4141..4cfe106780f9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt @@ -34,9 +34,9 @@ import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.activity.EmptyTestActivity import com.android.systemui.concurrency.fakeExecutor -import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope import com.android.systemui.runOnMainThreadAndWaitForIdleSync +import com.android.systemui.testKosmos import kotlin.test.assertTrue import org.junit.Rule import org.junit.Test @@ -77,7 +77,7 @@ class TransitionAnimatorTest( } } - private val kosmos = Kosmos() + private val kosmos = testKosmos() private val pathManager = GoldenPathManager( context, diff --git a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt index 0e68fce679b0..2c70249bcb06 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt @@ -73,9 +73,9 @@ import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.display.data.repository.displayStateRepository import com.android.systemui.keyguard.shared.model.AcquiredFingerprintAuthenticationStatus -import com.android.systemui.kosmos.Kosmos import com.android.systemui.kosmos.testScope import com.android.systemui.res.R +import com.android.systemui.testKosmos import com.android.systemui.util.mockito.withArgCaptor import com.google.android.msdl.data.model.MSDLToken import com.google.common.truth.Truth.assertThat @@ -189,7 +189,7 @@ internal class PromptViewModelTest(private val testCase: TestCase) : SysuiTestCa private lateinit var promptContentViewWithMoreOptionsButton: PromptContentViewWithMoreOptionsButton - private val kosmos = Kosmos() + private val kosmos = testKosmos() @Before fun setup() { diff --git a/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt b/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt index 9dab9d735603..b134dff89651 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt @@ -31,8 +31,8 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.brightness.ui.viewmodel.BrightnessSliderViewModel import com.android.systemui.common.shared.model.asIcon import com.android.systemui.haptics.slider.sliderHapticsViewModelFactory -import com.android.systemui.kosmos.Kosmos import com.android.systemui.motion.createSysUiComposeMotionTestRule +import com.android.systemui.testKosmos import com.android.systemui.utils.PolicyRestriction import kotlin.test.Test import kotlin.time.Duration.Companion.seconds @@ -61,7 +61,7 @@ import platform.test.screenshot.Displays.Phone class BrightnessSliderMotionTest : SysuiTestCase() { private val deviceSpec = DeviceEmulationSpec(Phone) - private val kosmos = Kosmos() + private val kosmos = testKosmos() @get:Rule val motionTestRule = createSysUiComposeMotionTestRule(kosmos, deviceSpec) diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt index c20a801cd5e3..848d1112686e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt @@ -40,9 +40,9 @@ import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.flags.EnableSceneContainer -import com.android.systemui.kosmos.Kosmos import com.android.systemui.res.R import com.android.systemui.statusbar.policy.KeyguardStateController +import com.android.systemui.testKosmos import com.android.systemui.util.concurrency.FakeExecutor import com.android.systemui.util.time.FakeSystemClock import com.android.wifitrackerlib.WifiEntry @@ -66,7 +66,7 @@ import org.mockito.kotlin.whenever @EnableFlags(Flags.FLAG_QS_TILE_DETAILED_VIEW) @UiThreadTest class InternetDetailsContentManagerTest : SysuiTestCase() { - private val kosmos = Kosmos() + private val kosmos = testKosmos() private val handler: Handler = kosmos.fakeExecutorHandler private val scope: CoroutineScope = mock<CoroutineScope>() private val telephonyManager: TelephonyManager = kosmos.telephonyManager diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt index 2e65478714af..12f7af106d10 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/FoldStateListenerTest.kt @@ -108,7 +108,7 @@ class FoldStateListenerTest : SysuiTestCase() { private fun setGoToSleepStates(vararg states: Int) { mContext.orCreateTestableResources.addOverride( R.array.config_deviceStatesOnWhichToSleep, - states + states, ) } @@ -117,9 +117,10 @@ class FoldStateListenerTest : SysuiTestCase() { } companion object { - private val DEVICE_STATE_FOLDED = Kosmos().foldedDeviceStateList.first() - private val DEVICE_STATE_HALF_FOLDED = Kosmos().halfFoldedDeviceState - private val DEVICE_STATE_UNFOLDED = Kosmos().unfoldedDeviceState + private val kosmos = Kosmos() + private val DEVICE_STATE_FOLDED = kosmos.foldedDeviceStateList.first() + private val DEVICE_STATE_HALF_FOLDED = kosmos.halfFoldedDeviceState + private val DEVICE_STATE_UNFOLDED = kosmos.unfoldedDeviceState private const val FOLDED = true private const val NOT_FOLDED = false diff --git a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt index a553b176c34a..6618843ab46d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/unfold/UnfoldLatencyTrackerTest.kt @@ -26,9 +26,8 @@ import com.android.internal.util.LatencyTracker import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.foldedDeviceStateList -import com.android.systemui.halfFoldedDeviceState import com.android.systemui.keyguard.ScreenLifecycle -import com.android.systemui.kosmos.Kosmos +import com.android.systemui.testKosmos import com.android.systemui.unfold.util.FoldableDeviceStates import com.android.systemui.unfold.util.FoldableTestUtils import com.android.systemui.unfoldedDeviceState @@ -70,12 +69,10 @@ class UnfoldLatencyTrackerTest : SysuiTestCase() { @Before fun setUp() { MockitoAnnotations.initMocks(this) - whenever(deviceStateManager.supportedDeviceStates).thenReturn( - listOf( - Kosmos().foldedDeviceStateList[0], - Kosmos().unfoldedDeviceState + whenever(deviceStateManager.supportedDeviceStates) + .thenReturn( + listOf(testKosmos().foldedDeviceStateList[0], testKosmos().unfoldedDeviceState) ) - ) unfoldLatencyTracker = UnfoldLatencyTracker( @@ -85,7 +82,7 @@ class UnfoldLatencyTrackerTest : SysuiTestCase() { context.mainExecutor, context, context.contentResolver, - screenLifecycle + screenLifecycle, ) .apply { init() } @@ -206,7 +203,7 @@ class UnfoldLatencyTrackerTest : SysuiTestCase() { Settings.Global.putString( context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, - durationScale.toString() + durationScale.toString(), ) } } |