Replaced verifyZeroInteractions with verifyNoMoreInteractions
The on-device unit tests are currently using Mockito 2.23, and the Robolectric tests use mockito 4.8.1. In 2.23, verifyZeroInteractions had already been deprecated, and in 4.8.1, it was removed entirely. In order to move the tests to multivalentTests, we had to blanket-change the API, and there were some files whose runners hadn't been changed from AndroidTestingRunner to AndroidJUnit4.
MagnificationModeSwitchTest.java was mistakenly moved to the multivalentTests directory, where it was failing at runtime under Robolectric (b/369575544). This CL moves it back to the tests directory, and other files had to be moved back in ag/29583402.
Test: tested manually with atest
Bug: 369888148
Flag: TEST_ONLY
Change-Id: I04f9494d914b3e7627c2e773e49cdde781935880
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
similarity index 97%
rename from packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
rename to packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
index 4bb01ec..fbed7cd 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java
@@ -25,7 +25,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
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.os.SystemClock;
@@ -168,8 +168,8 @@
verify(mAbsKeyInputView).setKeyDownListener(onKeyDownListenerArgumentCaptor.capture());
onKeyDownListenerArgumentCaptor.getValue().onKeyDown(
KeyEvent.KEYCODE_UNKNOWN, mock(KeyEvent.class));
- verifyZeroInteractions(mKeyguardSecurityCallback);
- verifyZeroInteractions(mKeyguardMessageAreaController);
+ verifyNoMoreInteractions(mKeyguardSecurityCallback);
+ verifyNoMoreInteractions(mKeyguardMessageAreaController);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/controls/start/ControlsStartableTest.kt
similarity index 98%
rename from packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/controls/start/ControlsStartableTest.kt
index 9e8914a..0d8312e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/controls/start/ControlsStartableTest.kt
@@ -69,7 +69,7 @@
import org.mockito.Mockito.doReturn
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`
import org.mockito.MockitoAnnotations
@@ -109,7 +109,7 @@
onBootCompleted()
}
- verifyZeroInteractions(controlsController, controlsListingController, userTracker)
+ verifyNoMoreInteractions(controlsController, controlsListingController, userTracker)
}
@Test
@@ -119,7 +119,7 @@
fakeExecutor.advanceClockToLast()
fakeExecutor.runAllReady()
- verifyZeroInteractions(controlsController, controlsListingController, userTracker)
+ verifyNoMoreInteractions(controlsController, controlsListingController, userTracker)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt
similarity index 98%
rename from packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt
index a09d345..2e9d993 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt
@@ -32,7 +32,6 @@
import org.mockito.Mockito.anyFloat
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.MockitoAnnotations
@SmallTest
@@ -84,7 +83,7 @@
// THEN The state is idle and the listener is not called to play haptics
assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.IDLE)
- verifyZeroInteractions(sliderStateListener)
+ verifyNoMoreInteractions(sliderStateListener)
}
@Test
@@ -97,7 +96,7 @@
// THEN the tracker moves to the wait state and the timer job begins
assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.WAIT)
- verifyZeroInteractions(sliderStateListener)
+ verifyNoMoreInteractions(sliderStateListener)
assertThat(mSliderStateTracker.isWaiting).isTrue()
}
@@ -591,7 +590,7 @@
// THEN the tracker moves back to IDLE and there are no haptics
assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.IDLE)
- verifyZeroInteractions(sliderStateListener)
+ verifyNoMoreInteractions(sliderStateListener)
}
@Test
@@ -608,7 +607,7 @@
// haptics
assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.WAIT)
assertThat(mSliderStateTracker.isWaiting).isTrue()
- verifyZeroInteractions(sliderStateListener)
+ verifyNoMoreInteractions(sliderStateListener)
}
@Test
@@ -644,7 +643,7 @@
// THEN the tracker moves to IDLE and no haptics are played
assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.IDLE)
- verifyZeroInteractions(sliderStateListener)
+ verifyNoMoreInteractions(sliderStateListener)
}
@Test
@@ -660,7 +659,7 @@
// THEN the tracker moves to WAIT and the wait job starts.
assertThat(mSliderStateTracker.currentState).isEqualTo(SliderState.WAIT)
assertThat(mSliderStateTracker.isWaiting).isTrue()
- verifyZeroInteractions(sliderStateListener)
+ verifyNoMoreInteractions(sliderStateListener)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt
similarity index 95%
rename from packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt
index 9a721fa..727481e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt
@@ -38,7 +38,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
@OptIn(ExperimentalCoroutinesApi::class)
@SmallTest
@@ -75,7 +75,7 @@
@Test
fun dialogIsShownWhenStickyKeysAreEmitted() {
testScope.run {
- verifyZeroInteractions(dialog)
+ verifyNoMoreInteractions(dialog)
stickyKeysRepository.setStickyKeys(linkedMapOf(SHIFT to Locked(true)))
runCurrent()
@@ -87,7 +87,7 @@
@Test
fun dialogDisappearsWhenStickyKeysAreEmpty() {
testScope.run {
- verifyZeroInteractions(dialog)
+ verifyNoMoreInteractions(dialog)
stickyKeysRepository.setStickyKeys(linkedMapOf(SHIFT to Locked(true)))
runCurrent()
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt
similarity index 98%
rename from packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt
index 3ccb989..26ce67d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt
@@ -52,7 +52,7 @@
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
@OptIn(ExperimentalCoroutinesApi::class)
@SmallTest
@@ -98,7 +98,7 @@
keyboardRepository.setIsAnyKeyboardConnected(true)
runCurrent()
- verifyZeroInteractions(inputManager)
+ verifyNoMoreInteractions(inputManager)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt
similarity index 93%
rename from packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt
index 23fd997..6b49d3a 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt
@@ -32,7 +32,6 @@
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.MockitoAnnotations
@OptIn(ExperimentalCoroutinesApi::class)
@@ -72,7 +71,7 @@
testScope.runTest {
powerInteractor.setAsleepForTest()
testScope.runCurrent()
- verifyZeroInteractions(globalWindowManager)
+ verifyNoMoreInteractions(globalWindowManager)
}
@Test
@@ -82,7 +81,7 @@
keyguardRepository.setDozeAmount(1f)
powerInteractor.setAsleepForTest()
testScope.runCurrent()
- verifyZeroInteractions(globalWindowManager)
+ verifyNoMoreInteractions(globalWindowManager)
}
@Test
@@ -92,7 +91,7 @@
keyguardRepository.setDozeAmount(0f)
powerInteractor.setAsleepForTest()
testScope.runCurrent()
- verifyZeroInteractions(globalWindowManager)
+ verifyNoMoreInteractions(globalWindowManager)
}
@Test
@@ -103,7 +102,7 @@
powerInteractor.setAsleepForTest()
testScope.runCurrent()
- verifyZeroInteractions(globalWindowManager)
+ verifyNoMoreInteractions(globalWindowManager)
generateSequence(0f) { it + 0.1f }
.takeWhile { it < 0.8f }
@@ -111,7 +110,7 @@
keyguardRepository.setDozeAmount(it)
testScope.runCurrent()
}
- verifyZeroInteractions(globalWindowManager)
+ verifyNoMoreInteractions(globalWindowManager)
generateSequence(0.8f) { it - 0.1f }
.takeWhile { it >= 0f }
@@ -122,7 +121,7 @@
keyguardRepository.setDozeAmount(0f)
testScope.runCurrent()
- verifyZeroInteractions(globalWindowManager)
+ verifyNoMoreInteractions(globalWindowManager)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt
similarity index 98%
rename from packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt
index 5fa194d..42b3463 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt
@@ -48,7 +48,7 @@
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations
@OptIn(ExperimentalCoroutinesApi::class)
@@ -122,7 +122,7 @@
observerCaptor.value.onChanged(AudioManager.RINGER_MODE_SILENT)
//then
- verifyZeroInteractions(userFileManager)
+ verifyNoMoreInteractions(userFileManager)
coroutineContext.cancelChildren()
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt
index e3bdcd7..eef4c3d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt
@@ -72,7 +72,7 @@
import org.mockito.ArgumentMatchers.same
import org.mockito.Mock
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations
import platform.test.runner.parameterized.Parameter
import platform.test.runner.parameterized.ParameterizedAndroidJunit4
@@ -388,7 +388,7 @@
)
}
} else {
- verifyZeroInteractions(activityStarter)
+ verifyNoMoreInteractions(activityStarter)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt
index 591ce1a..1184a76 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt
@@ -72,7 +72,7 @@
import org.mockito.ArgumentMatchers.same
import org.mockito.Mock
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations
import platform.test.runner.parameterized.Parameter
import platform.test.runner.parameterized.ParameterizedAndroidJunit4
@@ -388,7 +388,7 @@
)
}
} else {
- verifyZeroInteractions(activityStarter)
+ verifyNoMoreInteractions(activityStarter)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt
index 1929cd1..e1845a1 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt
@@ -84,7 +84,7 @@
import org.mockito.ArgumentMatchers.anyString
import org.mockito.Mock
import org.mockito.Mockito
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations
import platform.test.runner.parameterized.ParameterizedAndroidJunit4
import platform.test.runner.parameterized.Parameters
@@ -735,7 +735,7 @@
if (testConfig.intent != null) {
assertThat(Mockito.mockingDetails(activityStarter).invocations).hasSize(1)
} else {
- verifyZeroInteractions(activityStarter)
+ verifyNoMoreInteractions(activityStarter)
}
} else {
assertThat(viewModel.isVisible).isFalse()
diff --git a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt
index 720f2e1..5b21662 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt
@@ -862,7 +862,7 @@
if (testConfig.intent != null) {
Truth.assertThat(Mockito.mockingDetails(activityStarter).invocations).hasSize(1)
} else {
- Mockito.verifyZeroInteractions(activityStarter)
+ Mockito.verifyNoMoreInteractions(activityStarter)
}
} else {
Truth.assertThat(viewModel.isVisible).isFalse()
diff --git a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt
similarity index 94%
rename from packages/SystemUI/tests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt
index 8fe8878..82fc0b5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt
@@ -25,7 +25,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
@RunWith(AndroidJUnit4::class)
@SmallTest
@@ -51,6 +51,6 @@
coreStartable.start()
- verifyZeroInteractions(coordinator)
+ verifyNoMoreInteractions(coordinator)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
similarity index 97%
rename from packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
index fb58b90..93dede5 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSFooterViewControllerTest.java
@@ -22,7 +22,7 @@
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.never;
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.ClipData;
@@ -125,7 +125,7 @@
mEditButton.performClick();
verify(mQSPanelController, never()).showEdit(any());
- verifyZeroInteractions(mActivityStarter);
+ verifyNoMoreInteractions(mActivityStarter);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/QSImplTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSImplTest.java
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/qs/QSImplTest.java
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSImplTest.java
index 4ce2d7c..fe1b963 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/QSImplTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSImplTest.java
@@ -36,7 +36,7 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
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;
@@ -532,7 +532,7 @@
other.onComponentCreated(mQsComponent, null);
assertThat((View) other.getView().findViewById(R.id.qs_footer_actions)).isNull();
- verifyZeroInteractions(mFooterActionsViewModel, mFooterActionsViewModelFactory);
+ verifyNoMoreInteractions(mFooterActionsViewModel, mFooterActionsViewModelFactory);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt
index 418d126..940da99 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt
@@ -64,7 +64,7 @@
import org.mockito.Mockito.nullable
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 java.util.Optional
@@ -320,7 +320,7 @@
tile.click(null /* view */)
testableLooper.processAllMessages()
- verifyZeroInteractions(activityStarter)
+ verifyNoMoreInteractions(activityStarter)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
similarity index 99%
rename from packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
index 914bd0e..0729e2f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java
@@ -33,7 +33,7 @@
import static org.mockito.Mockito.spy;
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.app.PendingIntent;
@@ -462,7 +462,7 @@
public void testHandleSetListening_notListening_notQueryCards() {
mTile.handleSetListening(false);
- verifyZeroInteractions(mQuickAccessWalletClient);
+ verifyNoMoreInteractions(mQuickAccessWalletClient);
}
private WalletCard createWalletCardWithType(Context context, int cardType) {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt
similarity index 93%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt
index 593f873..1730553 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt
@@ -45,7 +45,7 @@
import org.junit.runner.RunWith
import org.mockito.Mockito.verify
import org.mockito.kotlin.clearInvocations
-import org.mockito.kotlin.verifyZeroInteractions
+import org.mockito.kotlin.verifyNoMoreInteractions
import kotlin.test.Test
@OptIn(ExperimentalCoroutinesApi::class)
@@ -112,11 +112,11 @@
// flag is enabled.
underTest.setIsAirplaneMode(IconState(true, TelephonyIcons.FLIGHT_MODE_ICON, ""))
runCurrent()
- verifyZeroInteractions(statusBarIconController)
+ verifyNoMoreInteractions(statusBarIconController)
underTest.setIsAirplaneMode(IconState(false, TelephonyIcons.FLIGHT_MODE_ICON, ""))
runCurrent()
- verifyZeroInteractions(statusBarIconController)
+ verifyNoMoreInteractions(statusBarIconController)
}
@Test
@@ -126,7 +126,7 @@
// Make sure StatusBarSignalPolicy.init does no initialization when
// the refactor flag is disabled.
underTest.init()
- verifyZeroInteractions(securityController, networkController, tunerService)
+ verifyNoMoreInteractions(securityController, networkController, tunerService)
}
@Test
@@ -154,11 +154,11 @@
// if the StatusBarSignalPolicyRefactor is not enabled.
airplaneModeInteractor.setIsAirplaneMode(true)
runCurrent()
- verifyZeroInteractions(statusBarIconController)
+ verifyNoMoreInteractions(statusBarIconController)
airplaneModeInteractor.setIsAirplaneMode(false)
runCurrent()
- verifyZeroInteractions(statusBarIconController)
+ verifyNoMoreInteractions(statusBarIconController)
}
@Test
@@ -168,6 +168,6 @@
// Make sure StatusBarSignalPolicy.start does no initialization when
// the refactor flag is disabled.
underTest.start()
- verifyZeroInteractions(securityController, networkController, tunerService)
+ verifyNoMoreInteractions(securityController, networkController, tunerService)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
similarity index 97%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
index 2ad3c9e..22906b8 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt
@@ -40,7 +40,7 @@
import org.mockito.Mockito.anyString
import org.mockito.Mockito.eq
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.Mockito.`when` as whenever
private const val SDK_VERSION = 33
@@ -80,7 +80,7 @@
notifListener.onEntryBind(entry, sbn)
assertEquals(SDK_VERSION, entry.targetSdk)
- verifyZeroInteractions(packageManager)
+ verifyNoMoreInteractions(packageManager)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt
similarity index 96%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt
index fda5cd2..da48833 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt
@@ -42,7 +42,7 @@
import org.junit.runner.RunWith
import org.mockito.Mockito.clearInvocations
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
private const val FREE_IMAGE_DELAY_MS = 4000L
private const val MAX_IMAGE_SIZE = 512 // size of the test drawables in pixels
@@ -160,7 +160,7 @@
assertIsPlaceHolder(drawableCaptor.value)
assertSize(drawableCaptor.value)
// AND nothing happens on the old consumer
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -182,7 +182,7 @@
assertIsFullImage(drawableCaptor.value)
assertSize(drawableCaptor.value)
// AND nothing happens on the old consumer
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -332,7 +332,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -347,7 +347,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -362,7 +362,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -382,7 +382,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -399,7 +399,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -416,7 +416,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -436,7 +436,7 @@
runCurrent()
// THEN nothing happens
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
@Test
@@ -457,7 +457,7 @@
runCurrent()
// THEN no more updates are happening
- verifyZeroInteractions(mockConsumer)
+ verifyNoMoreInteractions(mockConsumer)
}
private fun overrideMaxImageSizes() {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt
similarity index 97%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt
index 310fa67..1c7a836 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt
@@ -50,7 +50,6 @@
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.MockitoAnnotations
@SmallTest
@@ -139,7 +138,7 @@
@Test
fun addCallback_onlyFirstForUriRegistersObserver() {
controller.addCallback(settingUri1, Mockito.mock(Listener::class.java))
- verifyZeroInteractions(secureSettings)
+ verifyNoMoreInteractions(secureSettings)
testableLooper.processAllMessages()
verify(secureSettings)
.registerContentObserverForUserSync(
@@ -157,7 +156,7 @@
@Test
fun addCallback_secondUriRegistersObserver() {
controller.addCallback(settingUri1, Mockito.mock(Listener::class.java))
- verifyZeroInteractions(secureSettings)
+ verifyNoMoreInteractions(secureSettings)
testableLooper.processAllMessages()
verify(secureSettings)
.registerContentObserverForUserSync(
@@ -185,7 +184,7 @@
val listenerSetting1: Listener = mock()
val listenerSetting2: Listener = mock()
controller.addCallback(settingUri1, listenerSetting1)
- verifyZeroInteractions(secureSettings)
+ verifyNoMoreInteractions(secureSettings)
testableLooper.processAllMessages()
verify(secureSettings)
.registerContentObserverForUserSync(
@@ -229,7 +228,7 @@
controller.addCallback(settingUri1, listenerSetting1b)
controller.addCallback(settingUri2, listenerSetting2)
- verifyZeroInteractions(secureSettings)
+ verifyNoMoreInteractions(secureSettings)
testableLooper.processAllMessages()
verify(listenerSetting1a)
@@ -251,7 +250,7 @@
// First, register
controller.addCallback(settingUri1, listenerSetting1a)
controller.addCallback(settingUri1, listenerSetting1b)
- verifyZeroInteractions(secureSettings)
+ verifyNoMoreInteractions(secureSettings)
testableLooper.processAllMessages()
verify(secureSettings)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt
similarity index 97%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt
index c61756c..13280f2 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt
@@ -40,7 +40,7 @@
import org.mockito.Mockito.clearInvocations
import org.mockito.Mockito.spy
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
@OptIn(ExperimentalCoroutinesApi::class)
@SmallTest
@@ -115,7 +115,7 @@
// THEN visibility changes are reported
verify(mockStatusBarService)
.onNotificationVisibilityChanged(eq(emptyArray()), visibilityArrayCaptor.capture())
- verifyZeroInteractions(mockNotificationListenerService)
+ verifyNoMoreInteractions(mockNotificationListenerService)
val noLongerVisible = visibilityArrayCaptor.value
assertThat(noLongerVisible).hasLength(2)
assertThat(noLongerVisible[0]).apply {
@@ -152,7 +152,7 @@
// THEN visibility changes are reported
verify(mockStatusBarService)
.onNotificationVisibilityChanged(eq(emptyArray()), visibilityArrayCaptor.capture())
- verifyZeroInteractions(mockNotificationListenerService)
+ verifyNoMoreInteractions(mockNotificationListenerService)
val noLongerVisible = visibilityArrayCaptor.value
assertThat(noLongerVisible).hasLength(2)
assertThat(noLongerVisible[0]).apply {
@@ -186,7 +186,7 @@
runCurrent()
// THEN no visibility changes are reported
- verifyZeroInteractions(mockStatusBarService, mockNotificationListenerService)
+ verifyNoMoreInteractions(mockStatusBarService, mockNotificationListenerService)
}
@Test
@@ -205,7 +205,7 @@
runCurrent()
// THEN we call the new Callable
- verifyZeroInteractions(callable)
+ verifyNoMoreInteractions(callable)
verify(otherCallable).call()
}
@@ -226,7 +226,7 @@
// THEN visibility changes are reported
verify(mockStatusBarService)
.onNotificationVisibilityChanged(eq(emptyArray()), visibilityArrayCaptor.capture())
- verifyZeroInteractions(mockNotificationListenerService)
+ verifyNoMoreInteractions(mockNotificationListenerService)
val noLongerVisible = visibilityArrayCaptor.value
assertThat(noLongerVisible).hasLength(2)
assertThat(noLongerVisible[0]).apply {
@@ -325,7 +325,7 @@
runCurrent()
// THEN the Expand event is not reported again
- verifyZeroInteractions(mockStatusBarService)
+ verifyNoMoreInteractions(mockStatusBarService)
}
@Test
@@ -341,7 +341,7 @@
runCurrent()
// No events are reported
- verifyZeroInteractions(mockStatusBarService)
+ verifyNoMoreInteractions(mockStatusBarService)
}
@Test
@@ -424,7 +424,7 @@
// THEN no events are reported, because we consider the Notification initially
// collapsed, so only expanded is logged in the first time.
- verifyZeroInteractions(mockStatusBarService)
+ verifyNoMoreInteractions(mockStatusBarService)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt
similarity index 95%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt
rename to packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt
index 81f0950..799e957 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt
+++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt
@@ -34,7 +34,7 @@
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations
@SmallTest
@@ -70,6 +70,6 @@
@Test
fun init_noRegisterMediaProjectionManagerCallback() {
- verifyZeroInteractions(mediaProjectionManager)
+ verifyNoMoreInteractions(mediaProjectionManager)
}
}
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
rename to packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java
diff --git a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java
index 2d5e3a6..dddaabb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java
@@ -23,10 +23,10 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.graphics.PointF;
-import android.testing.AndroidTestingRunner;
+
import android.testing.TestableLooper;
import android.view.View;
import android.view.ViewPropertyAnimator;
@@ -37,6 +37,7 @@
import androidx.dynamicanimation.animation.FlingAnimation;
import androidx.dynamicanimation.animation.SpringAnimation;
import androidx.dynamicanimation.animation.SpringForce;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.SmallTest;
import com.android.systemui.Prefs;
@@ -57,7 +58,7 @@
import java.util.Optional;
/** Tests for {@link MenuAnimationController}. */
-@RunWith(AndroidTestingRunner.class)
+@RunWith(AndroidJUnit4.class)
@TestableLooper.RunWithLooper(setAsMainLooper = true)
@SmallTest
public class MenuAnimationControllerTest extends SysuiTestCase {
@@ -172,7 +173,7 @@
mMenuAnimationController.mPositionAnimations.values().stream().findAny();
anyAnimation.ifPresent(this::skipAnimationToEnd);
- verifyZeroInteractions(onSpringAnimationsEndCallback);
+ verifyNoMoreInteractions(onSpringAnimationsEndCallback);
}
@Test
@@ -224,7 +225,7 @@
.filter(animation -> animation instanceof SpringAnimation)
.forEach(this::skipAnimationToEnd);
- verifyZeroInteractions(onSpringAnimationsEndCallback);
+ verifyNoMoreInteractions(onSpringAnimationsEndCallback);
}
@Test
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsViewTest.kt b/packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsViewTest.kt
rename to packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/FalsingDataProviderTest.java b/packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingDataProviderTest.java
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/FalsingDataProviderTest.java
rename to packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingDataProviderTest.java
diff --git a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java
index d72b72c..ccdaa45 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java
@@ -24,7 +24,7 @@
import static org.mockito.Mockito.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.app.KeyguardManager;
@@ -121,7 +121,7 @@
public void test_initialization() {
mClipboardListener.start();
verify(mClipboardManager).addPrimaryClipChangedListener(any());
- verifyZeroInteractions(mUiEventLogger);
+ verifyNoMoreInteractions(mUiEventLogger);
}
@Test
@@ -204,7 +204,7 @@
verify(mUiEventLogger, times(1)).log(
ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN, 0, mSampleSource);
verify(mClipboardToast, times(1)).showCopiedToast();
- verifyZeroInteractions(mOverlayControllerProvider);
+ verifyNoMoreInteractions(mOverlayControllerProvider);
}
@Test
@@ -218,7 +218,7 @@
verify(mUiEventLogger, times(1)).log(
ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN, 0, mSampleSource);
verify(mClipboardToast, times(1)).showCopiedToast();
- verifyZeroInteractions(mOverlayControllerProvider);
+ verifyNoMoreInteractions(mOverlayControllerProvider);
}
@Test
@@ -232,7 +232,7 @@
verify(mUiEventLogger, times(1)).log(
ClipboardOverlayEvent.CLIPBOARD_OVERLAY_ENTERED, 0, mSampleSource);
verify(mOverlayController).setClipData(mSampleClipData, mSampleSource);
- verifyZeroInteractions(mClipboardToast);
+ verifyNoMoreInteractions(mClipboardToast);
}
@Test
@@ -242,9 +242,9 @@
mClipboardListener.start();
mClipboardListener.onPrimaryClipChanged();
- verifyZeroInteractions(mUiEventLogger);
- verifyZeroInteractions(mClipboardToast);
- verifyZeroInteractions(mOverlayControllerProvider);
+ verifyNoMoreInteractions(mUiEventLogger);
+ verifyNoMoreInteractions(mClipboardToast);
+ verifyNoMoreInteractions(mOverlayControllerProvider);
}
@Test
@@ -259,6 +259,6 @@
verify(mUiEventLogger, times(1)).log(
ClipboardOverlayEvent.CLIPBOARD_TOAST_SHOWN, 0, mSampleSource);
verify(mClipboardToast, times(1)).showCopiedToast();
- verifyZeroInteractions(mOverlayControllerProvider);
+ verifyNoMoreInteractions(mOverlayControllerProvider);
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java
index c4f5d62..07e48b9 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java
@@ -30,7 +30,7 @@
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
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.app.KeyguardManager;
@@ -313,7 +313,7 @@
mMediaSwitchingController.start(mCb);
verify(mSessionMediaController, never()).registerCallback(any());
- verifyZeroInteractions(mMediaSessionManager);
+ verifyNoMoreInteractions(mMediaSessionManager);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt
index 80a9e4c..d708489 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt
@@ -83,7 +83,7 @@
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.MockitoAnnotations
import org.mockito.kotlin.whenever
@@ -177,7 +177,7 @@
)
verify(eventLogger).logNoteTaskOpened(expectedInfo)
- verifyZeroInteractions(bubbles, keyguardManager, userManager)
+ verifyNoMoreInteractions(bubbles, keyguardManager, userManager)
}
@Test
@@ -192,7 +192,7 @@
)
verify(eventLogger).logNoteTaskClosed(expectedInfo)
- verifyZeroInteractions(bubbles, keyguardManager, userManager)
+ verifyNoMoreInteractions(bubbles, keyguardManager, userManager)
}
@Test
@@ -206,7 +206,7 @@
key = Bubble.getAppBubbleKeyForApp(expectedInfo.packageName, expectedInfo.user),
)
- verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger)
+ verifyNoMoreInteractions(bubbles, keyguardManager, userManager, eventLogger)
}
@Test
@@ -220,7 +220,7 @@
key = Bubble.getAppBubbleKeyForApp(expectedInfo.packageName, expectedInfo.user),
)
- verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger)
+ verifyNoMoreInteractions(bubbles, keyguardManager, userManager, eventLogger)
}
@Test
@@ -231,7 +231,7 @@
key = "any other key",
)
- verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger)
+ verifyNoMoreInteractions(bubbles, keyguardManager, userManager, eventLogger)
}
@Test
@@ -242,7 +242,7 @@
key = Bubble.getAppBubbleKeyForApp(NOTE_TASK_INFO.packageName, NOTE_TASK_INFO.user),
)
- verifyZeroInteractions(bubbles, keyguardManager, userManager, eventLogger)
+ verifyNoMoreInteractions(bubbles, keyguardManager, userManager, eventLogger)
}
// endregion
@@ -275,7 +275,7 @@
}
assertThat(userCaptor.value).isEqualTo(user10)
verify(eventLogger).logNoteTaskOpened(expectedInfo)
- verifyZeroInteractions(bubbles)
+ verifyNoMoreInteractions(bubbles)
}
@Test
@@ -299,7 +299,7 @@
}
assertThat(userCaptor.value).isEqualTo(userTracker.userHandle)
verify(eventLogger).logNoteTaskOpened(expectedInfo)
- verifyZeroInteractions(bubbles)
+ verifyNoMoreInteractions(bubbles)
}
@Test
@@ -322,7 +322,7 @@
}
assertThat(userCaptor.value).isEqualTo(userTracker.userHandle)
verify(eventLogger).logNoteTaskClosed(expectedInfo)
- verifyZeroInteractions(bubbles)
+ verifyNoMoreInteractions(bubbles)
}
@Test
@@ -336,7 +336,7 @@
// Context package name used to create bubble icon from drawable resource id
verify(context, atLeastOnce()).packageName
verifyNoteTaskOpenInBubbleInUser(userTracker.userHandle)
- verifyZeroInteractions(eventLogger)
+ verifyNoMoreInteractions(eventLogger)
}
@Test
@@ -352,7 +352,7 @@
// Context package name used to create bubble icon from drawable resource id
verify(context, atLeastOnce()).packageName
verifyNoteTaskOpenInBubbleInUser(userTracker.userHandle)
- verifyZeroInteractions(eventLogger)
+ verifyNoMoreInteractions(eventLogger)
}
@Test
@@ -393,14 +393,14 @@
}
assertThat(userCaptor.value).isEqualTo(user10)
verify(eventLogger).logNoteTaskOpened(expectedInfo)
- verifyZeroInteractions(bubbles)
+ verifyNoMoreInteractions(bubbles)
}
@Test
fun showNoteTask_bubblesIsNull_shouldDoNothing() {
createNoteTaskController(bubbles = null).showNoteTask(entryPoint = TAIL_BUTTON)
- verifyZeroInteractions(bubbles, eventLogger)
+ verifyNoMoreInteractions(bubbles, eventLogger)
}
@Test
@@ -412,14 +412,14 @@
noteTaskController.showNoteTask(entryPoint = TAIL_BUTTON)
verify(noteTaskController).showNoDefaultNotesAppToast()
- verifyZeroInteractions(bubbles, eventLogger)
+ verifyNoMoreInteractions(bubbles, eventLogger)
}
@Test
fun showNoteTask_flagDisabled_shouldDoNothing() {
createNoteTaskController(isEnabled = false).showNoteTask(entryPoint = TAIL_BUTTON)
- verifyZeroInteractions(bubbles, eventLogger)
+ verifyNoMoreInteractions(bubbles, eventLogger)
}
@Test
@@ -428,7 +428,7 @@
createNoteTaskController().showNoteTask(entryPoint = TAIL_BUTTON)
- verifyZeroInteractions(bubbles, eventLogger)
+ verifyNoMoreInteractions(bubbles, eventLogger)
}
@Test
@@ -453,7 +453,7 @@
}
assertThat(userCaptor.value).isEqualTo(userTracker.userHandle)
verify(eventLogger).logNoteTaskOpened(expectedInfo)
- verifyZeroInteractions(bubbles)
+ verifyNoMoreInteractions(bubbles)
}
// endregion
@@ -550,7 +550,7 @@
createNoteTaskController().showNoteTask(entryPoint = QUICK_AFFORDANCE)
- verifyZeroInteractions(bubbles, eventLogger)
+ verifyNoMoreInteractions(bubbles, eventLogger)
}
@Test
@@ -566,7 +566,7 @@
createNoteTaskController().showNoteTask(entryPoint = QUICK_AFFORDANCE)
- verifyZeroInteractions(bubbles, eventLogger)
+ verifyNoMoreInteractions(bubbles, eventLogger)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt
index ab846f1..d88b758 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt
@@ -56,7 +56,7 @@
import org.mockito.Mockito.never
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations.initMocks
/** atest SystemUITests:NoteTaskInitializerTest */
@@ -135,7 +135,7 @@
underTest.initialize()
- verifyZeroInteractions(
+ verifyNoMoreInteractions(
commandQueue,
bubbles,
controller,
@@ -151,7 +151,7 @@
underTest.initialize()
- verifyZeroInteractions(
+ verifyNoMoreInteractions(
commandQueue,
bubbles,
controller,
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java
index 308b370..9a8df33 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java
@@ -31,7 +31,7 @@
import static org.mockito.Mockito.reset;
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;
@@ -642,7 +642,7 @@
when(mShadeCarrier1.isVisibleToUser()).thenReturn(false);
captor.getValue().onClick(mShadeCarrier1);
- verifyZeroInteractions(mActivityStarter);
+ verifyNoMoreInteractions(mActivityStarter);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java
index d10ea1f..2b5e014 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java
@@ -26,7 +26,6 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
import android.content.ComponentName;
import android.graphics.Rect;
@@ -393,7 +392,7 @@
mCommandQueue.addQsTileToFrontOrEnd(c, true);
waitForIdleSync();
- verifyZeroInteractions(mCallbacks);
+ verifyNoMoreInteractions(mCallbacks);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsReceiverTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsReceiverTest.java
index e0eb99c..2cb9791 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsReceiverTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsReceiverTest.java
@@ -22,7 +22,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
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.Intent;
@@ -138,7 +138,7 @@
mKeyboardShortcutsReceiver.onReceive(mContext, SHOW_INTENT);
- verifyZeroInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
+ verifyNoMoreInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
}
@Test
@@ -149,7 +149,7 @@
mKeyboardShortcutsReceiver.onReceive(mContext, SHOW_INTENT);
- verifyZeroInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
+ verifyNoMoreInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
}
@Test
@@ -160,7 +160,7 @@
mKeyboardShortcutsReceiver.onReceive(mContext, DISMISS_INTENT);
- verifyZeroInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
+ verifyNoMoreInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
}
@Test
@@ -171,6 +171,6 @@
mKeyboardShortcutsReceiver.onReceive(mContext, DISMISS_INTENT);
- verifyZeroInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
+ verifyNoMoreInteractions(mKeyboardShortcuts, mKeyboardShortcutListSearch);
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
index 9e6a498..a8618eb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt
@@ -60,7 +60,7 @@
import org.mockito.Mockito.clearInvocations
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.junit.MockitoJUnit
@@ -557,7 +557,7 @@
transitionController.dragDownAmount = 10f
verify(singleShadeOverScroller).expansionDragDownAmount = 10f
- verifyZeroInteractions(splitShadeOverScroller)
+ verifyNoMoreInteractions(splitShadeOverScroller)
}
@Test
@@ -568,7 +568,7 @@
transitionController.dragDownAmount = 10f
verify(splitShadeOverScroller).expansionDragDownAmount = 10f
- verifyZeroInteractions(singleShadeOverScroller)
+ verifyNoMoreInteractions(singleShadeOverScroller)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt
index 58473c4..98487f7 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt
@@ -3,6 +3,7 @@
import android.testing.TestableLooper
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
+import kotlinx.coroutines.ExperimentalCoroutinesApi
import com.android.systemui.SysuiTestCase
import com.android.systemui.dump.DumpManager
import com.android.systemui.plugins.qs.QS
@@ -19,7 +20,6 @@
import org.mockito.Mockito.reset
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.Mockito.`when` as whenever
import org.mockito.MockitoAnnotations
@@ -30,6 +30,7 @@
private val configurationController = FakeConfigurationController()
+ @OptIn(ExperimentalCoroutinesApi::class)
@Mock private lateinit var scrimController: ScrimController
@Mock private lateinit var statusBarStateController: SysuiStatusBarStateController
private var qS: QS? = null
@@ -71,9 +72,9 @@
setDragAmount(1000f)
- verifyZeroInteractions(qS)
- verifyZeroInteractions(scrimController)
- verifyZeroInteractions(nsslController)
+ verifyNoMoreInteractions(qS)
+ verifyNoMoreInteractions(scrimController)
+ verifyNoMoreInteractions(nsslController)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt
index 3c583f2..56b70bd 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt
@@ -45,7 +45,7 @@
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.Mockito.verify
-import org.mockito.Mockito.verifyZeroInteractions
+import org.mockito.Mockito.verifyNoMoreInteractions
import org.mockito.MockitoAnnotations.initMocks
import org.mockito.Mockito.`when` as whenever
@@ -110,7 +110,7 @@
whenever(section.bucket).thenReturn(BUCKET_ALERTING)
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(stackController).setNotifStats(NotifStats(1, false, true, false, false))
- verifyZeroInteractions(activeNotificationsInteractor)
+ verifyNoMoreInteractions(activeNotificationsInteractor)
}
@Test
@@ -121,7 +121,7 @@
whenever(section.bucket).thenReturn(BUCKET_ALERTING)
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(stackController).setNotifStats(NotifStats(1, true, false, false, false))
- verifyZeroInteractions(activeNotificationsInteractor)
+ verifyNoMoreInteractions(activeNotificationsInteractor)
}
@Test
@@ -130,7 +130,7 @@
whenever(section.bucket).thenReturn(BUCKET_SILENT)
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(stackController).setNotifStats(NotifStats(1, false, false, false, true))
- verifyZeroInteractions(activeNotificationsInteractor)
+ verifyNoMoreInteractions(activeNotificationsInteractor)
}
@Test
@@ -141,7 +141,7 @@
whenever(section.bucket).thenReturn(BUCKET_SILENT)
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(stackController).setNotifStats(NotifStats(1, false, false, true, false))
- verifyZeroInteractions(activeNotificationsInteractor)
+ verifyNoMoreInteractions(activeNotificationsInteractor)
}
@Test
@@ -151,7 +151,7 @@
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(activeNotificationsInteractor)
.setNotifStats(NotifStats(1, false, true, false, false))
- verifyZeroInteractions(stackController)
+ verifyNoMoreInteractions(stackController)
}
@Test
@@ -166,7 +166,7 @@
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(activeNotificationsInteractor)
.setNotifStats(NotifStats(1, true, false, false, false))
- verifyZeroInteractions(stackController)
+ verifyNoMoreInteractions(stackController)
}
@Test
@@ -176,7 +176,7 @@
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(activeNotificationsInteractor)
.setNotifStats(NotifStats(1, false, false, false, true))
- verifyZeroInteractions(stackController)
+ verifyNoMoreInteractions(stackController)
}
@Test
@@ -191,7 +191,7 @@
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(activeNotificationsInteractor)
.setNotifStats(NotifStats(1, false, false, true, false))
- verifyZeroInteractions(stackController)
+ verifyNoMoreInteractions(stackController)
}
@Test
@@ -204,6 +204,6 @@
afterRenderListListener.onAfterRenderList(listOf(entry), stackController)
verify(activeNotificationsInteractor)
.setNotifStats(NotifStats(1, hasNonClearableAlertingNotifs = true, false, false, false))
- verifyZeroInteractions(stackController)
+ verifyNoMoreInteractions(stackController)
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt
index 30a1214..a099c9d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt
@@ -77,7 +77,7 @@
import org.mockito.kotlin.spy
import org.mockito.kotlin.times
import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyZeroInteractions
+import org.mockito.kotlin.verifyNoMoreInteractions
import org.mockito.kotlin.whenever
@SmallTest
@@ -420,7 +420,7 @@
val contentToInflate =
FLAG_CONTENT_VIEW_CONTRACTED or FLAG_CONTENT_VIEW_EXPANDED or FLAG_CONTENT_VIEW_HEADS_UP
inflateAndWait(notificationInflater, contentToInflate, row)
- verifyZeroInteractions(fakeRonViewInflater)
+ verifyNoMoreInteractions(fakeRonViewInflater)
}
@Test
@@ -567,7 +567,7 @@
// THEN do not dispose old contracted binder handle and change contracted child
verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel })
- verifyZeroInteractions(oldHandle)
+ verifyNoMoreInteractions(oldHandle)
verify(privateLayout, never()).setContractedChild(any())
}
@@ -590,7 +590,7 @@
// THEN do not dispose old expanded binder handle and change expanded child
verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel })
- verifyZeroInteractions(oldHandle)
+ verifyNoMoreInteractions(oldHandle)
verify(privateLayout, never()).setExpandedChild(any())
}
@@ -613,7 +613,7 @@
// THEN - do not dispose old heads up binder handle and change heads up child
verify(entry).setContentModel(argThat { richOngoingContentModel === mockRonModel })
- verifyZeroInteractions(oldHandle)
+ verifyNoMoreInteractions(oldHandle)
verify(privateLayout, never()).setHeadsUpChild(any())
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java
index 30556be..7cd306e 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java
@@ -37,7 +37,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
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.metrics.LogMaker;
@@ -937,7 +937,7 @@
@DisableFlags(FLAG_SCREENSHARE_NOTIFICATION_HIDING)
public void sensitiveNotificationProtectionControllerListenerNotRegistered() {
initController(/* viewIsAttached= */ true);
- verifyZeroInteractions(mSensitiveNotificationProtectionController);
+ verifyNoMoreInteractions(mSensitiveNotificationProtectionController);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
index 73e3bf4..e804b33 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java
@@ -40,7 +40,7 @@
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
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.animation.Animator;
@@ -1229,7 +1229,7 @@
reset(mScrimBehind);
mScrimController.setExpansionAffectsAlpha(false);
mScrimController.setRawPanelExpansionFraction(0.8f);
- verifyZeroInteractions(mScrimBehind);
+ verifyNoMoreInteractions(mScrimBehind);
assertEquals("Scrim opacity shouldn't change when setExpansionAffectsAlpha "
+ "is false", scrimAlpha, mScrimBehind.getViewAlpha(), 0.01f);
@@ -1441,7 +1441,7 @@
public void testDoesNotHoldWakeLock_whenUnlocking() {
mScrimController.legacyTransitionTo(ScrimState.UNLOCKED);
finishAnimationsImmediately();
- verifyZeroInteractions(mWakeLock);
+ verifyNoMoreInteractions(mWakeLock);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
index 7a34e94..cace60c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java
@@ -35,7 +35,6 @@
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import android.app.ActivityManager;
@@ -352,7 +351,7 @@
eq(entry.getKey()), any(NotificationVisibility.class));
// The content intent should NOT be sent on click.
- verifyZeroInteractions(mContentIntent);
+ verifyNoMoreInteractions(mContentIntent);
// Notification should not be cancelled.
verify(mOnUserInteractionCallback, never())
@@ -385,7 +384,7 @@
eq(entry.getKey()), any(NotificationVisibility.class));
// The content intent should NOT be sent on click.
- verifyZeroInteractions(mContentIntent);
+ verifyNoMoreInteractions(mContentIntent);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt
index af4f647..4d293b9 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt
@@ -621,7 +621,7 @@
val signalStrength by collectLastValue(underTest.signalStrength)
// THEN we have not yet talked to satellite manager, since we are well before MIN_UPTIME
- Mockito.verifyZeroInteractions(satelliteManager)
+ Mockito.verifyNoMoreInteractions(satelliteManager)
// WHEN enough time has passed
systemClock.advanceTime(MIN_UPTIME)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerStartableTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerStartableTest.java
index c4a7463..aca2636 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerStartableTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerStartableTest.java
@@ -21,7 +21,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.os.Handler;
import android.os.Looper;
@@ -108,6 +108,6 @@
mBatteryControllerStartable.start();
mExecutor.runAllReady();
- verifyZeroInteractions(mBroadcastDispatcher);
+ verifyNoMoreInteractions(mBroadcastDispatcher);
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FlashlightControllerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FlashlightControllerImplTest.kt
index 80cc6ec..902caf3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FlashlightControllerImplTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FlashlightControllerImplTest.kt
@@ -41,7 +41,6 @@
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.Mockito.`when`
import org.mockito.MockitoAnnotations
@@ -89,7 +88,7 @@
@Test
fun testNoCameraManagerInteractionDirectlyOnConstructor() {
- verifyZeroInteractions(cameraManager)
+ verifyNoMoreInteractions(cameraManager)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RotationLockControllerImplTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RotationLockControllerImplTest.java
index ea620a6..3f33d2f 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RotationLockControllerImplTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RotationLockControllerImplTest.java
@@ -19,7 +19,7 @@
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -61,7 +61,7 @@
public void whenFlagOff_doesntInteractWithDeviceStateRotationController() {
createRotationLockController(new String[0]);
- verifyZeroInteractions(mDeviceStateRotationLockSettingController);
+ verifyNoMoreInteractions(mDeviceStateRotationLockSettingController);
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt
index 2127057..5739275 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt
@@ -73,7 +73,6 @@
import org.mockito.Mockito.mock
import org.mockito.Mockito.times
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.MockitoAnnotations
import org.mockito.MockitoSession
import org.mockito.quality.Strictness
@@ -207,7 +206,7 @@
mediaProjectionCallback.onStart(mediaProjectionInfo)
controller.registerSensitiveStateListener(listener1)
- verifyZeroInteractions(listener1)
+ verifyNoMoreInteractions(listener1)
mediaProjectionCallback.onStop(mediaProjectionInfo)
diff --git a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt
index 0b3dd66..516541d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt
@@ -46,7 +46,6 @@
import org.mockito.Mockito.clearInvocations
import org.mockito.Mockito.inOrder
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.MockitoAnnotations
import org.mockito.quality.Strictness
@@ -175,7 +174,7 @@
fun startListener_hasStarted_doesNothing() {
stylusManager.startListener()
- verifyZeroInteractions(inputManager)
+ verifyNoMoreInteractions(inputManager)
}
@Test
@@ -193,7 +192,7 @@
stylusManager.onInputDeviceAdded(STYLUS_DEVICE_ID)
- verifyZeroInteractions(stylusCallback)
+ verifyNoMoreInteractions(stylusCallback)
}
@Test
@@ -282,7 +281,7 @@
stylusManager.onInputDeviceChanged(STYLUS_DEVICE_ID)
- verifyZeroInteractions(stylusCallback)
+ verifyNoMoreInteractions(stylusCallback)
}
@Test
@@ -356,7 +355,7 @@
stylusManager.onInputDeviceRemoved(STYLUS_DEVICE_ID)
- verifyZeroInteractions(stylusCallback)
+ verifyNoMoreInteractions(stylusCallback)
}
@Test
@@ -565,7 +564,7 @@
stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState)
- verifyZeroInteractions(uiEventLogger)
+ verifyNoMoreInteractions(uiEventLogger)
}
@Test
@@ -574,7 +573,7 @@
stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState)
- verifyZeroInteractions(uiEventLogger)
+ verifyNoMoreInteractions(uiEventLogger)
}
@Test
@@ -630,7 +629,7 @@
fun onBatteryStateChanged_hasNotStarted_doesNothing() {
stylusManager.onBatteryStateChanged(STYLUS_DEVICE_ID, 1, batteryState)
- verifyZeroInteractions(inputManager)
+ verifyNoMoreInteractions(inputManager)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt
index a5e52a4..9592b28 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt
@@ -33,7 +33,6 @@
import org.mockito.Mockito.times
import org.mockito.Mockito.verify
import org.mockito.Mockito.verifyNoMoreInteractions
-import org.mockito.Mockito.verifyZeroInteractions
import org.mockito.MockitoAnnotations
@RunWith(AndroidTestingRunner::class)
@@ -81,7 +80,7 @@
startable.start()
- verifyZeroInteractions(stylusManager)
+ verifyNoMoreInteractions(stylusManager)
}
@Test
@@ -109,7 +108,7 @@
fun onStylusAdded_external_noop() {
startable.onStylusAdded(EXTERNAL_DEVICE_ID)
- verifyZeroInteractions(stylusUsiPowerUi)
+ verifyNoMoreInteractions(stylusUsiPowerUi)
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/toast/ToastUITest.java b/packages/SystemUI/tests/src/com/android/systemui/toast/ToastUITest.java
index 666bdd6..a3d2695 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/toast/ToastUITest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/toast/ToastUITest.java
@@ -30,7 +30,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
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.app.Application;
@@ -437,7 +437,7 @@
verify(mToastLogger).logOnSkipToastForInvalidDisplay(PACKAGE_NAME_1, TOKEN_1.toString(),
invalidDisplayId);
- verifyZeroInteractions(mWindowManager);
+ verifyNoMoreInteractions(mWindowManager);
}
private View verifyWmAddViewAndAttachToParent() {
diff --git a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
index 0d39834..9cfb0bb 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java
@@ -53,7 +53,7 @@
import static org.mockito.Mockito.never;
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.app.ActivityManager;
@@ -2362,7 +2362,7 @@
@DisableFlags(FLAG_SCREENSHARE_NOTIFICATION_HIDING)
@Test
public void doesNotRegisterSensitiveStateListener() {
- verifyZeroInteractions(mSensitiveNotificationProtectionController);
+ verifyNoMoreInteractions(mSensitiveNotificationProtectionController);
}
@EnableFlags(FLAG_SCREENSHARE_NOTIFICATION_HIDING)
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/wmshell/BubblesTestActivity.java b/packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTestActivity.java
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/systemui/wmshell/BubblesTestActivity.java
rename to packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTestActivity.java
diff --git a/packages/SystemUI/multivalentTests/src/com/android/keyguard/TestScopeProvider.kt b/packages/SystemUI/tests/utils/src/com/android/keyguard/TestScopeProvider.kt
similarity index 100%
rename from packages/SystemUI/multivalentTests/src/com/android/keyguard/TestScopeProvider.kt
rename to packages/SystemUI/tests/utils/src/com/android/keyguard/TestScopeProvider.kt
diff --git a/packages/SystemUI/tests/src/com/android/systemui/shade/transition/LinearLargeScreenShadeInterpolator.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/shade/transition/LinearLargeScreenShadeInterpolator.kt
similarity index 100%
rename from packages/SystemUI/tests/src/com/android/systemui/shade/transition/LinearLargeScreenShadeInterpolator.kt
rename to packages/SystemUI/tests/utils/src/com/android/systemui/shade/transition/LinearLargeScreenShadeInterpolator.kt
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryHelper.java b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/NotificationEntryHelper.java
similarity index 100%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryHelper.java
rename to packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/NotificationEntryHelper.java
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileTelephonyHelpers.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileTelephonyHelpers.kt
similarity index 100%
rename from packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileTelephonyHelpers.kt
rename to packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileTelephonyHelpers.kt
diff --git a/packages/SystemUI/tests/src/com/android/systemui/stylus/FixedCapacityBatteryState.kt b/packages/SystemUI/tests/utils/src/com/android/systemui/stylus/FixedCapacityBatteryState.kt
similarity index 100%
rename from packages/SystemUI/tests/src/com/android/systemui/stylus/FixedCapacityBatteryState.kt
rename to packages/SystemUI/tests/utils/src/com/android/systemui/stylus/FixedCapacityBatteryState.kt