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

Commit afa3ba52 authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge changes Ice414d9d,I08c347c0,I35083685 into main 

* changes:
  Parameterize Lockscreen tests for scene container flag
  Remove unnecessary nullability
  Parameterize NotificationListViewModelTest for scene container flag
parents cdb2d3ae 845eed58

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ import platform.test.runner.parameterized.Parameters 
@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

class CommunalViewModelTest(flags: FlagsParameterization?) : SysuiTestCase() {

class CommunalViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {

    @Mock private lateinit var mediaHost: MediaHost

    @Mock private lateinit var user: UserInfo

    @Mock private lateinit var providerInfo: AppWidgetProviderInfo
@@ -111,7 +111,7 @@ class CommunalViewModelTest(flags: FlagsParameterization?) : SysuiTestCase() { 
    private lateinit var underTest: CommunalViewModel



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Before

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ import platform.test.runner.parameterized.Parameters 
@ExperimentalCoroutinesApi

@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

class UdfpsKeyguardInteractorTest(flags: FlagsParameterization?) : SysuiTestCase() {

class UdfpsKeyguardInteractorTest(flags: FlagsParameterization) : SysuiTestCase() {

    val kosmos = testKosmos()

    val testScope = kosmos.testScope

    val keyguardRepository = kosmos.fakeKeyguardRepository
@@ -88,7 +88,7 @@ class UdfpsKeyguardInteractorTest(flags: FlagsParameterization?) : SysuiTestCase 
    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Before

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/AodToLockscreenTransitionViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ import platform.test.runner.parameterized.Parameters 
@ExperimentalCoroutinesApi

@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

class AodToLockscreenTransitionViewModelTest(flags: FlagsParameterization?) : SysuiTestCase() {

class AodToLockscreenTransitionViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {

    val kosmos = testKosmos()

    val testScope = kosmos.testScope

    val repository = kosmos.fakeKeyguardTransitionRepository
@@ -60,7 +60,7 @@ class AodToLockscreenTransitionViewModelTest(flags: FlagsParameterization?) : Sy 
    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Before

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/BouncerToGoneFlowsTest.kt

+28 −14
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ 


package com.android.systemui.keyguard.ui.viewmodel



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

import android.platform.test.flag.junit.FlagsParameterization

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.bouncer.domain.interactor.mockPrimaryBouncerInteractor

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.BrokenWithSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.flags.fakeFeatureFlagsClassic

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

import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -31,29 +33,25 @@ import com.android.systemui.keyguard.shared.model.ScrimAlpha 
import com.android.systemui.keyguard.shared.model.TransitionState

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.shade.data.repository.shadeRepository

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.statusbar.sysuiStatusBarStateController

import com.android.systemui.testKosmos

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

import com.google.common.collect.Range

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

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mock

import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@SmallTest

@RunWith(AndroidJUnit4::class)

class BouncerToGoneFlowsTest : SysuiTestCase() {

    @Mock private lateinit var shadeInteractor: ShadeInteractor



    private val shadeExpansionStateFlow = MutableStateFlow(0.1f)

@RunWith(ParameterizedAndroidJunit4::class)

class BouncerToGoneFlowsTest(flags: FlagsParameterization) : SysuiTestCase() {



    private val kosmos =

        testKosmos().apply {
@@ -61,16 +59,31 @@ class BouncerToGoneFlowsTest : SysuiTestCase() { 
        }

    private val testScope = kosmos.testScope

    private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepository

    private val shadeRepository = kosmos.shadeRepository

    private val sysuiStatusBarStateController = kosmos.sysuiStatusBarStateController

    private val primaryBouncerInteractor = kosmos.mockPrimaryBouncerInteractor

    private val underTest = kosmos.bouncerToGoneFlows



    private val shadeTestUtil by lazy { kosmos.shadeTestUtil }



    private lateinit var underTest: BouncerToGoneFlows



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        whenever(primaryBouncerInteractor.willRunDismissFromKeyguard()).thenReturn(false)

        sysuiStatusBarStateController.setLeaveOpenOnKeyguardHide(false)

        underTest = kosmos.bouncerToGoneFlows

    }



    @Test
@@ -79,7 +92,7 @@ class BouncerToGoneFlowsTest : SysuiTestCase() { 
            val values by collectValues(underTest.scrimAlpha(500.milliseconds, PRIMARY_BOUNCER))

            runCurrent()



            shadeRepository.setLockscreenShadeExpansion(1f)

            shadeTestUtil.setLockscreenShadeExpansion(1f)

            whenever(primaryBouncerInteractor.willRunDismissFromKeyguard()).thenReturn(true)



            keyguardTransitionRepository.sendTransitionSteps(
@@ -99,12 +112,13 @@ class BouncerToGoneFlowsTest : SysuiTestCase() { 
        }



    @Test

    @BrokenWithSceneContainer(339465026)

    fun scrimAlpha_runDimissFromKeyguard_shadeNotExpanded() =

        testScope.runTest {

            val values by collectValues(underTest.scrimAlpha(500.milliseconds, PRIMARY_BOUNCER))

            runCurrent()



            shadeRepository.setLockscreenShadeExpansion(0f)

            shadeTestUtil.setLockscreenShadeExpansion(0f)



            whenever(primaryBouncerInteractor.willRunDismissFromKeyguard()).thenReturn(true)

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardRootViewModelTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ import platform.test.runner.parameterized.Parameters 


@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

class KeyguardRootViewModelTest(flags: FlagsParameterization?) : SysuiTestCase() {

class KeyguardRootViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope

    private val keyguardTransitionRepository by lazy { kosmos.fakeKeyguardTransitionRepository }
@@ -75,7 +75,6 @@ class KeyguardRootViewModelTest(flags: FlagsParameterization?) : SysuiTestCase() 


    private val viewState = ViewStateAccessor()



    // add to init block

    companion object {

        @JvmStatic

        @Parameters(name = "{0}")
@@ -85,7 +84,7 @@ class KeyguardRootViewModelTest(flags: FlagsParameterization?) : SysuiTestCase() 
    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    @Before