joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

packages/modules/Connectivity: remove usages of Mockito.verifyZeroInteractions

Browse source 
The method has been replaced by verifyNo(More)Interactions
in later Mockito versions.

Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: I57faa43a5f158bb131f64c19d93de99e04f257ca
This commit is contained in:
Adrian Roos 2025-03-09 23:32:11 +01:00
commit 133f347e80
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tethering/tests/unit/src/com/android/networkstack/tethering/TetheringNotificationUpdaterTest.kt
View file

@ -67,7 +67,7 @@ import org.mockito.Mockito.never
import org.mockito.Mockito.reset
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations
const val TEST_SUBID = 1
@ -246,7 +246,7 @@ class TetheringNotificationUpdaterTest {
// No downstream.
notificationUpdater.onDownstreamChanged(DOWNSTREAM_NONE)
verifyZeroInteractions(notificationManager)
verifyNoMoreInteractions(notificationManager)
// User restrictions on again. Show restricted notification.
notificationUpdater.notifyTetheringDisabledByRestriction()
@ -308,7 +308,7 @@ class TetheringNotificationUpdaterTest {
// Same capabilities changed. Nothing happened.
notificationUpdater.onUpstreamCapabilitiesChanged(null)
verifyZeroInteractions(notificationManager)
verifyNoMoreInteractions(notificationManager)
// Upstream come back. Clear no upstream notification.
notificationUpdater.onUpstreamCapabilitiesChanged(HOME_CAPABILITIES)
@ -384,7 +384,7 @@ class TetheringNotificationUpdaterTest {
// Same capabilities change. Nothing happened.
notificationUpdater.onUpstreamCapabilitiesChanged(ROAMING_CAPABILITIES)
verifyZeroInteractions(notificationManager)
verifyNoMoreInteractions(notificationManager)
// Upstream capabilities changed to home state. Clear roaming notification.
notificationUpdater.onUpstreamCapabilitiesChanged(HOME_CAPABILITIES)

4
remoteauth/tests/unit/src/com/android/server/remoteauth/ranging/RangingManagerTest.java
View file

@ -36,7 +36,7 @@ import static org.junit.Assert.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.content.Context;
@ -123,7 +123,7 @@ public class RangingManagerTest {
@Test
public void testConstruction() {
mRangingManager = new RangingManager(mContext);
verifyZeroInteractions(mUwbManager);
verifyNoMoreInteractions(mUwbManager);
}
@Test

6
remoteauth/tests/unit/src/com/android/server/remoteauth/ranging/UwbRangingSessionTest.java
View file

@ -40,7 +40,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import android.content.Context;
@ -349,8 +349,8 @@ public class UwbRangingSessionTest {
new UwbRangingSession(mContext, TEST_SESSION_PARAMETER_INITIATOR, mUwbServiceImpl);
mUwbRangingSession.stop();
verifyZeroInteractions(mRangingController);
verifyZeroInteractions(mRangingCallback);
verifyNoMoreInteractions(mRangingController);
verifyNoMoreInteractions(mRangingCallback);
}
@Test

2
tests/unit/java/com/android/server/net/NetworkStatsObserversTest.java
View file

@ -288,7 +288,7 @@ public class NetworkStatsObserversTest {
mStatsObservers.unregister(request, UID_BLUE);
waitForObserverToIdle();
Mockito.verifyZeroInteractions(mUsageCallbackBinder);
Mockito.verifyNoMoreInteractions(mUsageCallbackBinder);
// Verify that system uid can unregister for other uids.
mStatsObservers.unregister(request, Process.SYSTEM_UID);