diff options
author | Sorin Basca <sorinbasca@google.com> | 2023-01-11 15:14:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-11 15:14:54 +0000 |
commit | ba22fcb9335ec84ca6ea1f04fc85e55401a66545 (patch) | |
tree | 59d2b20e6eafa0eaca9318822f753ba2e256ecb6 | |
parent | 4fe48e99487af1ed7d13ff9f816ae441eb7f89ef (diff) | |
parent | 06f7f5e32cee2d8603fc1efc28f28c26169910c5 (diff) | |
download | TV-android13-qpr3-c-s2-release.tar.gz |
Use Mockito 4.6.1 API am: df8f508f34 am: 06f7f5e32candroid-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TV/+/20917421
Change-Id: I15136a37bf588cd57a8fb43ddf4bb910e3c48881
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/robotests/src/com/android/tv/dvr/recorder/SchedulerTest.java | 4 | ||||
-rw-r--r-- | 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<Boolean>() { @Override |