Snap for 9459725 from 4fe48e99487af1ed7d13ff9f816ae441eb7f89ef to tm-qpr2-release
Change-Id: I15a0a3742689fb4fb461e5fe5c737ba2485e65fb
diff --git a/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java b/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java
index 887c45f..062947b 100644
--- a/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java
+++ b/tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java
@@ -21,7 +21,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
import android.app.AlarmManager;
import android.app.PendingIntent;
@@ -95,7 +95,7 @@
@Test
public void testUpdate_none() {
mScheduler.updateAndStartServiceIfNeeded();
- verifyNoInteractions(mMockAlarmManager);
+ verifyZeroInteractions(mMockAlarmManager);
}
@Test
diff --git a/tests/unit/src/com/android/tv/menu/MenuTest.java b/tests/unit/src/com/android/tv/menu/MenuTest.java
index a1cfdba..7058316 100644
--- a/tests/unit/src/com/android/tv/menu/MenuTest.java
+++ b/tests/unit/src/com/android/tv/menu/MenuTest.java
@@ -18,23 +18,15 @@
import static androidx.test.InstrumentationRegistry.getTargetContext;
import static com.google.common.truth.Truth.assertWithMessage;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.atLeastOnce;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.isNull;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-
import com.android.tv.menu.Menu.OnMenuVisibilityChangeListener;
-
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Matchers;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
@@ -51,8 +43,9 @@
public void setUp() {
mMenuView = Mockito.mock(IMenuView.class);
MenuRowFactory factory = Mockito.mock(MenuRowFactory.class);
- when(factory.createMenuRow(
- any(Menu.class), any(Class.class)))
+ Mockito.when(
+ factory.createMenuRow(
+ ArgumentMatchers.any(Menu.class), ArgumentMatchers.any(Class.class)))
.thenReturn(null);
mVisibilityChangeListener = Mockito.mock(OnMenuVisibilityChangeListener.class);
mMenu = new Menu(getTargetContext(), mMenuView, factory, mVisibilityChangeListener);
@@ -88,22 +81,22 @@
mMenu.show(Menu.REASON_NONE);
setMenuVisible(true);
// Listener should be called with "true" argument.
- verify(mVisibilityChangeListener, atLeastOnce())
- .onMenuVisibilityChange(eq(true));
- verify(mVisibilityChangeListener, never())
- .onMenuVisibilityChange(eq(false));
+ Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce())
+ .onMenuVisibilityChange(Matchers.eq(true));
+ Mockito.verify(mVisibilityChangeListener, Mockito.never())
+ .onMenuVisibilityChange(Matchers.eq(false));
// IMenuView.show should be called with the same parameter.
- verify(mMenuView)
+ Mockito.verify(mMenuView)
.onShow(
- eq(Menu.REASON_NONE),
- isNull(),
- isNull());
+ Matchers.eq(Menu.REASON_NONE),
+ Matchers.isNull(String.class),
+ Matchers.isNull(Runnable.class));
mMenu.hide(true);
setMenuVisible(false);
// Listener should be called with "false" argument.
- verify(mVisibilityChangeListener, atLeastOnce())
- .onMenuVisibilityChange(eq(false));
- verify(mMenuView).onHide();
+ Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce())
+ .onMenuVisibilityChange(Matchers.eq(false));
+ Mockito.verify(mMenuView).onHide();
}
@Test
@@ -112,22 +105,22 @@
mMenu.show(Menu.REASON_GUIDE);
setMenuVisible(true);
// Listener should be called with "true" argument.
- verify(mVisibilityChangeListener, atLeastOnce())
- .onMenuVisibilityChange(eq(true));
- verify(mVisibilityChangeListener, never())
- .onMenuVisibilityChange(eq(false));
+ Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce())
+ .onMenuVisibilityChange(Matchers.eq(true));
+ Mockito.verify(mVisibilityChangeListener, Mockito.never())
+ .onMenuVisibilityChange(Matchers.eq(false));
// IMenuView.show should be called with the same parameter.
- verify(mMenuView)
+ Mockito.verify(mMenuView)
.onShow(
- eq(Menu.REASON_GUIDE),
- eq(ChannelsRow.ID),
- isNull());
+ Matchers.eq(Menu.REASON_GUIDE),
+ Matchers.eq(ChannelsRow.ID),
+ Matchers.isNull(Runnable.class));
mMenu.hide(false);
setMenuVisible(false);
// Listener should be called with "false" argument.
- verify(mVisibilityChangeListener, atLeastOnce())
- .onMenuVisibilityChange(eq(false));
- verify(mMenuView).onHide();
+ Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce())
+ .onMenuVisibilityChange(Matchers.eq(false));
+ Mockito.verify(mMenuView).onHide();
}
@Test
@@ -136,26 +129,26 @@
mMenu.show(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD);
setMenuVisible(true);
// Listener should be called with "true" argument.
- verify(mVisibilityChangeListener, atLeastOnce())
- .onMenuVisibilityChange(eq(true));
- verify(mVisibilityChangeListener, never())
- .onMenuVisibilityChange(eq(false));
+ Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce())
+ .onMenuVisibilityChange(Matchers.eq(true));
+ Mockito.verify(mVisibilityChangeListener, Mockito.never())
+ .onMenuVisibilityChange(Matchers.eq(false));
// IMenuView.show should be called with the same parameter.
- verify(mMenuView)
+ Mockito.verify(mMenuView)
.onShow(
- eq(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD),
- eq(PlayControlsRow.ID),
- isNull());
+ Matchers.eq(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD),
+ Matchers.eq(PlayControlsRow.ID),
+ Matchers.isNull(Runnable.class));
mMenu.hide(false);
setMenuVisible(false);
// Listener should be called with "false" argument.
- verify(mVisibilityChangeListener, atLeastOnce())
- .onMenuVisibilityChange(eq(false));
- verify(mMenuView).onHide();
+ Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce())
+ .onMenuVisibilityChange(Matchers.eq(false));
+ Mockito.verify(mMenuView).onHide();
}
private void setMenuVisible(final boolean visible) {
- when(mMenuView.isVisible())
+ Mockito.when(mMenuView.isVisible())
.thenAnswer(
new Answer<Boolean>() {
@Override
