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

Commit 439d0559 authored by Matthew Reynolds's avatar Matthew Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Move init to setup for failed tests, move failed tests" into main

parents 8bf2d667 6ce4de53

packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeOverlayContentViewModelTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -65,8 +65,7 @@ class NotificationsShadeOverlayContentViewModelTest : SysuiTestCase() { 


    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val sceneInteractor = kosmos.sceneInteractor



    private val sceneInteractor by lazy { kosmos.sceneInteractor }

    private val underTest by lazy { kosmos.notificationsShadeOverlayContentViewModel }



    @Before

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeOverlayContentViewModelTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -61,8 +61,7 @@ class QuickSettingsShadeOverlayContentViewModelTest : SysuiTestCase() { 
            usingMediaInComposeFragment = false // This is not for the compose fragment

        }

    private val testScope = kosmos.testScope

    private val sceneInteractor = kosmos.sceneInteractor



    private val sceneInteractor by lazy { kosmos.sceneInteractor }

    private val underTest by lazy { kosmos.quickSettingsShadeOverlayContentViewModel }



    @Before

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/interactor/SceneInteractorTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -73,9 +73,8 @@ class SceneInteractorTest : SysuiTestCase() { 


    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val fakeSceneDataSource = kosmos.fakeSceneDataSource



    private val underTest = kosmos.sceneInteractor

    private val fakeSceneDataSource by lazy { kosmos.fakeSceneDataSource }

    private val underTest by lazy { kosmos.sceneInteractor }



    @Before

    fun setUp() {

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/domain/interactor/ShadeInteractorSceneContainerImplTest.kt

+3 −4
Original line number Diff line number Diff line
@@ -50,11 +50,10 @@ class ShadeInteractorSceneContainerImplTest : SysuiTestCase() { 


    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val configurationRepository = kosmos.fakeConfigurationRepository

    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val sceneInteractor = kosmos.sceneInteractor

    private val configurationRepository by lazy { kosmos.fakeConfigurationRepository }

    private val keyguardRepository by lazy { kosmos.fakeKeyguardRepository }

    private val sceneInteractor by lazy { kosmos.sceneInteractor }

    private val shadeTestUtil by lazy { kosmos.shadeTestUtil }



    private val underTest by lazy { kosmos.shadeInteractorSceneContainerImpl }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/shade/ui/viewmodel/ShadeHeaderViewModelTest.kt

+6 −5
Original line number Diff line number Diff line
@@ -15,7 +15,9 @@ import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor 
import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus

import com.android.systemui.kosmos.runCurrent

import com.android.systemui.kosmos.testScope

import com.android.systemui.kosmos.useUnconfinedTestDispatcher

import com.android.systemui.lifecycle.activateIn

import com.android.systemui.plugins.activityStarter

import com.android.systemui.scene.domain.interactor.sceneInteractor
@@ -51,12 +53,11 @@ import org.mockito.MockitoAnnotations 
@RunWith(AndroidJUnit4::class)

@EnableSceneContainer

class ShadeHeaderViewModelTest : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val kosmos = testKosmos().useUnconfinedTestDispatcher()

    private val testScope = kosmos.testScope

    private val mobileIconsInteractor = kosmos.fakeMobileIconsInteractor

    private val sceneInteractor = kosmos.sceneInteractor

    private val deviceEntryInteractor = kosmos.deviceEntryInteractor



    private val mobileIconsInteractor by lazy { kosmos.fakeMobileIconsInteractor }

    private val sceneInteractor by lazy { kosmos.sceneInteractor }

    private val deviceEntryInteractor by lazy { kosmos.deviceEntryInteractor }

    private val underTest by lazy { kosmos.shadeHeaderViewModel }



    @Before