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

Commit 9691b18b authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Notif] HeadsUpManagerImplTest: Move compareTo-related tests. 

Bug: 378142453
Flag: EXEMPT refactor
Test: atest HeadsUpManagerImplOldTest HeadsUpManagerImplTest
Change-Id: I2edf746ca3d2e8417d2b11eaced6fb4036dd7a0a
parent 32e1a125

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

+0 −85
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
 */

package com.android.systemui.statusbar.notification.headsup



import android.app.Notification

import android.app.PendingIntent

import android.app.Person

import android.os.Handler

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags
@@ -31,7 +28,6 @@ import com.android.systemui.kosmos.KosmosJavaAdapter 
import com.android.systemui.log.logcatLogBuffer

import com.android.systemui.res.R

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManagerImpl

import com.android.systemui.statusbar.notification.headsup.HeadsUpManagerImpl.HeadsUpEntry

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow
@@ -399,87 +395,6 @@ open class HeadsUpManagerImplOldTest(flags: FlagsParameterization?) : SysuiTestC 
        assertThat(hum.isHeadsUpEntry(entry.key)).isFalse()

    }



    @Test

    fun testCompareTo_withNullEntries() {

        val hum = createHeadsUpManager()

        val alertEntry = NotificationEntryBuilder().setTag("alert").build()



        hum.showNotification(alertEntry)



        assertThat(hum.compare(alertEntry, null)).isLessThan(0)

        assertThat(hum.compare(null, alertEntry)).isGreaterThan(0)

        assertThat(hum.compare(null, null)).isEqualTo(0)

    }



    @Test

    fun testCompareTo_withNonAlertEntries() {

        val hum = createHeadsUpManager()



        val nonAlertEntry1 = NotificationEntryBuilder().setTag("nae1").build()

        val nonAlertEntry2 = NotificationEntryBuilder().setTag("nae2").build()

        val alertEntry = NotificationEntryBuilder().setTag("alert").build()

        hum.showNotification(alertEntry)



        assertThat(hum.compare(alertEntry, nonAlertEntry1)).isLessThan(0)

        assertThat(hum.compare(nonAlertEntry1, alertEntry)).isGreaterThan(0)

        assertThat(hum.compare(nonAlertEntry1, nonAlertEntry2)).isEqualTo(0)

    }



    @Test

    fun testAlertEntryCompareTo_ongoingCallLessThanActiveRemoteInput() {

        val hum = createHeadsUpManager()



        val ongoingCall =

            hum.HeadsUpEntry(

                NotificationEntryBuilder()

                    .setSbn(

                        HeadsUpManagerTestUtil.createSbn(

                            /* id = */ 0,

                            Notification.Builder(mContext, "")

                                .setCategory(Notification.CATEGORY_CALL)

                                .setOngoing(true),

                        )

                    )

                    .build()

            )



        val activeRemoteInput =

            hum.HeadsUpEntry(HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext))

        activeRemoteInput.mRemoteInputActive = true



        assertThat(ongoingCall.compareTo(activeRemoteInput)).isLessThan(0)

        assertThat(activeRemoteInput.compareTo(ongoingCall)).isGreaterThan(0)

    }



    @Test

    fun testAlertEntryCompareTo_incomingCallLessThanActiveRemoteInput() {

        val hum = createHeadsUpManager()



        val person = Person.Builder().setName("person").build()

        val intent = Mockito.mock(PendingIntent::class.java)

        val incomingCall =

            hum.HeadsUpEntry(

                NotificationEntryBuilder()

                    .setSbn(

                        HeadsUpManagerTestUtil.createSbn(

                            /* id = */ 0,

                            Notification.Builder(mContext, "")

                                .setStyle(

                                    Notification.CallStyle.forIncomingCall(person, intent, intent)

                                ),

                        )

                    )

                    .build()

            )



        val activeRemoteInput =

            hum.HeadsUpEntry(HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext))

        activeRemoteInput.mRemoteInputActive = true



        assertThat(incomingCall.compareTo(activeRemoteInput)).isLessThan(0)

        assertThat(activeRemoteInput.compareTo(incomingCall)).isGreaterThan(0)

    }



    @Test

    @EnableFlags(NotificationThrottleHun.FLAG_NAME)

    fun testPinEntry_logsPeek_throttleEnabled() {

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

+76 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.systemui.statusbar.notification.headsup 


import android.app.Notification

import android.app.PendingIntent

import android.app.Person

import android.os.Handler

import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.FlagsParameterization
@@ -37,6 +38,7 @@ import com.android.systemui.shade.domain.interactor.shadeInteractor 
import com.android.systemui.shade.shadeTestUtil

import com.android.systemui.statusbar.StatusBarState

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder

import com.android.systemui.statusbar.notification.collection.provider.visualStabilityProvider

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager

import com.android.systemui.statusbar.notification.row.NotificationTestHelper
@@ -460,6 +462,80 @@ class HeadsUpManagerImplTest(flags: FlagsParameterization) : HeadsUpManagerImplO 
            assertThat(underTest.shouldHeadsUpBecomePinned(entry)).isFalse()

        }



    @Test

    fun testCompareTo_withNullEntries() {

        val alertEntry = NotificationEntryBuilder().setTag("alert").build()



        underTest.showNotification(alertEntry)



        assertThat(underTest.compare(alertEntry, null)).isLessThan(0)

        assertThat(underTest.compare(null, alertEntry)).isGreaterThan(0)

        assertThat(underTest.compare(null, null)).isEqualTo(0)

    }



    @Test

    fun testCompareTo_withNonAlertEntries() {

        val nonAlertEntry1 = NotificationEntryBuilder().setTag("nae1").build()

        val nonAlertEntry2 = NotificationEntryBuilder().setTag("nae2").build()

        val alertEntry = NotificationEntryBuilder().setTag("alert").build()

        underTest.showNotification(alertEntry)



        assertThat(underTest.compare(alertEntry, nonAlertEntry1)).isLessThan(0)

        assertThat(underTest.compare(nonAlertEntry1, alertEntry)).isGreaterThan(0)

        assertThat(underTest.compare(nonAlertEntry1, nonAlertEntry2)).isEqualTo(0)

    }



    @Test

    fun testAlertEntryCompareTo_ongoingCallLessThanActiveRemoteInput() {

        val ongoingCall =

            underTest.HeadsUpEntry(

                NotificationEntryBuilder()

                    .setSbn(

                        HeadsUpManagerTestUtil.createSbn(

                            /* id = */ 0,

                            Notification.Builder(mContext, "")

                                .setCategory(Notification.CATEGORY_CALL)

                                .setOngoing(true),

                        )

                    )

                    .build()

            )



        val activeRemoteInput =

            underTest.HeadsUpEntry(HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext))

        activeRemoteInput.mRemoteInputActive = true



        assertThat(ongoingCall.compareTo(activeRemoteInput)).isLessThan(0)

        assertThat(activeRemoteInput.compareTo(ongoingCall)).isGreaterThan(0)

    }



    @Test

    fun testAlertEntryCompareTo_incomingCallLessThanActiveRemoteInput() {

        val person = Person.Builder().setName("person").build()

        val intent = mock<PendingIntent>()

        val incomingCall =

            underTest.HeadsUpEntry(

                NotificationEntryBuilder()

                    .setSbn(

                        HeadsUpManagerTestUtil.createSbn(

                            /* id = */ 0,

                            Notification.Builder(mContext, "")

                                .setStyle(

                                    Notification.CallStyle.forIncomingCall(person, intent, intent)

                                ),

                        )

                    )

                    .build()

            )



        val activeRemoteInput =

            underTest.HeadsUpEntry(HeadsUpManagerTestUtil.createEntry(/* id= */ 1, mContext))

        activeRemoteInput.mRemoteInputActive = true



        assertThat(incomingCall.compareTo(activeRemoteInput)).isLessThan(0)

        assertThat(activeRemoteInput.compareTo(incomingCall)).isGreaterThan(0)

    }



    private fun createStickyEntry(id: Int): NotificationEntry {

        val notif =

            Notification.Builder(mContext, "")