diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/flags/Flags.kt | 2 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt | 21 |
2 files changed, 9 insertions, 14 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt index 256c4ffe441c..03b8436915c4 100644 --- a/packages/SystemUI/src/com/android/systemui/flags/Flags.kt +++ b/packages/SystemUI/src/com/android/systemui/flags/Flags.kt @@ -525,7 +525,7 @@ object Flags { // 1500 - chooser aka sharesheet // TODO(b/254512507): Tracking Bug - val CHOOSER_UNBUNDLED = releasedFlag(1500, "chooser_unbundled") + val CHOOSER_UNBUNDLED = unreleasedFlag(1500, "chooser_unbundled", teamfood = true) // TODO(b/266983432) Tracking Bug val SHARESHEET_CUSTOM_ACTIONS = diff --git a/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt index babbe451dd6a..32edf8f23aed 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt @@ -11,7 +11,6 @@ import com.android.systemui.flags.FeatureFlags import com.android.systemui.flags.Flag import com.android.systemui.flags.FlagListenable import com.android.systemui.flags.Flags -import com.android.systemui.flags.ReleasedFlag import com.android.systemui.flags.UnreleasedFlag import com.android.systemui.settings.UserTracker import com.android.systemui.util.mockito.any @@ -103,7 +102,7 @@ class ChooserSelectorTest : SysuiTestCase() { @Test fun initialize_enablesUnbundledChooser_whenFlagEnabled() { // Arrange - setFlagMock(true) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true) // Act chooserSelector.start() @@ -119,7 +118,7 @@ class ChooserSelectorTest : SysuiTestCase() { @Test fun initialize_disablesUnbundledChooser_whenFlagDisabled() { // Arrange - setFlagMock(false) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) // Act chooserSelector.start() @@ -135,7 +134,7 @@ class ChooserSelectorTest : SysuiTestCase() { @Test fun enablesUnbundledChooser_whenFlagBecomesEnabled() { // Arrange - setFlagMock(false) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) chooserSelector.start() verify(mockFeatureFlags).addListener( eq<Flag<*>>(Flags.CHOOSER_UNBUNDLED), @@ -148,7 +147,7 @@ class ChooserSelectorTest : SysuiTestCase() { ) // Act - setFlagMock(true) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true) flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.name)) // Assert @@ -162,7 +161,7 @@ class ChooserSelectorTest : SysuiTestCase() { @Test fun disablesUnbundledChooser_whenFlagBecomesDisabled() { // Arrange - setFlagMock(true) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true) chooserSelector.start() verify(mockFeatureFlags).addListener( eq<Flag<*>>(Flags.CHOOSER_UNBUNDLED), @@ -175,7 +174,7 @@ class ChooserSelectorTest : SysuiTestCase() { ) // Act - setFlagMock(false) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.name)) // Assert @@ -189,7 +188,7 @@ class ChooserSelectorTest : SysuiTestCase() { @Test fun doesNothing_whenAnotherFlagChanges() { // Arrange - setFlagMock(false) + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) chooserSelector.start() verify(mockFeatureFlags).addListener( eq<Flag<*>>(Flags.CHOOSER_UNBUNDLED), @@ -198,17 +197,13 @@ class ChooserSelectorTest : SysuiTestCase() { clearInvocations(mockPackageManager) // Act + whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false) flagListener.value.onFlagChanged(TestFlagEvent("other flag")) // Assert verifyZeroInteractions(mockPackageManager) } - private fun setFlagMock(enabled: Boolean) { - whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(enabled) - whenever(mockFeatureFlags.isEnabled(any<ReleasedFlag>())).thenReturn(enabled) - } - private class TestFlagEvent(override val flagName: String) : FlagListenable.FlagEvent { override fun requestNoRestart() {} } |