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

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

Merge changes I195c1613,Ib23cbc25,I3dd37666 into main 

* changes:
  Parameterize lockscreen transition view model tests for scenes
  Parameterize NotificationIconContainerStatusBarViewModelTest
  Parameterize AuthDialogPanelInteractionDetectorTest
parents c70fe157 2f35724d

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

+29 −8
Original line number Diff line number Diff line
@@ -16,36 +16,57 @@ 


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.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.andSceneContainer

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

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

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.fakeShadeRepository

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.testKosmos

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class AodToLockscreenTransitionViewModelTest : SysuiTestCase() {

@RunWith(ParameterizedAndroidJunit4::class)

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

    val kosmos = testKosmos()

    val testScope = kosmos.testScope

    val repository = kosmos.fakeKeyguardTransitionRepository

    val shadeRepository = kosmos.fakeShadeRepository

    val shadeTestUtil by lazy { kosmos.shadeTestUtil }

    val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository

    val underTest = kosmos.aodToLockscreenTransitionViewModel

    lateinit var underTest: AodToLockscreenTransitionViewModel



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    @Before

    fun setup() {

        underTest = kosmos.aodToLockscreenTransitionViewModel

    }



    @Test

    fun deviceEntryParentViewShows() =
@@ -65,7 +86,7 @@ class AodToLockscreenTransitionViewModelTest : SysuiTestCase() { 
        testScope.runTest {

            val alpha by collectLastValue(underTest.notificationAlpha)



            shadeRepository.setQsExpansion(0.5f)

            shadeTestUtil.setQsExpansion(0.5f)

            runCurrent()



            repository.sendTransitionStep(step(0f, TransitionState.STARTED))
@@ -81,7 +102,7 @@ class AodToLockscreenTransitionViewModelTest : SysuiTestCase() { 
        testScope.runTest {

            val alpha by collectLastValue(underTest.notificationAlpha)



            shadeRepository.setQsExpansion(0f)

            shadeTestUtil.setQsExpansion(0f)

            runCurrent()



            repository.sendTransitionStep(step(0f, TransitionState.STARTED))

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

+32 −9
Original line number Diff line number Diff line
@@ -16,13 +16,14 @@ 


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.biometrics.data.repository.fingerprintPropertyRepository

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.Flags.FULL_SCREEN_USER_SWITCHER

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.flags.fakeFeatureFlagsClassic

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

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository
@@ -32,31 +33,53 @@ import com.android.systemui.keyguard.shared.model.StatusBarState 
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.shadeTestUtil

import com.android.systemui.testKosmos

import com.google.common.collect.Range

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class LockscreenToAodTransitionViewModelTest : SysuiTestCase() {

@RunWith(ParameterizedAndroidJunit4::class)

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

    private val kosmos =

        testKosmos().apply {

            fakeFeatureFlagsClassic.apply { set(FULL_SCREEN_USER_SWITCHER, false) }

        }

    private val testScope = kosmos.testScope

    private val repository = kosmos.fakeKeyguardTransitionRepository

    private val shadeRepository = kosmos.shadeRepository

    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val fingerprintPropertyRepository = kosmos.fingerprintPropertyRepository

    private val biometricSettingsRepository = kosmos.biometricSettingsRepository

    private val underTest = kosmos.lockscreenToAodTransitionViewModel



    private val shadeTestUtil by lazy { kosmos.shadeTestUtil }



    lateinit var underTest: LockscreenToAodTransitionViewModel



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    @Before

    fun setup() {

        underTest = kosmos.lockscreenToAodTransitionViewModel

    }



    @Test

    fun backgroundViewAlpha_shadeNotExpanded() =
@@ -195,11 +218,11 @@ class LockscreenToAodTransitionViewModelTest : SysuiTestCase() { 


    private fun shadeExpanded(expanded: Boolean) {

        if (expanded) {

            shadeRepository.setQsExpansion(1f)

            shadeTestUtil.setQsExpansion(1f)

        } else {

            keyguardRepository.setStatusBarState(StatusBarState.KEYGUARD)

            shadeRepository.setQsExpansion(0f)

            shadeRepository.setLockscreenShadeExpansion(0f)

            shadeTestUtil.setQsExpansion(0f)

            shadeTestUtil.setLockscreenShadeExpansion(0f)

        }

    }

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

+28 −12
Original line number Diff line number Diff line
@@ -18,24 +18,25 @@ 


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.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

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.fakeKeyguardRepository

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

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

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

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

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

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

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

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.data.repository.ShadeRepository

import com.android.systemui.shade.ShadeTestUtil

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.testKosmos

import com.google.common.collect.Range

import com.google.common.truth.Truth.assertThat
@@ -45,10 +46,12 @@ import kotlinx.coroutines.test.runTest 
import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@SmallTest

@RunWith(AndroidJUnit4::class)

class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() {

@RunWith(ParameterizedAndroidJunit4::class)

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



    private val kosmos =

        testKosmos().apply {
@@ -56,14 +59,27 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { 
        }

    private val testScope = kosmos.testScope

    private lateinit var repository: FakeKeyguardTransitionRepository

    private lateinit var shadeRepository: ShadeRepository

    private lateinit var shadeTestUtil: ShadeTestUtil

    private lateinit var keyguardRepository: FakeKeyguardRepository

    private lateinit var underTest: LockscreenToDreamingTransitionViewModel



    // add to init block

    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    @Before

    fun setUp() {

        repository = kosmos.fakeKeyguardTransitionRepository

        shadeRepository = kosmos.shadeRepository

        shadeTestUtil = kosmos.shadeTestUtil

        keyguardRepository = kosmos.fakeKeyguardRepository

        underTest = kosmos.lockscreenToDreamingTransitionViewModel

    }
@@ -177,11 +193,11 @@ class LockscreenToDreamingTransitionViewModelTest : SysuiTestCase() { 


    private fun shadeExpanded(expanded: Boolean) {

        if (expanded) {

            shadeRepository.setQsExpansion(1f)

            shadeTestUtil.setQsExpansion(1f)

        } else {

            keyguardRepository.setStatusBarState(StatusBarState.KEYGUARD)

            shadeRepository.setQsExpansion(0f)

            shadeRepository.setLockscreenShadeExpansion(0f)

            shadeTestUtil.setQsExpansion(0f)

            shadeTestUtil.setLockscreenShadeExpansion(0f)

        }

    }

}

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

+29 −13
Original line number Diff line number Diff line
@@ -18,27 +18,28 @@ 


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.common.ui.data.repository.fakeConfigurationRepository

import com.android.systemui.common.ui.data.repository.FakeConfigurationRepository

import com.android.systemui.common.ui.data.repository.fakeConfigurationRepository

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectValues

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.fakeKeyguardRepository

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

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

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

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

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

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

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

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.res.R

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

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

import com.android.systemui.shade.ShadeTestUtil

import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.testKosmos

import com.google.common.collect.Range

import com.google.common.truth.Truth.assertThat
@@ -48,25 +49,40 @@ import kotlinx.coroutines.test.runTest 
import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@SmallTest

@RunWith(AndroidJUnit4::class)

class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() {

@RunWith(ParameterizedAndroidJunit4::class)

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

    private val kosmos =

        testKosmos().apply {

            fakeFeatureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, false) }

        }

    private val testScope = kosmos.testScope

    private lateinit var repository: FakeKeyguardTransitionRepository

    private lateinit var shadeRepository: ShadeRepository

    private lateinit var shadeTestUtil: ShadeTestUtil

    private lateinit var keyguardRepository: FakeKeyguardRepository

    private lateinit var configurationRepository: FakeConfigurationRepository

    private lateinit var underTest: LockscreenToOccludedTransitionViewModel



    // add to init block

    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    @Before

    fun setUp() {

        repository = kosmos.fakeKeyguardTransitionRepository

        shadeRepository = kosmos.shadeRepository

        shadeTestUtil = kosmos.shadeTestUtil

        keyguardRepository = kosmos.fakeKeyguardRepository

        configurationRepository = kosmos.fakeConfigurationRepository

        underTest = kosmos.lockscreenToOccludedTransitionViewModel
@@ -200,11 +216,11 @@ class LockscreenToOccludedTransitionViewModelTest : SysuiTestCase() { 


    private fun shadeExpanded(expanded: Boolean) {

        if (expanded) {

            shadeRepository.setQsExpansion(1f)

            shadeTestUtil.setQsExpansion(1f)

        } else {

            keyguardRepository.setStatusBarState(StatusBarState.KEYGUARD)

            shadeRepository.setQsExpansion(0f)

            shadeRepository.setLockscreenShadeExpansion(0f)

            shadeTestUtil.setQsExpansion(0f)

            shadeTestUtil.setLockscreenShadeExpansion(0f)

        }

    }

}

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

+31 −9
Original line number Diff line number Diff line
@@ -16,11 +16,12 @@ 


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.coroutines.collectLastValue

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.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
@@ -29,29 +30,50 @@ import com.android.systemui.keyguard.shared.model.StatusBarState 
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.shadeTestUtil

import com.android.systemui.testKosmos

import com.google.common.collect.Range

import com.google.common.truth.Truth

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@ExperimentalCoroutinesApi

@SmallTest

@RunWith(AndroidJUnit4::class)

class LockscreenToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() {

@RunWith(ParameterizedAndroidJunit4::class)

class LockscreenToPrimaryBouncerTransitionViewModelTest(flags: FlagsParameterization?) :

    SysuiTestCase() {

    private val kosmos =

        testKosmos().apply {

            fakeFeatureFlagsClassic.apply { set(Flags.FULL_SCREEN_USER_SWITCHER, false) }

        }

    private val testScope = kosmos.testScope

    private val repository = kosmos.fakeKeyguardTransitionRepository

    private val shadeRepository = kosmos.shadeRepository

    private val shadeTestUtil by lazy { kosmos.shadeTestUtil }

    private val keyguardRepository = kosmos.fakeKeyguardRepository

    private val underTest = kosmos.lockscreenToPrimaryBouncerTransitionViewModel

    private lateinit var underTest: LockscreenToPrimaryBouncerTransitionViewModel



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    @Before

    fun setup() {

        underTest = kosmos.lockscreenToPrimaryBouncerTransitionViewModel

    }



    @Test

    fun deviceEntryParentViewAlpha_shadeExpanded() =
@@ -119,11 +141,11 @@ class LockscreenToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() { 


    private fun shadeExpanded(expanded: Boolean) {

        if (expanded) {

            shadeRepository.setQsExpansion(1f)

            shadeTestUtil.setQsExpansion(1f)

        } else {

            keyguardRepository.setStatusBarState(StatusBarState.KEYGUARD)

            shadeRepository.setQsExpansion(0f)

            shadeRepository.setLockscreenShadeExpansion(0f)

            shadeTestUtil.setQsExpansion(0f)

            shadeTestUtil.setLockscreenShadeExpansion(0f)

        }

    }

}