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

Commit c33ff2e5 authored by Ahmed Mehfooz's avatar Ahmed Mehfooz
Browse files

[Flexi] Fix FromAodTransitionInteractorTest and FromAlternateBouncerTransitionInteractorTest 

Parameterize tests and ensure they pass when SceneContainerFlag is enabled.

Bug: 416716666
Bug: 416717131
Test: FromAodTransitionInteractorTest, FromAlternateBouncerTransitionInteractorTest
Flag: com.android.systemui.scene_container
Change-Id: Ic78aeb9e5c8e5eba9df1640afdc4d8880022e6b8
parent 584dfecc

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.communal.domain.interactor.setCommunalV2ConfigEnable 
import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.EditModeState

import com.android.systemui.communal.shared.model.EditModeState

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.andSceneContainer

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

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

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

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

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

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepositorySpy
@@ -83,6 +84,7 @@ class FromAlternateBouncerTransitionInteractorTest(flags: FlagsParameterization) 
        @Parameters(name = "{0}")

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf(FLAG_GLANCEABLE_HUB_V2)

            return FlagsParameterization.allCombinationsOf(FLAG_GLANCEABLE_HUB_V2)

                .andSceneContainer()

        }

        }

    }

    }
@@ -257,6 +259,7 @@ class FromAlternateBouncerTransitionInteractorTest(flags: FlagsParameterization) 




    @Test

    @Test

    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)

    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)

    @DisableSceneContainer

    fun transitionToOccluded_glanceableHubShowing() =

    fun transitionToOccluded_glanceableHubShowing() =

        kosmos.runTest {

        kosmos.runTest {

            val currentScene by collectLastValue(communalSceneInteractor.currentScene)

            val currentScene by collectLastValue(communalSceneInteractor.currentScene)

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

+22 −4
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ package com.android.systemui.keyguard.domain.interactor 
import android.os.PowerManager

import android.os.PowerManager

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.platform.test.annotations.EnableFlags

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

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

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.Flags

import com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2

import com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2
@@ -48,6 +48,7 @@ import com.android.systemui.communal.domain.interactor.setCommunalV2Available 
import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.andSceneContainer

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

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

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

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

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

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepositorySpy
@@ -73,6 +74,7 @@ import com.android.systemui.statusbar.domain.interactor.keyguardOcclusionInterac 
import com.android.systemui.testKosmos

import com.android.systemui.testKosmos

import com.google.common.truth.Truth

import com.google.common.truth.Truth

import junit.framework.Assert.assertEquals

import junit.framework.Assert.assertEquals

import kotlin.time.Duration.Companion.milliseconds

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.runBlocking

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runCurrent
@@ -81,11 +83,25 @@ import org.junit.Before 
import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.mockito.Mockito.reset

import org.mockito.Mockito.reset

import kotlin.time.Duration.Companion.milliseconds

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters





@SmallTest

@SmallTest

@RunWith(AndroidJUnit4::class)

@RunWith(ParameterizedAndroidJunit4::class)

class FromAodTransitionInteractorTest : SysuiTestCase() {

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



    companion object {

        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }



    init {

        mSetFlagsRule.setFlagsParameterization(flags)

    }



    private val kosmos =

    private val kosmos =

        testKosmos().apply {

        testKosmos().apply {

            this.keyguardTransitionRepository = fakeKeyguardTransitionRepositorySpy

            this.keyguardTransitionRepository = fakeKeyguardTransitionRepositorySpy
@@ -451,6 +467,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 




    @Test

    @Test

    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)

    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)

    @DisableSceneContainer

    fun testTransitionToGlanceableHub_onWakeUpFromAod() =

    fun testTransitionToGlanceableHub_onWakeUpFromAod() =

        kosmos.runTest {

        kosmos.runTest {

            setCommunalV2Available(true)

            setCommunalV2Available(true)
@@ -470,6 +487,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 




    @Test

    @Test

    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)

    @EnableFlags(FLAG_GLANCEABLE_HUB_V2)

    @DisableSceneContainer

    fun testDoNotTransitionToGlanceableHub_onWakeUpFromAodDueToMotion() =

    fun testDoNotTransitionToGlanceableHub_onWakeUpFromAodDueToMotion() =

        kosmos.runTest {

        kosmos.runTest {

            setCommunalV2Available(true)

            setCommunalV2Available(true)