Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bed277e5 authored by David Saff's avatar David Saff
Browse files

In tests folder, convert Kosmos() to testKosmos() 

See go/testkosmos

Bug: 342622417
Test: presubmit
Flag: TEST_ONLY
Change-Id: Icbae0f4fbff52426e97647bb3bafa185534d54a2
parent 44a0a044

packages/SystemUI/tests/src/com/android/systemui/SystemUIApplicationTest.kt

+8 −5
Original line number Diff line number Diff line
@@ -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()

packages/SystemUI/tests/src/com/android/systemui/animation/TransitionAnimatorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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,

packages/SystemUI/tests/src/com/android/systemui/biometrics/ui/viewmodel/PromptViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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() {

packages/SystemUI/tests/src/com/android/systemui/brightness/ui/compose/BrightnessSliderMotionTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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)

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/dialog/InternetDetailsContentManagerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -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