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

Commit dd6ce3f0 authored by Matt Pietal's avatar Matt Pietal
Browse files

Fix broken tests 

Need to use the updated flag.

Fixes: 325271165
Test: atest SystemUITests
Flag: ACONFIG com.android.systemui.migrate_clocks_to_blueprint
DEVELOPMENT

Change-Id: I7b1014ac02061a052dad30172099c3f8023c64dc
parent 9375261e

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

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ class NotificationShadeWindowViewTest : SysuiTestCase() { 
    @Test

    fun testDragDownHelperCalledWhenDraggingDown() =

        testScope.runTest {

            mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

            mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

            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

+7 −7
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testSplitShadeLayout_isAlignedToGuideline() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        enableSplitShade()

        underTest.updateResources()

        assertThat(getConstraintSetLayout(R.id.qs_frame).endToEnd).isEqualTo(R.id.qs_edge_guideline)
@@ -411,7 +411,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testSinglePaneLayout_childrenHaveEqualMargins() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        disableSplitShade()

        underTest.updateResources()

        val qsStartMargin = getConstraintSetLayout(R.id.qs_frame).startMargin
@@ -428,7 +428,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testSplitShadeLayout_childrenHaveInsideMarginsOfZero() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        enableSplitShade()

        underTest.updateResources()

        assertThat(getConstraintSetLayout(R.id.qs_frame).endMargin).isEqualTo(0)
@@ -446,8 +446,8 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testLargeScreenLayout_refactorFlagOff_qsAndNotifsTopMarginIsOfHeaderHeightResource() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        mSetFlagsRule.disableFlags(FLAG_CENTRALIZED_STATUS_BAR_HEIGHT_FIX)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        setLargeScreen()

        val largeScreenHeaderResourceHeight = 100

        val largeScreenHeaderHelperHeight = 200
@@ -469,8 +469,8 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testLargeScreenLayout_refactorFlagOn_qsAndNotifsTopMarginIsOfHeaderHeightHelper() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        mSetFlagsRule.enableFlags(FLAG_CENTRALIZED_STATUS_BAR_HEIGHT_FIX)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        setLargeScreen()

        val largeScreenHeaderResourceHeight = 100

        val largeScreenHeaderHelperHeight = 200
@@ -492,7 +492,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testSmallScreenLayout_qsAndNotifsTopMarginIsZero() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        setSmallScreen()

        underTest.updateResources()

        assertThat(getConstraintSetLayout(R.id.qs_frame).topMargin).isEqualTo(0)
@@ -513,7 +513,7 @@ class NotificationsQSContainerControllerLegacyTest : SysuiTestCase() { 


    @Test

    fun testSinglePaneShadeLayout_isAlignedToParent() {

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL)

        mSetFlagsRule.disableFlags(AConfigFlags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT)

        disableSplitShade()

        underTest.updateResources()

        assertThat(getConstraintSetLayout(R.id.qs_frame).endToEnd)

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

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class LegacyNotificationIconAreaControllerImplTest extends SysuiTestCase 


    @Test

    public void testAppearResetsTranslation() {

        mSetFlagsRule.disableFlags(Flags.FLAG_KEYGUARD_SHADE_MIGRATION_NSSL);

        mSetFlagsRule.disableFlags(Flags.FLAG_MIGRATE_CLOCKS_TO_BLUEPRINT);

        mController.setupAodIcons(mAodIcons);

        when(mDozeParameters.shouldControlScreenOff()).thenReturn(false);

        mController.appearAodIcons();