From df8f508f343dbab71eaa00759ebd5833b54198ac Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Thu, 7 Jul 2022 18:14:17 +0100 Subject: Use Mockito 4.6.1 API Bug: 236636175 Test: m TVUnitTests Test: m RunTvRoboTests Change-Id: I424015a4ec7e28c4775f7d2614d10d0958dcdb2e Merged-In: I424015a4ec7e28c4775f7d2614d10d0958dcdb2e --- .../com/android/tv/dvr/recorder/SchedulerTest.java | 4 +- tests/unit/src/com/android/tv/menu/MenuTest.java | 85 ++++++++++++---------- 2 files changed, 48 insertions(+), 41 deletions(-) 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 062947bc..887c45fe 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.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.verifyNoInteractions; import android.app.AlarmManager; import android.app.PendingIntent; @@ -95,7 +95,7 @@ public class SchedulerTest { @Test public void testUpdate_none() { mScheduler.updateAndStartServiceIfNeeded(); - verifyZeroInteractions(mMockAlarmManager); + verifyNoInteractions(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 7058316e..a1cfdba0 100644 --- a/tests/unit/src/com/android/tv/menu/MenuTest.java +++ b/tests/unit/src/com/android/tv/menu/MenuTest.java @@ -18,15 +18,23 @@ package com.android.tv.menu; 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; @@ -43,9 +51,8 @@ public class MenuTest { public void setUp() { mMenuView = Mockito.mock(IMenuView.class); MenuRowFactory factory = Mockito.mock(MenuRowFactory.class); - Mockito.when( - factory.createMenuRow( - ArgumentMatchers.any(Menu.class), ArgumentMatchers.any(Class.class))) + when(factory.createMenuRow( + any(Menu.class), any(Class.class))) .thenReturn(null); mVisibilityChangeListener = Mockito.mock(OnMenuVisibilityChangeListener.class); mMenu = new Menu(getTargetContext(), mMenuView, factory, mVisibilityChangeListener); @@ -81,22 +88,22 @@ public class MenuTest { mMenu.show(Menu.REASON_NONE); setMenuVisible(true); // Listener should be called with "true" argument. - Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce()) - .onMenuVisibilityChange(Matchers.eq(true)); - Mockito.verify(mVisibilityChangeListener, Mockito.never()) - .onMenuVisibilityChange(Matchers.eq(false)); + verify(mVisibilityChangeListener, atLeastOnce()) + .onMenuVisibilityChange(eq(true)); + verify(mVisibilityChangeListener, never()) + .onMenuVisibilityChange(eq(false)); // IMenuView.show should be called with the same parameter. - Mockito.verify(mMenuView) + verify(mMenuView) .onShow( - Matchers.eq(Menu.REASON_NONE), - Matchers.isNull(String.class), - Matchers.isNull(Runnable.class)); + eq(Menu.REASON_NONE), + isNull(), + isNull()); mMenu.hide(true); setMenuVisible(false); // Listener should be called with "false" argument. - Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce()) - .onMenuVisibilityChange(Matchers.eq(false)); - Mockito.verify(mMenuView).onHide(); + verify(mVisibilityChangeListener, atLeastOnce()) + .onMenuVisibilityChange(eq(false)); + verify(mMenuView).onHide(); } @Test @@ -105,22 +112,22 @@ public class MenuTest { mMenu.show(Menu.REASON_GUIDE); setMenuVisible(true); // Listener should be called with "true" argument. - Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce()) - .onMenuVisibilityChange(Matchers.eq(true)); - Mockito.verify(mVisibilityChangeListener, Mockito.never()) - .onMenuVisibilityChange(Matchers.eq(false)); + verify(mVisibilityChangeListener, atLeastOnce()) + .onMenuVisibilityChange(eq(true)); + verify(mVisibilityChangeListener, never()) + .onMenuVisibilityChange(eq(false)); // IMenuView.show should be called with the same parameter. - Mockito.verify(mMenuView) + verify(mMenuView) .onShow( - Matchers.eq(Menu.REASON_GUIDE), - Matchers.eq(ChannelsRow.ID), - Matchers.isNull(Runnable.class)); + eq(Menu.REASON_GUIDE), + eq(ChannelsRow.ID), + isNull()); mMenu.hide(false); setMenuVisible(false); // Listener should be called with "false" argument. - Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce()) - .onMenuVisibilityChange(Matchers.eq(false)); - Mockito.verify(mMenuView).onHide(); + verify(mVisibilityChangeListener, atLeastOnce()) + .onMenuVisibilityChange(eq(false)); + verify(mMenuView).onHide(); } @Test @@ -129,26 +136,26 @@ public class MenuTest { mMenu.show(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD); setMenuVisible(true); // Listener should be called with "true" argument. - Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce()) - .onMenuVisibilityChange(Matchers.eq(true)); - Mockito.verify(mVisibilityChangeListener, Mockito.never()) - .onMenuVisibilityChange(Matchers.eq(false)); + verify(mVisibilityChangeListener, atLeastOnce()) + .onMenuVisibilityChange(eq(true)); + verify(mVisibilityChangeListener, never()) + .onMenuVisibilityChange(eq(false)); // IMenuView.show should be called with the same parameter. - Mockito.verify(mMenuView) + verify(mMenuView) .onShow( - Matchers.eq(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD), - Matchers.eq(PlayControlsRow.ID), - Matchers.isNull(Runnable.class)); + eq(Menu.REASON_PLAY_CONTROLS_FAST_FORWARD), + eq(PlayControlsRow.ID), + isNull()); mMenu.hide(false); setMenuVisible(false); // Listener should be called with "false" argument. - Mockito.verify(mVisibilityChangeListener, Mockito.atLeastOnce()) - .onMenuVisibilityChange(Matchers.eq(false)); - Mockito.verify(mMenuView).onHide(); + verify(mVisibilityChangeListener, atLeastOnce()) + .onMenuVisibilityChange(eq(false)); + verify(mMenuView).onHide(); } private void setMenuVisible(final boolean visible) { - Mockito.when(mMenuView.isVisible()) + when(mMenuView.isVisible()) .thenAnswer( new Answer() { @Override -- cgit v1.2.3