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

Commit cdecfb96 authored by Iavor-Valentin Iftime's avatar Iavor-Valentin Iftime
Browse files

Enable missing flag for unit-tests 

 Add FLAG_NOTIFICATION_CLASSIFICATION for every test that also requires FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION.


Change-Id: I9b63fc0434e3b069d64c5e887e561c91ec2ba626
Flag: android.service.notification.notification_regroup_on_classification
Test: GroupHelperTest
Bug: 377799435
parent 0a09b507

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

+11 −3
Original line number Diff line number Diff line
@@ -2291,7 +2291,9 @@ public class GroupHelperTest extends UiServiceTestCase { 
    }



    @Test

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION})

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,

            FLAG_NOTIFICATION_CLASSIFICATION,

            FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION})

    public void testMoveAggregateGroups_updateChannel_multipleChannels_regroupOnClassifEnabled() {

        final String pkg = "package";

        final String expectedGroupKey_alerting = GroupHelper.getFullAggregateGroupKey(pkg,
@@ -2366,7 +2368,9 @@ public class GroupHelperTest extends UiServiceTestCase { 
    }



    @Test

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION})

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,

            FLAG_NOTIFICATION_CLASSIFICATION,

            FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION})

    public void testMoveSections_notificationBundled() {

        final List<NotificationRecord> notificationList = new ArrayList<>();

        final String pkg = "package";
@@ -2436,7 +2440,9 @@ public class GroupHelperTest extends UiServiceTestCase { 
    }



    @Test

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING, FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION})

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,

            FLAG_NOTIFICATION_CLASSIFICATION,

            FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION})

    public void testCacheAndCancelAppSummary_notificationBundled() {

        // check that the original app summary is canceled & cached on classification regrouping

        final List<NotificationRecord> notificationList = new ArrayList<>();
@@ -2495,6 +2501,7 @@ public class GroupHelperTest extends UiServiceTestCase { 


    @Test

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,

            FLAG_NOTIFICATION_CLASSIFICATION,

            FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION,

            FLAG_NOTIFICATION_FORCE_GROUP_SINGLETONS})

    public void testSingletonGroupsRegrouped_notificationBundledBeforeDelayTimeout() {
@@ -2569,6 +2576,7 @@ public class GroupHelperTest extends UiServiceTestCase { 


    @Test

    @EnableFlags({FLAG_NOTIFICATION_FORCE_GROUPING,

            FLAG_NOTIFICATION_CLASSIFICATION,

            FLAG_NOTIFICATION_REGROUP_ON_CLASSIFICATION,

            FLAG_NOTIFICATION_FORCE_GROUP_SINGLETONS})

    public void testSingletonGroupsRegrouped_notificationBundledAfterDelayTimeout() {