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

Commit 344c62e2 authored by Lyn's avatar Lyn
Browse files

Update heads up manager tests with throttling enabled 

Bug: 332392653
Test: BaseHeadsUpManagerTest
Test: HeadsUpManagerPhoneTest
Change-Id: Ie12e5243850be7ba31db60ad8b0c5f25996727f9
parent 855a8539

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/BaseHeadsUpManagerTest.java

+16 −3
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ import static org.mockito.Mockito.when; 
import android.app.Notification;

import android.app.PendingIntent;

import android.app.Person;

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

import android.testing.TestableLooper;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.logging.testing.UiEventLoggerFake;
@@ -62,9 +62,14 @@ import org.mockito.Mock; 
import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.List;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



@SmallTest

@TestableLooper.RunWithLooper

@RunWith(AndroidJUnit4.class)

@RunWith(ParameterizedAndroidJunit4.class)

public class BaseHeadsUpManagerTest extends SysuiTestCase {

    @Rule

    public MockitoRule rule = MockitoJUnit.rule();
@@ -129,10 +134,18 @@ public class BaseHeadsUpManagerTest extends SysuiTestCase { 
        }

    }



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getFlags() {

        return FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME);

    }



    public BaseHeadsUpManagerTest(FlagsParameterization flags) {

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Override

    public void SysuiSetup() throws Exception {

        super.SysuiSetup();

        mSetFlagsRule.disableFlags(NotificationThrottleHun.FLAG_NAME);

        mAvalancheController = new AvalancheController(dumpManager);

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/HeadsUpManagerPhoneTest.java

+15 −6
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ import static org.mockito.ArgumentMatchers.anyInt; 
import static org.mockito.Mockito.when;



import android.content.Context;

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

import android.testing.TestableLooper;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.logging.UiEventLogger;
@@ -58,10 +58,14 @@ import org.mockito.Mock; 
import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.List;



import kotlinx.coroutines.flow.StateFlowKt;

import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



@SmallTest

@RunWith(AndroidJUnit4.class)

@RunWith(ParameterizedAndroidJunit4.class)

@TestableLooper.RunWithLooper

public class HeadsUpManagerPhoneTest extends BaseHeadsUpManagerTest {

    @Rule public MockitoRule rule = MockitoJUnit.rule();
@@ -141,12 +145,17 @@ public class HeadsUpManagerPhoneTest extends BaseHeadsUpManagerTest { 
        );

    }



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getFlags() {

        return FlagsParameterization.allCombinationsOf(NotificationThrottleHun.FLAG_NAME);

    }



    public HeadsUpManagerPhoneTest(FlagsParameterization flags) {

        super(flags);

    }



    @Before

    public void setUp() {

        // TODO(b/315362456) create separate test with the flag disabled

        //  then modify this file to test with the flag enabled

        mSetFlagsRule.disableFlags(NotificationThrottleHun.FLAG_NAME);



        when(mShadeInteractor.isAnyExpanded()).thenReturn(StateFlowKt.MutableStateFlow(false));

        final AccessibilityManagerWrapper accessibilityMgr =

                mDependency.injectMockDependency(AccessibilityManagerWrapper.class);