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

Commit 4f8b8bf5 authored by Alexander Roederer's avatar Alexander Roederer
Browse files

Parameterizes GroupHelperTest 

Adding this to ensure that all tests pass with the flag on and off.

Bug: 340665334
Test: atest GroupHelperTest
Flag: android.app.Flags.FLAG_CHECK_AUTOGROUP_BEFORE_POST
Change-Id: If925f1f6e1e7047d1c9d4911bd4ade9c65bb2b19
parent 4ddd5187

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

+15 −2
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);