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

Commit 901d7f99 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Migrate view usages of getPeopleNotificationType to the adapter" into main

parents d7cd85e5 49a007cc

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/BundleEntryAdapterTest.kt

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.testing.TestableLooper.RunWithLooper 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_NON_PERSON

import com.android.systemui.statusbar.notification.shared.NotificationBundleUi

import com.google.common.truth.Truth.assertThat

import org.junit.Before
@@ -152,4 +153,10 @@ class BundleEntryAdapterTest : SysuiTestCase() { 
    fun canShowFullScreen() {

        assertThat(underTest.isFullScreenCapable()).isFalse()

    }



    @Test

    @EnableFlags(NotificationBundleUi.FLAG_NAME)

    fun getPeopleNotificationType() {

        assertThat(underTest.getPeopleNotificationType()).isEqualTo(TYPE_NON_PERSON)

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/NotificationEntryAdapterTest.kt

+11 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.res.R

import com.android.systemui.statusbar.RankingBuilder

import com.android.systemui.statusbar.notification.mockNotificationActivityStarter

import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier.Companion.TYPE_FULL_PERSON

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow

import com.android.systemui.statusbar.notification.row.entryAdapterFactory

import com.android.systemui.statusbar.notification.row.mockNotificationActionClickManager
@@ -333,6 +334,16 @@ class NotificationEntryAdapterTest : SysuiTestCase() { 
        assertThat(underTest.isAmbient).isTrue()

    }



    @Test

    @EnableFlags(NotificationBundleUi.FLAG_NAME)

    fun getPeopleNotificationType() {

        val entry = kosmos.msgStyleBubbleableFullPerson



        underTest = factory.create(entry) as NotificationEntryAdapter



        assertThat(underTest.peopleNotificationType).isEqualTo(TYPE_FULL_PERSON)

    }



    @Test

    @EnableFlags(NotificationBundleUi.FLAG_NAME)

    fun canShowFullScreen() {

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/coordinator/ColorizedFgsCoordinatorTest.kt

+3 −5
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.testing.TestableLooper.RunWithLooper 
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.applicationCoroutineScope

import com.android.systemui.kosmos.collectLastValue

import com.android.systemui.kosmos.runTest
@@ -35,10 +34,10 @@ import com.android.systemui.kosmos.useUnconfinedTestDispatcher 
import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor

import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.notification.buildNotificationEntry

import com.android.systemui.statusbar.notification.buildOngoingCallEntry

import com.android.systemui.statusbar.notification.buildPromotedOngoingEntry

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

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

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

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

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifPromoter

import com.android.systemui.statusbar.notification.collection.listbuilder.pluggable.NotifSectioner

import com.android.systemui.statusbar.notification.collection.notifPipeline
@@ -49,7 +48,6 @@ import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernizat 
import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.withArgCaptor

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.test.runTest

import org.junit.Assert.assertFalse

import org.junit.Assert.assertTrue

import org.junit.Before

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/promoted/domain/interactor/PromotedNotificationsInteractorTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ import com.android.systemui.kosmos.useUnconfinedTestDispatcher 
import com.android.systemui.statusbar.chips.notification.domain.interactor.statusBarNotificationChipsInteractor

import com.android.systemui.statusbar.chips.notification.shared.StatusBarNotifChips

import com.android.systemui.statusbar.core.StatusBarRootModernization

import com.android.systemui.statusbar.notification.buildNotificationEntry

import com.android.systemui.statusbar.notification.buildOngoingCallEntry

import com.android.systemui.statusbar.notification.buildPromotedOngoingEntry

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

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

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

import com.android.systemui.statusbar.notification.domain.interactor.renderNotificationListInteractor

import com.android.systemui.statusbar.notification.promoted.PromotedNotificationUi

import com.android.systemui.statusbar.phone.ongoingcall.StatusBarChipsModernization

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationMenuRowTest.java

+5 −0
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ import android.view.ViewGroup; 
import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.systemui.kosmos.KosmosJavaAdapter;

import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin;

import com.android.systemui.statusbar.notification.collection.EntryAdapter;

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

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

import com.android.systemui.statusbar.notification.people.PeopleNotificationIdentifier;
@@ -54,6 +56,7 @@ import org.mockito.Mockito; 
@SmallTest

public class NotificationMenuRowTest extends LeakCheckedTest {



    private final KosmosJavaAdapter mKosmos = new KosmosJavaAdapter(this);

    private ExpandableNotificationRow mRow;

    private View mView;

    private PeopleNotificationIdentifier mPeopleNotificationIdentifier;
@@ -66,6 +69,8 @@ public class NotificationMenuRowTest extends LeakCheckedTest { 
        mPeopleNotificationIdentifier = mock(PeopleNotificationIdentifier.class);

        NotificationEntry entry = new NotificationEntryBuilder().build();

        when(mRow.getEntry()).thenReturn(entry);

        EntryAdapter entryAdapter = mKosmos.getEntryAdapterFactory().create(entry);

        when(mRow.getEntryAdapter()).thenReturn(entryAdapter);

    }



    @Test