Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix flaky/broken test" into sc-dev

Browse Source
This commit is contained in:
Mady Mellor
2021-06-30 16:44:41 +00:00
committed by Android (Google) Code Review
parent 49ffc85c56 2ed5207528
commit d92b19cead
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/SystemUI/tests/src/com/android/systemui/people/widget/LaunchConversationActivityTest.java
View File

@@ -49,7 +49,6 @@ import com.android.systemui.wmshell.BubblesManager;
import com.android.wm.shell.bubbles.Bubble; import com.android.wm.shell.bubbles.Bubble;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor; import org.mockito.ArgumentCaptor;
@@ -92,20 +91,23 @@ public class LaunchConversationActivityTest extends SysuiTestCase {
private NotificationListenerService.Ranking mRanking; private NotificationListenerService.Ranking mRanking;
@Mock @Mock
private UserManager mUserManager; private UserManager mUserManager;
@Mock
private CommandQueue mCommandQueue; private CommandQueue mCommandQueue;
@Captor @Captor
private ArgumentCaptor<NotificationVisibility> mNotificationVisibilityCaptor; private ArgumentCaptor<NotificationVisibility> mNotificationVisibilityCaptor;
@Captor
private ArgumentCaptor<CommandQueue.Callbacks> mCallbacksCaptor;
private Intent mIntent; private Intent mIntent;
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mCommandQueue = new CommandQueue(mContext);
mActivity = new LaunchConversationActivity(mNotificationEntryManager, mActivity = new LaunchConversationActivity(mNotificationEntryManager,
Optional.of(mBubblesManager), mUserManager, mCommandQueue); Optional.of(mBubblesManager), mUserManager, mCommandQueue);
verify(mCommandQueue, times(1)).addCallback(mCallbacksCaptor.capture());
mActivity.setIsForTesting(true, mIStatusBarService); mActivity.setIsForTesting(true, mIStatusBarService);
mIntent = new Intent(); mIntent = new Intent();
mIntent.putExtra(PeopleSpaceWidgetProvider.EXTRA_TILE_ID, "tile ID"); mIntent.putExtra(PeopleSpaceWidgetProvider.EXTRA_TILE_ID, "tile ID");
@@ -169,7 +171,7 @@ public class LaunchConversationActivityTest extends SysuiTestCase {
mActivity.onCreate(new Bundle()); mActivity.onCreate(new Bundle());
assertThat(mActivity.isFinishing()).isTrue(); assertThat(mActivity.isFinishing()).isTrue();
mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); mCallbacksCaptor.getValue().appTransitionFinished(DEFAULT_DISPLAY);
verify(mIStatusBarService, times(1)).onNotificationClear(any(), verify(mIStatusBarService, times(1)).onNotificationClear(any(),
anyInt(), any(), anyInt(), anyInt(), mNotificationVisibilityCaptor.capture()); anyInt(), any(), anyInt(), anyInt(), mNotificationVisibilityCaptor.capture());
@@ -183,17 +185,20 @@ public class LaunchConversationActivityTest extends SysuiTestCase {
@Test @Test
public void testBubbleEntryOpensBubbleAndDoesNotClearNotification() throws Exception { public void testBubbleEntryOpensBubbleAndDoesNotClearNotification() throws Exception {
when(mBubblesManager.getBubbleWithShortcutId(any())).thenReturn(null);
mIntent.putExtra(PeopleSpaceWidgetProvider.EXTRA_NOTIFICATION_KEY, mIntent.putExtra(PeopleSpaceWidgetProvider.EXTRA_NOTIFICATION_KEY,
NOTIF_KEY_CAN_BUBBLE); NOTIF_KEY_CAN_BUBBLE);
mActivity.setIntent(mIntent); mActivity.setIntent(mIntent);
mActivity.onCreate(new Bundle()); mActivity.onCreate(new Bundle());
assertThat(mActivity.isFinishing()).isTrue(); assertThat(mActivity.isFinishing()).isTrue();
mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); mCallbacksCaptor.getValue().appTransitionFinished(DEFAULT_DISPLAY);
// Don't clear the notification for bubbles. // Don't clear the notification for bubbles.
verify(mIStatusBarService, never()).onNotificationClear(any(), verify(mIStatusBarService, never()).onNotificationClear(any(),
anyInt(), any(), anyInt(), anyInt(), any()); anyInt(), any(), anyInt(), anyInt(), any());
// Select the bubble.
verify(mBubblesManager, times(1)).getBubbleWithShortcutId(any());
verify(mBubblesManager, times(1)).expandStackAndSelectBubble(eq(mNotifEntryCanBubble)); verify(mBubblesManager, times(1)).expandStackAndSelectBubble(eq(mNotifEntryCanBubble));
} }
@@ -214,7 +219,7 @@ public class LaunchConversationActivityTest extends SysuiTestCase {
verify(mBubblesManager, never()).expandStackAndSelectBubble(any(NotificationEntry.class)); verify(mBubblesManager, never()).expandStackAndSelectBubble(any(NotificationEntry.class));
} }
@Ignore
@Test @Test
public void testBubbleWithNoNotifOpensBubble() throws Exception { public void testBubbleWithNoNotifOpensBubble() throws Exception {
Bubble bubble = mock(Bubble.class); Bubble bubble = mock(Bubble.class);
@@ -226,7 +231,7 @@ public class LaunchConversationActivityTest extends SysuiTestCase {
mActivity.onCreate(new Bundle()); mActivity.onCreate(new Bundle());
assertThat(mActivity.isFinishing()).isTrue(); assertThat(mActivity.isFinishing()).isTrue();
mCommandQueue.appTransitionFinished(DEFAULT_DISPLAY); mCallbacksCaptor.getValue().appTransitionFinished(DEFAULT_DISPLAY);
verify(mBubblesManager, times(1)).expandStackAndSelectBubble(eq(bubble)); verify(mBubblesManager, times(1)).expandStackAndSelectBubble(eq(bubble));
} }