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

Commit 4e69b471 authored by András Kurucz's avatar András Kurucz Committed by Android (Google) Code Review
Browse files

Merge changes I1c9a40b5,I9e97565c into main 

* changes:
  Use kosmos in NotificationShelfViewModelTest
  Use kosmos in NotificationShelfInteractorTest
parents a53c941b 7660ade5

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/shelf/domain/interactor/NotificationShelfInteractorTest.kt

+26 −34
Original line number Diff line number Diff line
@@ -21,52 +21,44 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

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

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

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.power.data.repository.FakePowerRepository

import com.android.systemui.power.domain.interactor.PowerInteractorFactory

import com.android.systemui.statusbar.LockscreenShadeTransitionController

import com.android.systemui.statusbar.phone.ScreenOffAnimationController

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

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

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

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.testCase

import com.android.systemui.plugins.statusbar.statusBarStateController

import com.android.systemui.power.data.repository.fakePowerRepository

import com.android.systemui.statusbar.lockscreenShadeTransitionController

import com.android.systemui.statusbar.phone.screenOffAnimationController

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentMatchers.eq

import org.mockito.Mockito.isNull

import org.mockito.Mockito.verify

import org.mockito.kotlin.mock

import org.mockito.kotlin.whenever



@RunWith(AndroidJUnit4::class)

@SmallTest

class NotificationShelfInteractorTest : SysuiTestCase() {



    private val keyguardRepository = FakeKeyguardRepository()

    private val deviceEntryFaceAuthRepository = FakeDeviceEntryFaceAuthRepository()



    private val screenOffAnimationController =

        mock<ScreenOffAnimationController>().also {

            whenever(it.allowWakeUpIfDozing()).thenReturn(true)

    private val kosmos =

        Kosmos().apply {

            testCase = this@NotificationShelfInteractorTest

            lockscreenShadeTransitionController = mock()

            screenOffAnimationController = mock()

            statusBarStateController = mock()

            whenever(screenOffAnimationController.allowWakeUpIfDozing()).thenReturn(true)

        }

    private val statusBarStateController: StatusBarStateController = mock()

    private val powerRepository = FakePowerRepository()

    private val powerInteractor =

        PowerInteractorFactory.create(

                repository = powerRepository,

                screenOffAnimationController = screenOffAnimationController,

                statusBarStateController = statusBarStateController,

            )

            .powerInteractor



    private val keyguardTransitionController: LockscreenShadeTransitionController = mock()

    private val underTest =

        NotificationShelfInteractor(

            keyguardRepository,

            deviceEntryFaceAuthRepository,

            powerInteractor,

            keyguardTransitionController,

        )

    private val underTest = kosmos.notificationShelfInteractor



    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val deviceEntryFaceAuthRepository = kosmos.fakeDeviceEntryFaceAuthRepository



    private val statusBarStateController = kosmos.statusBarStateController

    private val powerRepository = kosmos.fakePowerRepository

    private val keyguardTransitionController = kosmos.lockscreenShadeTransitionController



    @Test

    fun shelfIsNotStatic_whenKeyguardNotShowing() = runTest {

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/shelf/ui/viewmodel/NotificationShelfViewModelTest.kt

+31 −57
Original line number Diff line number Diff line
@@ -19,73 +19,47 @@ package com.android.systemui.statusbar.notification.shelf.ui.viewmodel 
import android.os.PowerManager

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysUITestComponent

import com.android.systemui.SysUITestModule

import com.android.systemui.SysuiTestCase

import com.android.systemui.TestMocksModule

import com.android.systemui.collectLastValue

import com.android.systemui.dagger.SysUISingleton

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

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

import com.android.systemui.power.data.repository.FakePowerRepository

import com.android.systemui.runTest

import com.android.systemui.statusbar.LockscreenShadeTransitionController

import com.android.systemui.statusbar.SysuiStatusBarStateController

import com.android.systemui.statusbar.notification.row.ui.viewmodel.ActivatableNotificationViewModelModule

import com.android.systemui.statusbar.phone.ScreenOffAnimationController

import com.android.systemui.util.mockito.eq

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

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

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

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.collectLastValue

import com.android.systemui.kosmos.runTest

import com.android.systemui.kosmos.testCase

import com.android.systemui.plugins.statusbar.statusBarStateController

import com.android.systemui.power.data.repository.fakePowerRepository

import com.android.systemui.statusbar.lockscreenShadeTransitionController

import com.android.systemui.statusbar.phone.screenOffAnimationController

import com.google.common.truth.Truth.assertThat

import dagger.BindsInstance

import dagger.Component

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentMatchers.eq

import org.mockito.Mockito

import org.mockito.Mockito.verify

import org.mockito.kotlin.mock

import org.mockito.kotlin.whenever



@RunWith(AndroidJUnit4::class)

@SmallTest

class NotificationShelfViewModelTest : SysuiTestCase() {



    @Component(modules = [SysUITestModule::class, ActivatableNotificationViewModelModule::class])

    @SysUISingleton

    interface TestComponent : SysUITestComponent<NotificationShelfViewModel> {



        val deviceEntryFaceAuthRepository: FakeDeviceEntryFaceAuthRepository

        val keyguardRepository: FakeKeyguardRepository

        val powerRepository: FakePowerRepository



        @Component.Factory

        interface Factory {

            fun create(

                @BindsInstance test: SysuiTestCase,

                mocks: TestMocksModule,

            ): TestComponent

        }

    }



    private val keyguardTransitionController: LockscreenShadeTransitionController = mock()

    private val screenOffAnimationController: ScreenOffAnimationController = mock {

        whenever(allowWakeUpIfDozing()).thenReturn(true)

    private val kosmos =

        Kosmos().apply {

            testCase = this@NotificationShelfViewModelTest

            lockscreenShadeTransitionController = mock()

            screenOffAnimationController = mock()

            statusBarStateController = mock()

            whenever(screenOffAnimationController.allowWakeUpIfDozing()).thenReturn(true)

        }

    private val statusBarStateController: SysuiStatusBarStateController = mock()



    private val testComponent: TestComponent =

        DaggerNotificationShelfViewModelTest_TestComponent.factory()

            .create(

                test = this,

                mocks =

                    TestMocksModule(

                        lockscreenShadeTransitionController = keyguardTransitionController,

                        screenOffAnimationController = screenOffAnimationController,

                        statusBarStateController = statusBarStateController,

                    )

            )

    private val underTest = kosmos.notificationShelfViewModel

    private val deviceEntryFaceAuthRepository = kosmos.fakeDeviceEntryFaceAuthRepository

    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val keyguardTransitionController = kosmos.lockscreenShadeTransitionController

    private val powerRepository = kosmos.fakePowerRepository



    @Test

    fun canModifyColorOfNotifications_whenKeyguardNotShowing() =

        testComponent.runTest {

        kosmos.runTest {

            val canModifyNotifColor by collectLastValue(underTest.canModifyColorOfNotifications)



            keyguardRepository.setKeyguardShowing(false)
@@ -95,7 +69,7 @@ class NotificationShelfViewModelTest : SysuiTestCase() { 


    @Test

    fun canModifyColorOfNotifications_whenKeyguardShowingAndNotBypass() =

        testComponent.runTest {

        kosmos.runTest {

            val canModifyNotifColor by collectLastValue(underTest.canModifyColorOfNotifications)



            keyguardRepository.setKeyguardShowing(true)
@@ -106,7 +80,7 @@ class NotificationShelfViewModelTest : SysuiTestCase() { 


    @Test

    fun cannotModifyColorOfNotifications_whenBypass() =

        testComponent.runTest {

        kosmos.runTest {

            val canModifyNotifColor by collectLastValue(underTest.canModifyColorOfNotifications)



            keyguardRepository.setKeyguardShowing(true)
@@ -117,7 +91,7 @@ class NotificationShelfViewModelTest : SysuiTestCase() { 


    @Test

    fun isClickable_whenKeyguardShowing() =

        testComponent.runTest {

        kosmos.runTest {

            val isClickable by collectLastValue(underTest.isClickable)



            keyguardRepository.setKeyguardShowing(true)
@@ -127,7 +101,7 @@ class NotificationShelfViewModelTest : SysuiTestCase() { 


    @Test

    fun isNotClickable_whenKeyguardNotShowing() =

        testComponent.runTest {

        kosmos.runTest {

            val isClickable by collectLastValue(underTest.isClickable)



            keyguardRepository.setKeyguardShowing(false)
@@ -137,7 +111,7 @@ class NotificationShelfViewModelTest : SysuiTestCase() { 


    @Test

    fun onClicked_goesToLockedShade() =

        with(testComponent) {

        kosmos.runTest {

            whenever(statusBarStateController.isDozing).thenReturn(true)



            underTest.onShelfClicked()