From ae5fdf099326a194d263096c90179206a9a768a8 Mon Sep 17 00:00:00 2001 From: Rohan Shah Date: Wed, 9 May 2018 18:59:44 -0700 Subject: Move BH test to flaky and change it slightly Marked the test as flaky. Additionally, changed how mocks are created. This may or may not affect the test's passing rate. Also updated the double spy horribleness. Bug: 79444334 Test: Ran atest, no functional changes Change-Id: Ieb901a1702ab15bdf98f37cb4b37d5068882162d --- .../statusbar/NotificationGutsManager.java | 2 +- .../NotificationBlockingHelperManagerTest.java | 26 ++++++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java index dff5f3814f68..46600cf71991 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGutsManager.java @@ -372,7 +372,7 @@ public class NotificationGutsManager implements Dumpable { @Override public void run() { if (row.getWindowToken() == null) { - Log.e(TAG, "Trying to show notification guts, but not attached to " + Log.e(TAG, "Trying to show notification guts in post(), but not attached to " + "window"); return; } diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationBlockingHelperManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationBlockingHelperManagerTest.java index b3dddd522b1b..a6d87af17545 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationBlockingHelperManagerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationBlockingHelperManagerTest.java @@ -20,6 +20,7 @@ import com.android.systemui.SysuiTestCase; import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; import android.content.Context; +import android.support.test.filters.FlakyTest; import android.support.test.filters.SmallTest; import android.testing.AndroidTestingRunner; import android.testing.TestableLooper; @@ -29,6 +30,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; @@ -48,6 +50,7 @@ import static org.mockito.Mockito.when; * Tests for {@link NotificationBlockingHelperManager}. */ @SmallTest +@FlakyTest @org.junit.runner.RunWith(AndroidTestingRunner.class) @TestableLooper.RunWithLooper public class NotificationBlockingHelperManagerTest extends SysuiTestCase { @@ -56,7 +59,6 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { private NotificationTestHelper mHelper; - @Rule public MockitoRule mockito = MockitoJUnit.rule(); @Mock private NotificationGutsManager mGutsManager; @Mock private NotificationEntryManager mEntryManager; @Mock private NotificationMenuRow mMenuRow; @@ -64,20 +66,22 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { @Before public void setUp() { - mBlockingHelperManager = new NotificationBlockingHelperManager(mContext); - // By default, have the shade visible/expanded. - mBlockingHelperManager.setNotificationShadeExpanded(1f); - - mHelper = new NotificationTestHelper(mContext); + MockitoAnnotations.initMocks(this); when(mGutsManager.openGuts( any(View.class), anyInt(), anyInt(), any(NotificationMenuRowPlugin.MenuItem.class))) .thenReturn(true); + when(mMenuRow.getLongpressMenuItem(any(Context.class))).thenReturn(mMenuItem); mDependency.injectTestDependency(NotificationGutsManager.class, mGutsManager); mDependency.injectTestDependency(NotificationEntryManager.class, mEntryManager); - when(mMenuRow.getLongpressMenuItem(any(Context.class))).thenReturn(mMenuItem); + + mHelper = new NotificationTestHelper(mContext); + + mBlockingHelperManager = new NotificationBlockingHelperManager(mContext); + // By default, have the shade visible/expanded. + mBlockingHelperManager.setNotificationShadeExpanded(1f); } @Test @@ -89,7 +93,7 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { @Test public void testDismissCurrentBlockingHelper_withDetachedBlockingHelperRow() throws Exception { - ExpandableNotificationRow row = spy(createBlockableRowSpy()); + ExpandableNotificationRow row = createBlockableRowSpy(); row.setBlockingHelperShowing(true); when(row.isAttachedToWindow()).thenReturn(false); mBlockingHelperManager.setBlockingHelperRowForTest(row); @@ -102,7 +106,7 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { @Test public void testDismissCurrentBlockingHelper_withAttachedBlockingHelperRow() throws Exception { - ExpandableNotificationRow row = spy(createBlockableRowSpy()); + ExpandableNotificationRow row = createBlockableRowSpy(); row.setBlockingHelperShowing(true); when(row.isAttachedToWindow()).thenReturn(true); mBlockingHelperManager.setBlockingHelperRowForTest(row); @@ -200,7 +204,7 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { @Test public void testBlockingHelperShowAndDismiss() throws Exception{ - ExpandableNotificationRow row = spy(createBlockableRowSpy()); + ExpandableNotificationRow row = createBlockableRowSpy(); row.getEntry().userSentiment = USER_SENTIMENT_NEGATIVE; when(row.isAttachedToWindow()).thenReturn(true); @@ -227,6 +231,4 @@ public class NotificationBlockingHelperManagerTest extends SysuiTestCase { when(row.getIsNonblockable()).thenReturn(false); return row; } - - } -- cgit v1.2.3-59-g8ed1b