Merge "Add correct flagging for tests" into main (43790ba5) · Commits · e / os / android_frameworks_base

packages/SystemUI/tests/src/com/android/keyguard/ClockEventControllerTest.kt

+2 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.view.ViewTreeObserver
		import android.widget.FrameLayout
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.Flags as AConfigFlags
		import com.android.systemui.broadcast.BroadcastDispatcher
		import com.android.systemui.flags.Flags
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		@@ -259,6 +260,7 @@ class ClockEventControllerTest : SysuiTestCase() {
		@Test
		fun keyguardCallback_visibilityChanged_clockDozeCalled() =
		runBlocking(IMMEDIATE) {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		val captor = argumentCaptor<KeyguardUpdateMonitorCallback>()
		verify(keyguardUpdateMonitor).registerCallback(capture(captor))

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewTest.kt

+1 −0

Original line number	Diff line number	Diff line
		@@ -207,6 +207,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() {
		@Test
		fun testDragDownHelperCalledWhenDraggingDown() =
		testScope.runTest {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		whenever(dragDownHelper.isDraggingDown).thenReturn(true)
		val now = SystemClock.elapsedRealtime()
		val ev = MotionEvent.obtain(now, now, MotionEvent.ACTION_UP, 0f, 0f, 0 /* meta */)

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationsQSContainerControllerLegacyTest.kt

+8 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import androidx.annotation.IdRes
		import androidx.constraintlayout.widget.ConstraintLayout
		import androidx.constraintlayout.widget.ConstraintSet
		import androidx.test.filters.SmallTest
		import com.android.systemui.Flags as AConfigFlags
		import com.android.systemui.Flags.FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.fragments.FragmentHostManager
		@@ -400,6 +401,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {

		@Test
		fun testSplitShadeLayout_isAlignedToGuideline() {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		enableSplitShade()
		underTest.updateResources()
		assertThat(getConstraintSetLayout(R.id.qs_frame).endToEnd).isEqualTo(R.id.qs_edge_guideline)
		@@ -409,6 +411,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {

		@Test
		fun testSinglePaneLayout_childrenHaveEqualMargins() {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		disableSplitShade()
		underTest.updateResources()
		val qsStartMargin = getConstraintSetLayout(R.id.qs_frame).startMargin
		@@ -425,6 +428,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {

		@Test
		fun testSplitShadeLayout_childrenHaveInsideMarginsOfZero() {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		enableSplitShade()
		underTest.updateResources()
		assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin).isEqualTo(0)
		@@ -443,6 +447,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {
		@Test
		fun testLargeScreenLayout_refactorFlagOff_qsAndNotifsTopMarginIsOfHeaderHeightResource() {
		mSetFlagsRule.disableFlags(FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR)
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		setLargeScreen()
		val largeScreenHeaderResourceHeight = 100
		val largeScreenHeaderHelperHeight = 200
		@@ -465,6 +470,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {
		@Test
		fun testLargeScreenLayout_refactorFlagOn_qsAndNotifsTopMarginIsOfHeaderHeightHelper() {
		mSetFlagsRule.enableFlags(FLAG_CENTRALIZED_STATUS_BAR_DIMENS_REFACTOR)
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		setLargeScreen()
		val largeScreenHeaderResourceHeight = 100
		val largeScreenHeaderHelperHeight = 200
		@@ -486,6 +492,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {

		@Test
		fun testSmallScreenLayout_qsAndNotifsTopMarginIsZero() {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		setSmallScreen()
		underTest.updateResources()
		assertThat(getConstraintSetLayout(R.id.qs_frame).topMargin).isEqualTo(0)
		@@ -506,6 +513,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() {

		@Test
		fun testSinglePaneShadeLayout_isAlignedToParent() {
		mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)
		disableSplitShade()
		underTest.updateResources()
		assertThat(getConstraintSetLayout(R.id.qs_frame).endToEnd)

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/LegacyNotificationIconAreaControllerImplTest.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.testing.TestableLooper;

		import androidx.test.filters.SmallTest;

		import com.android.systemui.Flags;
		import com.android.systemui.SysuiTestCase;
		import com.android.systemui.demomode.DemoModeController;
		import com.android.systemui.flags.FeatureFlags;
		@@ -118,6 +119,7 @@ public class LegacyNotificationIconAreaControllerImplTest extends SysuiTestCase

		@Test
		public void testAppearResetsTranslation() {
		mSetFlagsRule.disableFlags(Flags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL);
		mController.setupAodIcons(mAodIcons);
		when(mDozeParameters.shouldControlScreenOff()).thenReturn(false);
		mController.appearAodIcons();