Merge "Fix up tests with glanceable hub V2 enabled" into main (f21fba80) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ class ShadeTouchHandlerTest(flags: FlagsParameterization) : SysuiTestCase() {
		@Test
		@DisableFlags(
		Flags.FLAG_COMMUNAL_HUB,
		Flags.FLAG_GLANCEABLE_HUB_V2,
		Flags.FLAG_HUBMODE_FULLSCREEN_VERTICAL_SWIPE_FIX,
		Flags.FLAG_SCENE_CONTAINER,
		)

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/CommunalMetricsStartableTest.kt

+10 −9

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.systemui.communal
		import android.app.StatsManager
		import android.app.StatsManager.StatsPullAtomCallback
		import android.content.pm.UserInfo
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.util.StatsEvent
		import androidx.test.ext.junit.runners.AndroidJUnit4
		@@ -32,6 +33,7 @@ import com.android.systemui.communal.shared.log.CommunalMetricsLogger
		import com.android.systemui.concurrency.fakeExecutor
		import com.android.systemui.flags.Flags.COMMUNAL_SERVICE_ENABLED
		import com.android.systemui.flags.fakeFeatureFlagsClassic
		import com.android.systemui.kosmos.runTest
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.settings.fakeUserTracker
		import com.android.systemui.shared.system.SysUiStatsLog
		@@ -75,10 +77,7 @@ class CommunalMetricsStartableTest : SysuiTestCase() {
		// Set up an existing user, which is required for widgets to show
		val userInfos = listOf(UserInfo(0, "main", UserInfo.FLAG_MAIN))
		userRepository.setUserInfos(userInfos)
		userTracker.set(
		userInfos = userInfos,
		selectedUserIndex = 0,
		)
		userTracker.set(userInfos = userInfos, selectedUserIndex = 0)

		underTest =
		CommunalMetricsStartable(
		@@ -90,9 +89,11 @@ class CommunalMetricsStartableTest : SysuiTestCase() {
		)
		}

		@DisableFlags(Flags.FLAG_GLANCEABLE_HUB_V2)
		@Test
		fun start_communalFlagDisabled_doNotSetPullAtomCallback() {
		kosmos.fakeFeatureFlagsClassic.set(COMMUNAL_SERVICE_ENABLED, false)
		fun start_communalFlagDisabled_doNotSetPullAtomCallback() =
		kosmos.runTest {
		fakeFeatureFlagsClassic.set(COMMUNAL_SERVICE_ENABLED, false)

		underTest.start()

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalSettingsRepositoryImplTest.kt

+22 −7

Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ import android.content.res.mainResources
		import android.os.UserManager.USER_TYPE_PROFILE_MANAGED
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.platform.test.flag.junit.FlagsParameterization
		import android.provider.Settings
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags.FLAG_COMMUNAL_HUB
		import com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2
		@@ -35,10 +35,13 @@ import com.android.systemui.SysuiTestCase
		import com.android.systemui.broadcast.broadcastDispatcher
		import com.android.systemui.communal.data.model.DisabledReason
		import com.android.systemui.communal.data.repository.CommunalSettingsRepositoryImpl.Companion.GLANCEABLE_HUB_BACKGROUND_SETTING
		import com.android.systemui.communal.domain.interactor.setCommunalV2Enabled
		import com.android.systemui.communal.shared.model.CommunalBackgroundType
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.flags.Flags.COMMUNAL_SERVICE_ENABLED
		import com.android.systemui.flags.fakeFeatureFlagsClassic
		import com.android.systemui.kosmos.collectLastValue
		import com.android.systemui.kosmos.runTest
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import com.android.systemui.util.mockito.nullable
		@@ -51,15 +54,21 @@ import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.ArgumentMatchers.eq
		import platform.test.runner.parameterized.ParameterizedAndroidJunit4
		import platform.test.runner.parameterized.Parameters

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class CommunalSettingsRepositoryImplTest : SysuiTestCase() {
		@RunWith(ParameterizedAndroidJunit4::class)
		class CommunalSettingsRepositoryImplTest(flags: FlagsParameterization?) : SysuiTestCase() {
		private val kosmos =
		testKosmos().apply { mainResources = mContext.orCreateTestableResources.resources }
		private val testScope = kosmos.testScope
		private lateinit var underTest: CommunalSettingsRepository

		init {
		mSetFlagsRule.setFlagsParameterization(flags!!)
		}

		@Before
		fun setUp() {
		kosmos.fakeFeatureFlagsClassic.set(COMMUNAL_SERVICE_ENABLED, true)
		@@ -164,17 +173,17 @@ class CommunalSettingsRepositoryImplTest : SysuiTestCase() {
		assertThat(enabledState).containsExactly(DisabledReason.DISABLED_REASON_INVALID_USER)
		}

		@EnableFlags(FLAG_COMMUNAL_HUB)
		@EnableFlags(FLAG_COMMUNAL_HUB, FLAG_GLANCEABLE_HUB_V2)
		@Test
		fun classicFlagIsDisabled() =
		testScope.runTest {
		kosmos.fakeFeatureFlagsClassic.set(COMMUNAL_SERVICE_ENABLED, false)
		kosmos.runTest {
		setCommunalV2Enabled(false)
		val enabledState by collectLastValue(underTest.getEnabledState(PRIMARY_USER))
		assertThat(enabledState?.enabled).isFalse()
		assertThat(enabledState).containsExactly(DisabledReason.DISABLED_REASON_FLAG)
		}

		@DisableFlags(FLAG_COMMUNAL_HUB)
		@DisableFlags(FLAG_COMMUNAL_HUB, FLAG_GLANCEABLE_HUB_V2)
		@Test
		fun communalHubFlagIsDisabled() =
		testScope.runTest {
		@@ -310,5 +319,11 @@ class CommunalSettingsRepositoryImplTest : SysuiTestCase() {
		val SECONDARY_USER = UserInfo(/* id= / 1, / name= / "secondary user", / flags= */ 0)
		val WORK_PROFILE =
		UserInfo(10, "work", /* iconPath= / "", / flags= */ 0, USER_TYPE_PROFILE_MANAGED)

		@JvmStatic
		@Parameters(name = "{0}")
		fun getParams(): List<FlagsParameterization> {
		return FlagsParameterization.allCombinationsOf(FLAG_GLANCEABLE_HUB_V2)
		}
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.compose.animation.scene.ObservableTransitionState
		import com.android.systemui.Flags.FLAG_COMMUNAL_HUB
		import com.android.systemui.Flags.FLAG_COMMUNAL_RESPONSIVE_GRID
		import com.android.systemui.Flags.FLAG_COMMUNAL_WIDGET_RESIZING
		import com.android.systemui.Flags.FLAG_GLANCEABLE_HUB_V2
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.broadcast.broadcastDispatcher
		import com.android.systemui.communal.data.model.CommunalSmartspaceTimer
		@@ -232,7 +233,7 @@ class CommunalInteractorTest(flags: FlagsParameterization) : SysuiTestCase() {
		@Test
		fun isCommunalAvailable_communalDisabled_false() =
		testScope.runTest {
		mSetFlagsRule.disableFlags(FLAG_COMMUNAL_HUB)
		mSetFlagsRule.disableFlags(FLAG_COMMUNAL_HUB, FLAG_GLANCEABLE_HUB_V2)

		val isAvailable by collectLastValue(underTest.isCommunalAvailable)
		assertThat(isAvailable).isFalse()

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -92,10 +92,10 @@ import org.junit.runner.RunWith
		import org.mockito.ArgumentCaptor
		import org.mockito.Mockito
		import org.mockito.Mockito.clearInvocations
		import org.mockito.Mockito.isNull
		import org.mockito.Mockito.never
		import org.mockito.Mockito.verify
		import org.mockito.kotlin.any
		import org.mockito.kotlin.anyOrNull
		import org.mockito.kotlin.argumentCaptor
		import org.mockito.kotlin.eq
		import org.mockito.kotlin.firstValue
		@@ -768,7 +768,7 @@ class DreamOverlayServiceTest(flags: FlagsParameterization?) : SysuiTestCase() {
		runCurrent()
		verify(mDreamOverlayCallback).onRedirectWake(true)
		client.onWakeRequested()
		verify(mCommunalInteractor).changeScene(eq(CommunalScenes.Communal), any(), isNull())
		verify(mCommunalInteractor).changeScene(eq(CommunalScenes.Communal), any(), anyOrNull())
		verify(mUiEventLogger).log(CommunalUiEvent.DREAM_TO_COMMUNAL_HUB_DREAM_AWAKE_START)
		}