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

Commit f6476051 authored by Ibrahim Yilmaz's avatar Ibrahim Yilmaz
Browse files

[Inline Reply] Add onMakeExpandedVisibleForRemoteInput tests 

This CL adds some tests for onMakeExpandedVisibleForRemoteInput to cover the current functionality.

Bug: 346976443
Test: StatusBarRemoteInputCallbackTest
Flag: EXEMPT TEST
Change-Id: I34e4299e1b51661d27824faa379ffcc1755fbf7e
parent 8033e0f4

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarRemoteInputCallback.java

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ public class StatusBarRemoteInputCallback implements Callback, Callbacks, 
                // expand notification emits expanded information to HUN listener.

                row.expandNotification();

            } else {

                // TODO(b/346976443) Group and normal notification expansions are two different

                // concepts. We should never call setUserExpanded for expanding groups.



                // Note: Since Normal HUN has remote input view in it, we don't expect to hit

                // onMakeExpandedVisibleForRemoteInput from activateRemoteInput for Normal HUN.

                row.setUserExpanded(true);

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

+78 −1
Original line number Diff line number Diff line
@@ -16,8 +16,10 @@ package com.android.systemui.statusbar.phone; 


import static android.content.Intent.ACTION_DEVICE_LOCKED_CHANGED;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;
@@ -38,8 +40,10 @@ import com.android.systemui.statusbar.ActionClickLogger; 
import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

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

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

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

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

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

import com.android.systemui.util.concurrency.FakeExecutor;
@@ -55,6 +59,8 @@ import org.mockito.MockitoAnnotations; 
@RunWith(AndroidJUnit4.class)

@TestableLooper.RunWithLooper

public class StatusBarRemoteInputCallbackTest extends SysuiTestCase {



    @Mock private GroupExpansionManager mGroupExpansionManager;

    @Mock private DeviceProvisionedController mDeviceProvisionedController;

    @Mock private com.android.systemui.shade.ShadeController mShadeController;

    @Mock private NotificationLockscreenUserManager mNotificationLockscreenUserManager;
@@ -77,7 +83,7 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 
                mNotificationLockscreenUserManager);



        mRemoteInputCallback = spy(new StatusBarRemoteInputCallback(mContext,

                mock(GroupExpansionManager.class), mNotificationLockscreenUserManager,

                mGroupExpansionManager, mNotificationLockscreenUserManager,

                mKeyguardStateController, mStatusBarStateController, mStatusBarKeyguardViewManager,

                mActivityStarter, mShadeController,

                new CommandQueue(mContext, new FakeDisplayTracker(mContext)),
@@ -103,4 +109,75 @@ public class StatusBarRemoteInputCallbackTest extends SysuiTestCase { 


        verify(mStatusBarKeyguardViewManager).showBouncer(true);

    }



    @Test

    public void onMakeExpandedVisibleForRemoteInput_collapsedGroup_expandGroupExpansion() {

        // GIVEN

        final Runnable onExpandedVisibleRunner = mock(Runnable.class);



        final ExpandableNotificationRow enr = mock(ExpandableNotificationRow.class);

        final NotificationContentView privateLayout = mock(NotificationContentView.class);

        final NotificationEntry enrEntry = mock(NotificationEntry.class);



        when(enr.getPrivateLayout()).thenReturn(privateLayout);

        when(enr.getEntry()).thenReturn(enrEntry);

        when(enr.isChildInGroup()).thenReturn(true);

        when(enr.areChildrenExpanded()).thenReturn(false);



        // WHEN

        mRemoteInputCallback.onMakeExpandedVisibleForRemoteInput(

                enr, mock(View.class), false, onExpandedVisibleRunner);



        // THEN

        verify(mGroupExpansionManager).toggleGroupExpansion(enrEntry);

        verify(enr).setUserExpanded(true);

        verify(privateLayout).setOnExpandedVisibleListener(onExpandedVisibleRunner);

    }



    @Test

    public void onMakeExpandedVisibleForRemoteInput_expandedGroup_setUserExpandedTrue() {

        // GIVEN

        final Runnable onExpandedVisibleRunner = mock(Runnable.class);



        final ExpandableNotificationRow enr = mock(ExpandableNotificationRow.class);

        final NotificationContentView privateLayout = mock(NotificationContentView.class);

        final NotificationEntry enrEntry = mock(NotificationEntry.class);



        when(enr.getPrivateLayout()).thenReturn(privateLayout);

        when(enr.getEntry()).thenReturn(enrEntry);

        when(enr.isChildInGroup()).thenReturn(true);

        when(enr.areChildrenExpanded()).thenReturn(true);



        // WHEN

        mRemoteInputCallback.onMakeExpandedVisibleForRemoteInput(

                enr, mock(View.class), false, onExpandedVisibleRunner);



        // THEN

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any());

        verify(enr).setUserExpanded(true);

        verify(privateLayout).setOnExpandedVisibleListener(onExpandedVisibleRunner);

    }



    @Test

    public void onMakeExpandedVisibleForRemoteInput_nonGroupNotifications_setUserExpandedTrue() {

        // GIVEN

        final Runnable onExpandedVisibleRunner = mock(Runnable.class);



        final ExpandableNotificationRow enr = mock(ExpandableNotificationRow.class);

        final NotificationContentView privateLayout = mock(NotificationContentView.class);

        final NotificationEntry enrEntry = mock(NotificationEntry.class);



        when(enr.getPrivateLayout()).thenReturn(privateLayout);

        when(enr.getEntry()).thenReturn(enrEntry);

        when(enr.isChildInGroup()).thenReturn(false);



        // WHEN

        mRemoteInputCallback.onMakeExpandedVisibleForRemoteInput(

                enr, mock(View.class), false, onExpandedVisibleRunner);



        // THEN

        verify(mGroupExpansionManager, never()).toggleGroupExpansion(any());

        verify(enr).setUserExpanded(true);

        verify(privateLayout).setOnExpandedVisibleListener(onExpandedVisibleRunner);

    }

}