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

Commit f42e0718 authored by Alexander Roederer's avatar Alexander Roederer Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b340665334-AutogroupingTestBehaviors" into main 

* changes:
  Parameterizes GroupHelperTest
  Fix Group Helper tests to have appropriate counts
parents a9a8fd69 4f8b8bf5

services/tests/uiservicestests/src/com/android/server/notification/GroupHelperTest.java

+125 −5
Original line number Diff line number Diff line
@@ -57,12 +57,12 @@ import android.graphics.drawable.Icon; 
import android.os.UserHandle;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.flag.junit.FlagsParameterization;

import android.platform.test.flag.junit.SetFlagsRule;

import android.service.notification.StatusBarNotification;

import android.util.ArrayMap;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.R;

import com.android.server.UiServiceTestCase;
@@ -79,9 +79,12 @@ import org.mockito.MockitoAnnotations; 
import java.util.ArrayList;

import java.util.List;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



@SmallTest

@SuppressLint("GuardedBy") // It's ok for this test to access guarded methods from the class.

@RunWith(AndroidJUnit4.class)

@RunWith(ParameterizedAndroidJunit4.class)

public class GroupHelperTest extends UiServiceTestCase {

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
@@ -95,6 +98,16 @@ public class GroupHelperTest extends UiServiceTestCase { 
    private GroupHelper mGroupHelper;

    private @Mock Icon mSmallIcon;



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return FlagsParameterization.allCombinationsOf(

                android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST);

    }



    public GroupHelperTest(FlagsParameterization flags) {

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);
@@ -708,7 +721,8 @@ public class GroupHelperTest extends UiServiceTestCase { 
    }



    @Test

    public void testDropToZeroRemoveGroup() {

    @DisableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    public void testDropToZeroRemoveGroup_disableFlag() {

        final String pkg = "package";

        List<StatusBarNotification> posted = new ArrayList<>();

        for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) {
@@ -736,7 +750,37 @@ public class GroupHelperTest extends UiServiceTestCase { 
    }



    @Test

    public void testAppStartsGrouping() {

    @EnableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    public void testDropToZeroRemoveGroup() {

        final String pkg = "package";

        List<StatusBarNotification> posted = new ArrayList<>();

        for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) {

            final StatusBarNotification sbn = getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM);

            posted.add(sbn);

            mGroupHelper.onNotificationPosted(sbn, false);

        }

        verify(mCallback, times(1)).addAutoGroupSummary(

                anyInt(), eq(pkg), anyString(), eq(getNotificationAttributes(BASE_FLAGS)));

        verify(mCallback, times(AUTOGROUP_AT_COUNT - 1)).addAutoGroup(anyString(), anyBoolean());

        verify(mCallback, never()).removeAutoGroup(anyString());

        verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString());

        Mockito.reset(mCallback);



        for (int i = 0; i < AUTOGROUP_AT_COUNT - 1; i++) {

            mGroupHelper.onNotificationRemoved(posted.remove(0));

        }

        verify(mCallback, never()).removeAutoGroup(anyString());

        verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString());

        Mockito.reset(mCallback);



        mGroupHelper.onNotificationRemoved(posted.remove(0));

        verify(mCallback, never()).removeAutoGroup(anyString());

        verify(mCallback, times(1)).removeAutoGroupSummary(anyInt(), anyString());

    }



    @Test

    @DisableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    public void testAppStartsGrouping_disableFlag() {

        final String pkg = "package";

        List<StatusBarNotification> posted = new ArrayList<>();

        for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) {
@@ -764,6 +808,36 @@ public class GroupHelperTest extends UiServiceTestCase { 
        verify(mCallback, times(1)).removeAutoGroupSummary(anyInt(), anyString());

    }



    @Test

    @EnableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    public void testAppStartsGrouping() {

        final String pkg = "package";

        List<StatusBarNotification> posted = new ArrayList<>();

        for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) {

            final StatusBarNotification sbn = getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM);

            posted.add(sbn);

            mGroupHelper.onNotificationPosted(sbn, false);

        }

        verify(mCallback, times(1)).addAutoGroupSummary(

                anyInt(), eq(pkg), anyString(), eq(getNotificationAttributes(BASE_FLAGS)));

        verify(mCallback, times(AUTOGROUP_AT_COUNT - 1)).addAutoGroup(anyString(), anyBoolean());

        verify(mCallback, never()).removeAutoGroup(anyString());

        verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString());

        Mockito.reset(mCallback);



        for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) {

            final StatusBarNotification sbn =

                    getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM, "app group");

            sbn.setOverrideGroupKey("autogrouped");

            mGroupHelper.onNotificationPosted(sbn, true);

            verify(mCallback, times(1)).removeAutoGroup(sbn.getKey());

            if (i < AUTOGROUP_AT_COUNT - 1) {

                verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString());

            }

        }

        verify(mCallback, times(1)).removeAutoGroupSummary(anyInt(), anyString());

    }



    @Test

    @DisableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    public void testNewNotificationsAddedToAutogroup_ifOriginalNotificationsCanceled_alwaysGroup() {
@@ -915,8 +989,9 @@ public class GroupHelperTest extends UiServiceTestCase { 
    }



    @Test

    @DisableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    @EnableFlags(Flags.FLAG_AUTOGROUP_SUMMARY_ICON_UPDATE)

    public void testAddSummary_diffIcon_diffColor() {

    public void testAddSummary_diffIcon_diffColor_disableFlag() {

        final String pkg = "package";

        final Icon initialIcon = mock(Icon.class);

        when(initialIcon.sameAs(initialIcon)).thenReturn(true);
@@ -958,6 +1033,51 @@ public class GroupHelperTest extends UiServiceTestCase { 
        verify(mCallback, times(1)).updateAutogroupSummary(anyInt(), anyString(), eq(newAttr));

    }



    @Test

    @EnableFlags({Flags.FLAG_AUTOGROUP_SUMMARY_ICON_UPDATE,

            android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST})

    public void testAddSummary_diffIcon_diffColor() {

        final String pkg = "package";

        final Icon initialIcon = mock(Icon.class);

        when(initialIcon.sameAs(initialIcon)).thenReturn(true);

        final int initialIconColor = Color.BLUE;



        // Spy GroupHelper for getMonochromeAppIcon

        final Icon monochromeIcon = mock(Icon.class);

        when(monochromeIcon.sameAs(monochromeIcon)).thenReturn(true);

        GroupHelper groupHelper = spy(mGroupHelper);

        doReturn(monochromeIcon).when(groupHelper).getMonochromeAppIcon(eq(pkg));



        final NotificationAttributes initialAttr = new NotificationAttributes(BASE_FLAGS,

                initialIcon, initialIconColor, DEFAULT_VISIBILITY);



        // Add notifications with same icon and color

        for (int i = 0; i < AUTOGROUP_AT_COUNT; i++) {

            StatusBarNotification sbn = getSbn(pkg, i, String.valueOf(i), UserHandle.SYSTEM, null,

                    initialIcon, initialIconColor);

            groupHelper.onNotificationPosted(sbn, false);

        }

        // Check that the summary would have the same icon and color

        verify(mCallback, times(1)).addAutoGroupSummary(

                anyInt(), eq(pkg), anyString(), eq(initialAttr));

        verify(mCallback, times(AUTOGROUP_AT_COUNT - 1)).addAutoGroup(anyString(), anyBoolean());

        verify(mCallback, never()).removeAutoGroup(anyString());

        verify(mCallback, never()).removeAutoGroupSummary(anyInt(), anyString());



        // After auto-grouping, add new notification with a different color

        final Icon newIcon = mock(Icon.class);

        final int newIconColor = Color.YELLOW;

        StatusBarNotification sbn = getSbn(pkg, AUTOGROUP_AT_COUNT,

                String.valueOf(AUTOGROUP_AT_COUNT), UserHandle.SYSTEM, null, newIcon,

                newIconColor);

        groupHelper.onNotificationPosted(sbn, true);



        // Summary should be updated to the default color and the icon to the monochrome icon

        NotificationAttributes newAttr = new NotificationAttributes(BASE_FLAGS, monochromeIcon,

                COLOR_DEFAULT, DEFAULT_VISIBILITY);

        verify(mCallback, times(1)).updateAutogroupSummary(anyInt(), anyString(), eq(newAttr));

    }



    @Test

    @DisableFlags(android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST)

    @EnableFlags(Flags.FLAG_AUTOGROUP_SUMMARY_ICON_UPDATE)