commit bd4fbff34162201afd4b86764efada5f910db8d9
author Adrian Roos <roosa@google.com> Sun Mar 09 23:32:14 2025 +0100
committer Adrian Roos <roosa@google.com> Sun Mar 09 23:32:14 2025 +0100
tree 4eec2f4596f82a4ce35c783b992208ae5d26924a
parent 6385405fcf8324d326742238fc5164fbd404b91a

packages/services/Telecomm: remove usages of Mockito.verifyZeroInteractions

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

Test: m checkbuild
Flag: TEST_ONLY
Bug: 310268946
Change-Id: I57faa43a5f158bb131f64c19d93de99e04f257ca

tests/src/com/android/server/telecom/tests/BasicCallTests.java

diff --git a/tests/src/com/android/server/telecom/tests/BasicCallTests.java b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
index 1b7b0ef..fe39f70 100644
--- a/tests/src/com/android/server/telecom/tests/BasicCallTests.java
+++ b/tests/src/com/android/server/telecom/tests/BasicCallTests.java
@@ -36,7 +36,7 @@
 import static org.mockito.Mockito.timeout;
 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;
@@ -908,7 +908,7 @@
     }
 
     private void verifyNoBlockChecks() {
-        verifyZeroInteractions(getBlockedNumberProvider());
+        verifyNoMoreInteractions(getBlockedNumberProvider());
     }
 
     private IContentProvider getBlockedNumberProvider() {

tests/src/com/android/server/telecom/tests/RingerTest.java

diff --git a/tests/src/com/android/server/telecom/tests/RingerTest.java b/tests/src/com/android/server/telecom/tests/RingerTest.java
index d9bf6e1..9c9dbf6 100644
--- a/tests/src/com/android/server/telecom/tests/RingerTest.java
+++ b/tests/src/com/android/server/telecom/tests/RingerTest.java
@@ -38,7 +38,6 @@
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 import android.app.NotificationManager;
@@ -366,7 +365,7 @@
         mRingerUnderTest.startCallWaiting(mockCall1);
         assertFalse(startRingingAndWaitForAsync(mockCall2, false));
 
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockTonePlayer, never()).stopTone();
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(VibrationAttributes.class));
@@ -382,7 +381,7 @@
         ensureRingerIsNotAudible();
         assertFalse(startRingingAndWaitForAsync(mockCall2, false));
 
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockTonePlayer, never()).stopTone();
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(AudioAttributes.class));
@@ -398,7 +397,7 @@
                 any(UserHandle.class))).thenReturn(true);
         ensureRingerIsAudible();
         assertTrue(startRingingAndWaitForAsync(mockCall2, false));
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockTonePlayer, never()).stopTone();
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(VibrationAttributes.class));
@@ -413,7 +412,7 @@
         // We do want to acquire audio focus when self-managed
         assertTrue(startRingingAndWaitForAsync(mockCall2, true));
 
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockTonePlayer, never()).stopTone();
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(VibrationAttributes.class));
@@ -429,7 +428,7 @@
 
         assertFalse(startRingingAndWaitForAsync(mockCall2, false));
 
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockTonePlayer).stopTone();
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(VibrationAttributes.class));
@@ -567,7 +566,7 @@
         enableVibrationWhenRinging();
         assertFalse(startRingingAndWaitForAsync(mockCall2, false));
         verify(mockTonePlayer).stopTone();
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
 
         // Play default vibration when future completes with no audio coupled haptics
         verify(mockVibrator).vibrate(eq(mRingerUnderTest.mDefaultVibrationEffect),
@@ -637,7 +636,7 @@
         assertTrue(startRingingAndWaitForAsync(mockCall2, true));
         verify(mockTonePlayer).stopTone();
         // Ringer not audible, so never tries to create a ringtone.
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(VibrationAttributes.class));
     }
@@ -841,7 +840,7 @@
         assertFalse(startRingingAndWaitForAsync(mockCall2, true));
 
         verify(mockTonePlayer, never()).stopTone();
-        verifyZeroInteractions(mockRingtoneFactory);
+        verifyNoMoreInteractions(mockRingtoneFactory);
         verify(mockVibrator, never())
                 .vibrate(any(VibrationEffect.class), any(VibrationAttributes.class));
     }