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

Commit 94e22a5d authored by Aaron Liu's avatar Aaron Liu
Browse files

Change DisableFlags to DisableSceneContainer 

Use DisableSceneContainer so that it's more intuitive when disabling and
enabling flexiglass in tests.

Test: atest
Fixes: 333570229
Flag: ACONFIG com.android.system_ui.scene_container DEVELOPMENT
Change-Id: If3cbfe28d1579a1ef162685f9cf86ba458331196
parent db03730b

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

+3 −4
Original line number Diff line number Diff line
@@ -16,14 +16,13 @@ 


package com.android.systemui.keyguard.domain.interactor



import android.platform.test.annotations.DisableFlags

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

import androidx.test.filters.SmallTest

import com.android.keyguard.KeyguardClockSwitch.LARGE

import com.android.keyguard.KeyguardClockSwitch.SMALL

import com.android.systemui.Flags as AConfigFlags

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.flags.Flags

import com.android.systemui.flags.fakeFeatureFlagsClassic
@@ -66,7 +65,7 @@ class KeyguardClockInteractorTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(AConfigFlags.FLAG_SCENE_CONTAINER)

    @DisableSceneContainer

    fun clockSize_sceneContainerFlagOff_basedOnRepository() =

        testScope.runTest {

            val value by collectLastValue(underTest.clockSize)
@@ -78,7 +77,7 @@ class KeyguardClockInteractorTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(AConfigFlags.FLAG_SCENE_CONTAINER)

    @DisableSceneContainer

    fun clockShouldBeCentered_sceneContainerFlagOff_basedOnRepository() =

        testScope.runTest {

            val value by collectLastValue(underTest.clockShouldBeCentered)

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -20,13 +20,11 @@ package com.android.systemui.scene.domain.startable 


import android.app.StatusBarManager

import android.os.PowerManager

import android.platform.test.annotations.EnableFlags

import android.view.Display

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

import androidx.test.filters.SmallTest

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.compose.animation.scene.SceneKey

import com.android.systemui.Flags as AconfigFlags

import com.android.systemui.SysuiTestCase

import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository

import com.android.systemui.authentication.domain.interactor.authenticationInteractor
@@ -40,6 +38,7 @@ import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepositor 
import com.android.systemui.deviceentry.domain.interactor.deviceEntryFaceAuthInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceEntryInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor

import com.android.systemui.flags.EnableSceneContainer

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

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

import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository
@@ -94,7 +93,7 @@ import org.mockito.MockitoAnnotations 


@SmallTest

@RunWith(AndroidJUnit4::class)

@EnableFlags(AconfigFlags.FLAG_SCENE_CONTAINER)

@EnableSceneContainer

class SceneContainerStartableTest : SysuiTestCase() {



    @Mock private lateinit var windowController: NotificationShadeWindowController

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/shared/flag/SceneContainerFlagsTest.kt

+2 −3
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 


package com.android.systemui.scene.shared.flag



import android.platform.test.annotations.DisableFlags

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

import androidx.test.filters.SmallTest

import com.android.systemui.Flags.FLAG_SCENE_CONTAINER

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.flags.EnableSceneContainer

import com.android.systemui.kosmos.Kosmos

import com.google.common.truth.Truth
@@ -32,7 +31,7 @@ import org.junit.runner.RunWith 
internal class SceneContainerFlagsTest : SysuiTestCase() {



    @Test

    @DisableFlags(FLAG_SCENE_CONTAINER)

    @DisableSceneContainer

    fun isNotEnabled_withoutAconfigFlags() {

        Truth.assertThat(SceneContainerFlag.isEnabled).isEqualTo(false)

        Truth.assertThat(SceneContainerFlagsImpl().isEnabled()).isEqualTo(false)

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardClockViewModelTest.kt

+2 −11
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.keyguard.KeyguardClockSwitch 
import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer

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

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

import com.android.systemui.keyguard.data.repository.keyguardRepository
@@ -49,6 +50,7 @@ import org.mockito.Mockito.mock 


@SmallTest

@RunWith(JUnit4::class)

@DisableSceneContainer

class KeyguardClockViewModelTest : SysuiTestCase() {

    private lateinit var kosmos: Kosmos

    private lateinit var underTest: KeyguardClockViewModel
@@ -71,7 +73,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun currentClockLayout_splitShadeOn_clockCentered_largeClock() =

        testScope.runTest {

            with(kosmos) {
@@ -84,7 +85,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun currentClockLayout_splitShadeOn_clockNotCentered_largeClock_splitShadeLargeClock() =

        testScope.runTest {

            with(kosmos) {
@@ -98,7 +98,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun currentClockLayout_splitShadeOn_clockNotCentered_smallClock_splitShadeSmallClock() =

        testScope.runTest {

            with(kosmos) {
@@ -112,7 +111,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun currentClockLayout_singleShade_smallClock_smallClock() =

        testScope.runTest {

            with(kosmos) {
@@ -124,7 +122,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun currentClockLayout_singleShade_largeClock_largeClock() =

        testScope.runTest {

            with(kosmos) {
@@ -136,7 +133,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun hasCustomPositionUpdatedAnimation_withConfigTrue_isTrue() =

        testScope.runTest {

            with(kosmos) {
@@ -151,7 +147,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun hasCustomPositionUpdatedAnimation_withConfigFalse_isFalse() =

        testScope.runTest {

            with(kosmos) {
@@ -167,7 +162,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun testClockSize_alwaysSmallClockSize() =

        testScope.runTest {

            kosmos.fakeKeyguardClockRepository.setSelectedClockSize(SettingsClockSize.SMALL)
@@ -178,7 +172,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun testClockSize_dynamicClockSize() =

        testScope.runTest {

            kosmos.keyguardClockRepository.setClockSize(KeyguardClockSwitch.SMALL)
@@ -191,7 +184,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun isLargeClockVisible_whenLargeClockSize_isTrue() =

        testScope.runTest {

            kosmos.keyguardClockRepository.setClockSize(KeyguardClockSwitch.LARGE)
@@ -200,7 +192,6 @@ class KeyguardClockViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    fun isLargeClockVisible_whenSmallClockSize_isFalse() =

        testScope.runTest {

            kosmos.keyguardClockRepository.setClockSize(KeyguardClockSwitch.SMALL)

packages/SystemUI/tests/src/com/android/systemui/shade/transition/ScrimShadeTransitionControllerTest.kt

+3 −4
Original line number Diff line number Diff line 
package com.android.systemui.shade.transition



import android.platform.test.annotations.DisableFlags

import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.deviceentry.data.repository.FakeDeviceEntryRepository

import com.android.systemui.deviceentry.data.repository.fakeDeviceEntryRepository

import com.android.systemui.deviceentry.domain.interactor.DeviceUnlockedInteractor

import com.android.systemui.deviceentry.domain.interactor.deviceUnlockedInteractor

import com.android.systemui.dump.DumpManager

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.kosmos.testScope

import com.android.systemui.scene.domain.interactor.SceneInteractor
@@ -70,7 +69,7 @@ class ScrimShadeTransitionControllerTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    @DisableSceneContainer

    fun onPanelExpansionChanged_setsFractionEqualToEventFraction() {

        underTest.onPanelExpansionChanged(DEFAULT_EXPANSION_EVENT)
@@ -78,7 +77,7 @@ class ScrimShadeTransitionControllerTest : SysuiTestCase() { 
    }



    @Test

    @DisableFlags(Flags.FLAG_SCENE_CONTAINER)

    @DisableSceneContainer

    fun onPanelStateChanged_forwardsToScrimTransitionController() {

        startLegacyPanelExpansion()