commit b0a710c741649aed4d243a1621f5ff42577b5f10
author Kirill Grouchnikov <kirillg@google.com> Thu Mar 10 15:44:35 2016 -0500
committer Kirill Grouchnikov <kirillg@google.com> Fri Mar 11 08:39:10 2016 -0500
tree 0ccd984831454bd981ef3fb78d02c40707104bd4
parent 79d03fac83c57fb659ba628a6375a8a8c3b28f07

Switch ListPopupWindow CTS to use Mockito for listeners

Change-Id: I2e96b3a573a5e816046b89d78cade0c78dea984d

tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
index 5856910..ead11da 100644
--- a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
@@ -32,6 +32,8 @@
 import android.widget.PopupWindow;
 import android.widget.PopupWindow.OnDismissListener;
 
+import static org.mockito.Mockito.*;
+
 public class ListPopupWindowTest extends
         ActivityInstrumentationTestCase2<MockPopupWindowCtsActivity> {
     private Instrumentation mInstrumentation;
@@ -221,20 +223,22 @@
         mPopupWindow = new ListPopupWindow(mActivity);
         mPopupWindow.setOnDismissListener(null);
 
-        MockOnDismissListener onDismissListener = new MockOnDismissListener();
+        OnDismissListener onDismissListener = mock(OnDismissListener.class);
         mPopupWindow.setOnDismissListener(onDismissListener);
         showPopup();
         dismissPopup();
-        assertEquals(1, onDismissListener.getOnDismissCalledCount());
+        verify(onDismissListener, times(1)).onDismiss();
 
         showPopup();
         dismissPopup();
-        assertEquals(2, onDismissListener.getOnDismissCalledCount());
+        verify(onDismissListener, times(2)).onDismiss();
 
         mPopupWindow.setOnDismissListener(null);
         showPopup();
         dismissPopup();
-        assertEquals(2, onDismissListener.getOnDismissCalledCount());
+        // Since we've reset the listener to null, we are not expecting any more interactions
+        // on the previously registered listener.
+        verifyNoMoreInteractions(onDismissListener);
     }
 
     public void testAccessInputMethodMode() {