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

Commit 999d4a0a authored by Lyn's avatar Lyn
Browse files

Move AlertingNotificationManagerTest into BaseHeadsUpManagerTest 

Bug: 319721648
Test: BaseHeadsUpManagerTest
Test: HeadsUpManagerPhoneTest
Test: use heads up notifications normally, no regressions
Flag: none

Change-Id: I4ad4f6f1daee4943bc342d967a6d6b747ea5aa6b
parent f9b99ec4

packages/SystemUI/tests/src/com/android/systemui/statusbar/AlertingNotificationManagerTest.java

deleted100644 → 0
+0 −227
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */





package com.android.systemui.statusbar;



import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED;



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



import static junit.framework.Assert.assertFalse;

import static junit.framework.Assert.assertTrue;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.spy;



import android.app.ActivityManager;

import android.app.Notification;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;



import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;

import com.android.systemui.res.R;

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

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

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

import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.settings.FakeGlobalSettings;

import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.util.time.SystemClock;



import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class AlertingNotificationManagerTest extends SysuiTestCase {

    @Rule

    public MockitoRule rule = MockitoJUnit.rule();



    private static final String TEST_PACKAGE_NAME = "test";

    private static final int TEST_UID = 0;



    protected static final int TEST_MINIMUM_DISPLAY_TIME = 400;

    protected static final int TEST_AUTO_DISMISS_TIME = 600;

    protected static final int TEST_STICKY_AUTO_DISMISS_TIME = 800;

    // Number of notifications to use in tests requiring multiple notifications

    private static final int TEST_NUM_NOTIFICATIONS = 4;



    protected final FakeGlobalSettings mGlobalSettings = new FakeGlobalSettings();

    protected final FakeSystemClock mSystemClock = new FakeSystemClock();

    protected final FakeExecutor mExecutor = new FakeExecutor(mSystemClock);



    @Mock protected ExpandableNotificationRow mRow;



    static {

        assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME);

        assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME);

    }



    private static class TestableAlertingNotificationManager extends AlertingNotificationManager {

        private AlertEntry mLastCreatedEntry;



        private TestableAlertingNotificationManager(SystemClock systemClock,

                DelayableExecutor executor) {

            super(new HeadsUpManagerLogger(logcatLogBuffer()), systemClock, executor);

            mMinimumDisplayTime = TEST_MINIMUM_DISPLAY_TIME;

            mAutoDismissTime = TEST_AUTO_DISMISS_TIME;

            mStickyForSomeTimeAutoDismissTime = TEST_STICKY_AUTO_DISMISS_TIME;

        }



        @Override

        protected void onAlertEntryAdded(AlertEntry alertEntry) {}



        @Override

        protected void onAlertEntryRemoved(AlertEntry alertEntry) {}



        @Override

        protected AlertEntry createAlertEntry() {

            mLastCreatedEntry = spy(super.createAlertEntry());

            return mLastCreatedEntry;

        }



        @Override

        public int getContentFlag() {

            return FLAG_CONTENT_VIEW_CONTRACTED;

        }

    }



    protected AlertingNotificationManager createAlertingNotificationManager() {

        return new TestableAlertingNotificationManager(mSystemClock, mExecutor);

    }



    protected StatusBarNotification createSbn(int id, Notification n) {

        return new StatusBarNotification(

                TEST_PACKAGE_NAME /* pkg */,

                TEST_PACKAGE_NAME,

                id,

                null /* tag */,

                TEST_UID,

                0 /* initialPid */,

                n,

                new UserHandle(ActivityManager.getCurrentUser()),

                null /* overrideGroupKey */,

                0 /* postTime */);

    }



    protected StatusBarNotification createSbn(int id, Notification.Builder n) {

        return createSbn(id, n.build());

    }



    protected StatusBarNotification createSbn(int id) {

        final Notification.Builder b = new Notification.Builder(mContext, "")

                .setSmallIcon(R.drawable.ic_person)

                .setContentTitle("Title")

                .setContentText("Text");

        return createSbn(id, b);

    }



    protected NotificationEntry createEntry(int id, Notification n) {

        return new NotificationEntryBuilder().setSbn(createSbn(id, n)).build();

    }



    protected NotificationEntry createEntry(int id) {

        return new NotificationEntryBuilder().setSbn(createSbn(id)).build();

    }





    @Test

    public void testShowNotification_addsEntry() {

        final AlertingNotificationManager alm = createAlertingNotificationManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        assertTrue(alm.isAlerting(entry.getKey()));

        assertTrue(alm.hasNotifications());

        assertEquals(entry, alm.getEntry(entry.getKey()));

    }



    @Test

    public void testShowNotification_autoDismisses() {

        final AlertingNotificationManager alm = createAlertingNotificationManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);

        mSystemClock.advanceTime(TEST_AUTO_DISMISS_TIME * 3 / 2);



        assertFalse(alm.isAlerting(entry.getKey()));

    }



    @Test

    public void testRemoveNotification_removeDeferred() {

        final AlertingNotificationManager alm = createAlertingNotificationManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        final boolean removedImmediately = alm.removeNotification(

                entry.getKey(), /* releaseImmediately = */ false);

        assertFalse(removedImmediately);

        assertTrue(alm.isAlerting(entry.getKey()));

    }



    @Test

    public void testRemoveNotification_forceRemove() {

        final AlertingNotificationManager alm = createAlertingNotificationManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        final boolean removedImmediately = alm.removeNotification(

                entry.getKey(), /* releaseImmediately = */ true);

        assertTrue(removedImmediately);

        assertFalse(alm.isAlerting(entry.getKey()));

    }



    @Test

    public void testReleaseAllImmediately() {

        final AlertingNotificationManager alm = createAlertingNotificationManager();

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

            final NotificationEntry entry = createEntry(i);

            entry.setRow(mRow);

            alm.showNotification(entry);

        }



        alm.releaseAllImmediately();



        assertEquals(0, alm.getAllEntries().count());

    }



    @Test

    public void testCanRemoveImmediately_notShownLongEnough() {

        final AlertingNotificationManager alm = createAlertingNotificationManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        // The entry has just been added so we should not remove immediately.

        assertFalse(alm.canRemoveImmediately(entry.getKey()));

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/HeadsUpManagerPhoneTest.java

+2 −8
Original line number Diff line number Diff line
@@ -35,13 +35,12 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.res.R;

import com.android.systemui.shade.domain.interactor.ShadeInteractor;

import com.android.systemui.statusbar.AlertingNotificationManager;

import com.android.systemui.statusbar.AlertingNotificationManagerTest;

import com.android.systemui.statusbar.NotificationShadeWindowController;

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

import com.android.systemui.statusbar.notification.collection.provider.VisualStabilityProvider;

import com.android.systemui.statusbar.notification.collection.render.GroupMembershipManager;

import com.android.systemui.statusbar.policy.AccessibilityManagerWrapper;

import com.android.systemui.statusbar.policy.BaseHeadsUpManagerTest;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.HeadsUpManager;

import com.android.systemui.statusbar.policy.HeadsUpManagerLogger;
@@ -64,7 +63,7 @@ import kotlinx.coroutines.flow.StateFlowKt; 
@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class HeadsUpManagerPhoneTest extends AlertingNotificationManagerTest {

public class HeadsUpManagerPhoneTest extends BaseHeadsUpManagerTest {

    @Rule public MockitoRule rule = MockitoJUnit.rule();



    private final HeadsUpManagerLogger mHeadsUpManagerLogger = new HeadsUpManagerLogger(
@@ -137,11 +136,6 @@ public class HeadsUpManagerPhoneTest extends AlertingNotificationManagerTest { 
        );

    }



    @Override

    protected AlertingNotificationManager createAlertingNotificationManager() {

        return createHeadsUpManagerPhone();

    }



    @Before

    public void setUp() {

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

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

+150 −8
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.statusbar.policy; 
import static android.app.Notification.FLAG_FSI_REQUESTED_BUT_DENIED;



import static com.android.systemui.log.LogBufferHelperKt.logcatLogBuffer;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_CONTRACTED;

import static com.android.systemui.util.concurrency.MockExecutorHandlerKt.mockExecutorHandler;



import static com.google.common.truth.Truth.assertThat;
@@ -36,12 +37,15 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.ActivityManager;

import android.app.Notification;

import android.app.PendingIntent;

import android.app.Person;

import android.content.Context;

import android.content.Intent;

import android.graphics.Region;

import android.os.UserHandle;

import android.service.notification.StatusBarNotification;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -51,13 +55,16 @@ import androidx.test.filters.SmallTest; 


import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.testing.UiEventLoggerFake;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.res.R;

import com.android.systemui.statusbar.AlertingNotificationManager;

import com.android.systemui.statusbar.AlertingNotificationManagerTest;

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

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

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

import com.android.systemui.util.concurrency.DelayableExecutor;

import com.android.systemui.util.concurrency.FakeExecutor;

import com.android.systemui.util.settings.FakeGlobalSettings;

import com.android.systemui.util.settings.GlobalSettings;

import com.android.systemui.util.time.FakeSystemClock;

import com.android.systemui.util.time.SystemClock;



import org.junit.Rule;
@@ -70,10 +77,12 @@ import org.mockito.junit.MockitoRule; 
@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper

public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest {

public class BaseHeadsUpManagerTest extends SysuiTestCase {

    @Rule

    public MockitoRule rule = MockitoJUnit.rule();



    private static final String TEST_PACKAGE_NAME = "BaseHeadsUpManagerTest";



    private static final int TEST_TOUCH_ACCEPTANCE_TIME = 200;

    private static final int TEST_A11Y_AUTO_DISMISS_TIME = 1_000;
@@ -81,6 +90,20 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
    private final HeadsUpManagerLogger mLogger = spy(new HeadsUpManagerLogger(logcatLogBuffer()));

    @Mock private AccessibilityManagerWrapper mAccessibilityMgr;



    private static final int TEST_UID = 0;



    protected static final int TEST_MINIMUM_DISPLAY_TIME = 400;

    protected static final int TEST_AUTO_DISMISS_TIME = 600;

    protected static final int TEST_STICKY_AUTO_DISMISS_TIME = 800;

    // Number of notifications to use in tests requiring multiple notifications

    private static final int TEST_NUM_NOTIFICATIONS = 4;



    protected final FakeGlobalSettings mGlobalSettings = new FakeGlobalSettings();

    protected final FakeSystemClock mSystemClock = new FakeSystemClock();

    protected final FakeExecutor mExecutor = new FakeExecutor(mSystemClock);



    @Mock protected ExpandableNotificationRow mRow;



    static {

        assertThat(TEST_MINIMUM_DISPLAY_TIME).isLessThan(TEST_AUTO_DISMISS_TIME);

        assertThat(TEST_AUTO_DISMISS_TIME).isLessThan(TEST_STICKY_AUTO_DISMISS_TIME);
@@ -88,6 +111,9 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
    }



    private final class TestableHeadsUpManager extends BaseHeadsUpManager {



        private HeadsUpEntry mLastCreatedEntry;



        TestableHeadsUpManager(Context context,

                HeadsUpManagerLogger logger,

                DelayableExecutor executor,
@@ -97,10 +123,23 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
                UiEventLogger uiEventLogger) {

            super(context, logger, mockExecutorHandler(executor), globalSettings, systemClock,

                    executor, accessibilityManagerWrapper, uiEventLogger);



            mTouchAcceptanceDelay = TEST_TOUCH_ACCEPTANCE_TIME;

            mMinimumDisplayTime = TEST_MINIMUM_DISPLAY_TIME;

            mAutoDismissTime = TEST_AUTO_DISMISS_TIME;

            mStickyForSomeTimeAutoDismissTime = TEST_STICKY_AUTO_DISMISS_TIME;



        }



        @Override

        protected HeadsUpEntry createAlertEntry() {

            mLastCreatedEntry = spy(super.createAlertEntry());

            return mLastCreatedEntry;

        }



        @Override

        public int getContentFlag() {

            return FLAG_CONTENT_VIEW_CONTRACTED;

        }



        // The following are only implemented by HeadsUpManagerPhone. If you need them, use that.
@@ -173,16 +212,46 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
        }

    }



    protected StatusBarNotification createSbn(int id, Notification n) {

        return new StatusBarNotification(

                TEST_PACKAGE_NAME /* pkg */,

                TEST_PACKAGE_NAME,

                id,

                null /* tag */,

                TEST_UID,

                0 /* initialPid */,

                n,

                new UserHandle(ActivityManager.getCurrentUser()),

                null /* overrideGroupKey */,

                0 /* postTime */);

    }



    protected StatusBarNotification createSbn(int id, Notification.Builder n) {

        return createSbn(id, n.build());

    }



    protected StatusBarNotification createSbn(int id) {

        final Notification.Builder b = new Notification.Builder(mContext, "")

                .setSmallIcon(R.drawable.ic_person)

                .setContentTitle("Title")

                .setContentText("Text");

        return createSbn(id, b);

    }



    protected NotificationEntry createEntry(int id, Notification n) {

        return new NotificationEntryBuilder().setSbn(createSbn(id, n)).build();

    }



    protected NotificationEntry createEntry(int id) {

        return new NotificationEntryBuilder().setSbn(createSbn(id)).build();

    }





    private BaseHeadsUpManager createHeadsUpManager() {

        return new TestableHeadsUpManager(mContext, mLogger, mExecutor, mGlobalSettings,

                mSystemClock, mAccessibilityMgr, mUiEventLoggerFake);

    }



    @Override

    protected AlertingNotificationManager createAlertingNotificationManager() {

        return createHeadsUpManager();

    }



    private NotificationEntry createStickyEntry(int id) {

        final Notification notif = new Notification.Builder(mContext, "")

                .setSmallIcon(R.drawable.ic_person)
@@ -224,6 +293,79 @@ public class BaseHeadsUpManagerTest extends AlertingNotificationManagerTest { 
        }

    }



    @Test

    public void testShowNotification_addsEntry() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        assertTrue(alm.isAlerting(entry.getKey()));

        assertTrue(alm.hasNotifications());

        assertEquals(entry, alm.getEntry(entry.getKey()));

    }



    @Test

    public void testShowNotification_autoDismisses() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);

        mSystemClock.advanceTime(TEST_AUTO_DISMISS_TIME * 3 / 2);



        assertFalse(alm.isAlerting(entry.getKey()));

    }



    @Test

    public void testRemoveNotification_removeDeferred() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        final boolean removedImmediately = alm.removeNotification(

                entry.getKey(), /* releaseImmediately = */ false);

        assertFalse(removedImmediately);

        assertTrue(alm.isAlerting(entry.getKey()));

    }



    @Test

    public void testRemoveNotification_forceRemove() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        final boolean removedImmediately = alm.removeNotification(

                entry.getKey(), /* releaseImmediately = */ true);

        assertTrue(removedImmediately);

        assertFalse(alm.isAlerting(entry.getKey()));

    }



    @Test

    public void testReleaseAllImmediately() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

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

            final NotificationEntry entry = createEntry(i);

            entry.setRow(mRow);

            alm.showNotification(entry);

        }



        alm.releaseAllImmediately();



        assertEquals(0, alm.getAllEntries().count());

    }



    @Test

    public void testCanRemoveImmediately_notShownLongEnough() {

        final BaseHeadsUpManager alm = createHeadsUpManager();

        final NotificationEntry entry = createEntry(/* id = */ 0);



        alm.showNotification(entry);



        // The entry has just been added so we should not remove immediately.

        assertFalse(alm.canRemoveImmediately(entry.getKey()));

    }



    @Test

    public void testHunRemovedLogging() {