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

Commit a3faf951 authored by Yining Liu's avatar Yining Liu Committed by Android (Google) Code Review
Browse files

Merge "Fix AvalancheControllerTest" into main

parents 69b92e86 11621fdc

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/headsup/AvalancheControllerTest.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -370,7 +370,7 @@ class AvalancheControllerTest(val flags: FlagsParameterization) : SysuiTestCase( 
        // Next entry has lower priority

        // Next entry has lower priority

        if (AvalancheReplaceHunWhenCritical.isEnabled) {

        if (AvalancheReplaceHunWhenCritical.isEnabled) {

            assertThat(showingEntry.getNextHunPriority(nextEntry))

            assertThat(showingEntry.getNextHunPriority(nextEntry))

                .isEqualTo(NextHunPriority.LowerPriority)

                .isInstanceOf(NextHunPriority.LowerPriority::class.java)

        }

        }

        assertThat(nextEntry.compareNonTimeFields(showingEntry)).isEqualTo(1)

        assertThat(nextEntry.compareNonTimeFields(showingEntry)).isEqualTo(1)
@@ -391,7 +391,7 @@ class AvalancheControllerTest(val flags: FlagsParameterization) : SysuiTestCase( 
        // Next entry has same priority

        // Next entry has same priority

        if (AvalancheReplaceHunWhenCritical.isEnabled) {

        if (AvalancheReplaceHunWhenCritical.isEnabled) {

            assertThat(showingEntry.getNextHunPriority(nextEntry))

            assertThat(showingEntry.getNextHunPriority(nextEntry))

                .isEqualTo(NextHunPriority.SamePriority)

                .isInstanceOf(NextHunPriority.SamePriority::class.java)

        }

        }

        assertThat(nextEntry.compareNonTimeFields(showingEntry)).isEqualTo(0)

        assertThat(nextEntry.compareNonTimeFields(showingEntry)).isEqualTo(0)
@@ -412,7 +412,7 @@ class AvalancheControllerTest(val flags: FlagsParameterization) : SysuiTestCase( 
        // Next entry has higher priority

        // Next entry has higher priority

        if (AvalancheReplaceHunWhenCritical.isEnabled) {

        if (AvalancheReplaceHunWhenCritical.isEnabled) {

            assertThat(showingEntry.getNextHunPriority(nextEntry))

            assertThat(showingEntry.getNextHunPriority(nextEntry))

                .isEqualTo(NextHunPriority.HigherPriority)

                .isInstanceOf(NextHunPriority.HigherPriority::class.java)

        }

        }

        assertThat(nextEntry.compareNonTimeFields(showingEntry)).isEqualTo(-1)

        assertThat(nextEntry.compareNonTimeFields(showingEntry)).isEqualTo(-1)