From 6b93cf3d2482e356c1d7fc8375d4378a3b6447a3 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Sun, 9 Mar 2025 23:32:12 +0100 Subject: packages/modules/Permission: 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 --- .../service/PermissionStorageTimeChangeReceiverTest.kt | 6 +++--- .../PersistedStoragePackageUninstalledReceiverTest.kt | 4 ++-- .../AppDataSharingUpdatesPrivacySourceTest.kt | 6 +++--- .../NotificationListenerPrivacySourceTest.kt | 6 +++--- .../mocking/privacysources/SafetyCenterReceiverTest.kt | 16 ++++++++-------- .../tests/mocking/privacysources/WorkPolicyInfoTest.kt | 6 +++--- .../safetylabel/SafetyLabelChangesJobServiceTest.kt | 6 +++--- 7 files changed, 25 insertions(+), 25 deletions(-) (limited to 'PermissionController') diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt index 2ae4b0585..5612b7731 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PermissionStorageTimeChangeReceiverTest.kt @@ -49,7 +49,7 @@ import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.spy import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -125,7 +125,7 @@ class PermissionStorageTimeChangeReceiverTest { receiver.onReceive(context, Intent(Intent.ACTION_TIME_CHANGED)) verify(receiver, never()).onTimeChanged(anyLong()) - verifyZeroInteractions(editor) + verifyNoMoreInteractions(editor) } @Test @@ -133,7 +133,7 @@ class PermissionStorageTimeChangeReceiverTest { receiver.onReceive(context, Intent(Intent.ACTION_MANAGE_PERMISSIONS)) verify(receiver, never()).onTimeChanged(anyLong()) - verifyZeroInteractions(editor) + verifyNoMoreInteractions(editor) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt index baa848960..4b89d5141 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/permission/service/PersistedStoragePackageUninstalledReceiverTest.kt @@ -40,7 +40,7 @@ import org.junit.runner.RunWith import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.spy -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -102,7 +102,7 @@ class PersistedStoragePackageUninstalledReceiverTest { receiver.onReceive(context, intent) - verifyZeroInteractions(permissionEventStorage) + verifyNoMoreInteractions(permissionEventStorage) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt index d09b5093f..731022cb5 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/AppDataSharingUpdatesPrivacySourceTest.kt @@ -55,7 +55,7 @@ import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -102,14 +102,14 @@ class AppDataSharingUpdatesPrivacySourceTest { fun safetyCenterEnabledChanged_enabled_doesNothing() { appDataSharingUpdatesPrivacySource.safetyCenterEnabledChanged(context, true) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test fun safetyCenterEnabledChanged_disabled_doesNothing() { appDataSharingUpdatesPrivacySource.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt index cc3b096a8..cac60e1a2 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/NotificationListenerPrivacySourceTest.kt @@ -55,7 +55,7 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -209,7 +209,7 @@ class NotificationListenerPrivacySourceTest { privacySource.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test @@ -281,7 +281,7 @@ class NotificationListenerPrivacySourceTest { SafetyCenterReceiver.RefreshEvent.UNKNOWN ) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } private fun setNotificationListenerCheckEnabled(enabled: Boolean) { diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt index a0199979d..2c166f24b 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/SafetyCenterReceiverTest.kt @@ -55,7 +55,7 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -199,8 +199,8 @@ class SafetyCenterReceiverTest { safetyCenterReceiver.onReceive(application, intent) advanceUntilIdle() - verifyZeroInteractions(mockPrivacySource) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource) + verifyNoMoreInteractions(mockPrivacySource2) } @Test @@ -214,7 +214,7 @@ class SafetyCenterReceiverTest { verify(mockPrivacySource) .rescanAndPushSafetyCenterData(application, intent, EVENT_REFRESH_REQUESTED) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource2) } @Test @@ -225,8 +225,8 @@ class SafetyCenterReceiverTest { safetyCenterReceiver.onReceive(application, intent) advanceUntilIdle() - verifyZeroInteractions(mockPrivacySource) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource) + verifyNoMoreInteractions(mockPrivacySource2) } @Test @@ -238,7 +238,7 @@ class SafetyCenterReceiverTest { safetyCenterReceiver.onReceive(application, intent) advanceUntilIdle() - verifyZeroInteractions(mockPrivacySource) - verifyZeroInteractions(mockPrivacySource2) + verifyNoMoreInteractions(mockPrivacySource) + verifyNoMoreInteractions(mockPrivacySource2) } } diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt index 38baee3ed..e2f1443e3 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/privacysources/WorkPolicyInfoTest.kt @@ -47,7 +47,7 @@ import org.mockito.ArgumentMatchers.eq import org.mockito.Mock import org.mockito.Mockito import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -169,7 +169,7 @@ class WorkPolicyInfoTest { fun safetyCenterEnabledChanged_safetyCenterDisabled() { workPolicyInfo.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test @@ -196,7 +196,7 @@ class WorkPolicyInfoTest { workPolicyInfo.safetyCenterEnabledChanged(context, false) - verifyZeroInteractions(mockSafetyCenterManager) + verifyNoMoreInteractions(mockSafetyCenterManager) } @Test diff --git a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt index 4d206a2f4..396ad41df 100644 --- a/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt +++ b/PermissionController/tests/mocking/src/com/android/permissioncontroller/tests/mocking/safetylabel/SafetyLabelChangesJobServiceTest.kt @@ -46,7 +46,7 @@ import org.mockito.Mockito.doNothing import org.mockito.Mockito.mock import org.mockito.Mockito.times import org.mockito.Mockito.verify -import org.mockito.Mockito.verifyZeroInteractions +import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.mockito.MockitoSession @@ -121,14 +121,14 @@ class SafetyLabelChangesJobServiceTest { receiver.onReceive(application, Intent(Intent.ACTION_BOOT_COMPLETED)) - verifyZeroInteractions(mockJobScheduler) + verifyNoMoreInteractions(mockJobScheduler) } @Test fun onReceiveInvalidIntentAction_jobNotScheduled() { receiver.onReceive(application, Intent(Intent.ACTION_DEFAULT)) - verifyZeroInteractions(mockJobScheduler) + verifyNoMoreInteractions(mockJobScheduler) } @Test -- cgit v1.2.3-59-g8ed1b