ff11eeb034dcac7a710767770690f2d5098e06ff - platform_frameworks_base

commit	ff11eeb034dcac7a710767770690f2d5098e06ff	[log] [tgz]
author	Matthew Reynolds <matthewre@google.com>	Wed Sep 25 00:25:20 2024 +0000
committer	Matthew Reynolds <matthewre@google.com>	Mon Sep 30 18:44:37 2024 +0000
tree	1faa7496a5ba98fee2216d56453fffa0162f410e
parent	183cfc93461241011970dcc084f90f61552b1b53 [diff]

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

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java[Renamed from packages/SystemUI/tests/src/com/android/keyguard/KeyguardAbsKeyInputViewControllerTest.java - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/controls/start/ControlsStartableTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/controls/start/ControlsStartableTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/haptics/slider/SliderStateTrackerTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyguard/ResourceTrimmerTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSFooterViewControllerTest.java[Renamed from packages/SystemUI/tests/src/com/android/systemui/qs/QSFooterViewControllerTest.java - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/qs/QSImplTest.java[Renamed from packages/SystemUI/tests/src/com/android/systemui/qs/QSImplTest.java - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/qs/tiles/DeviceControlsTileTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java[Renamed from packages/SystemUI/tests/src/com/android/systemui/qs/tiles/QuickAccessWalletTileTest.java - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarSignalPolicyTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt - diff]
packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt - diff]
packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java[Renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/MagnificationModeSwitchTest.java - diff]
packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/biometrics/UdfpsViewTest.kt[Renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/biometrics/UdfpsViewTest.kt - diff]
packages/SystemUI/tests/src/com/android/systemui/classifier/FalsingDataProviderTest.java[Renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/classifier/FalsingDataProviderTest.java - diff]
packages/SystemUI/tests/src/com/android/systemui/clipboardoverlay/ClipboardListenerTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/media/dialog/MediaSwitchingControllerTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskControllerTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/notetask/NoteTaskInitializerTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/CommandQueueTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/KeyboardShortcutsReceiverTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationRowContentBinderImplTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarterTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/BatteryControllerStartableTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/FlashlightControllerImplTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/RotationLockControllerImplTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/stylus/StylusManagerTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/stylus/StylusUsiPowerStartableTest.kt[diff]
packages/SystemUI/tests/src/com/android/systemui/toast/ToastUITest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java[diff]
packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTestActivity.java[Renamed from packages/SystemUI/multivalentTests/src/com/android/systemui/wmshell/BubblesTestActivity.java - diff]
packages/SystemUI/tests/utils/src/com/android/keyguard/TestScopeProvider.kt[Renamed from packages/SystemUI/multivalentTests/src/com/android/keyguard/TestScopeProvider.kt - diff]
packages/SystemUI/tests/utils/src/com/android/systemui/shade/transition/LinearLargeScreenShadeInterpolator.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/shade/transition/LinearLargeScreenShadeInterpolator.kt - diff]
packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/NotificationEntryHelper.java[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationEntryHelper.java - diff]
packages/SystemUI/tests/utils/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileTelephonyHelpers.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileTelephonyHelpers.kt - diff]
packages/SystemUI/tests/utils/src/com/android/systemui/stylus/FixedCapacityBatteryState.kt[Renamed from packages/SystemUI/tests/src/com/android/systemui/stylus/FixedCapacityBatteryState.kt - diff]

55 files changed

tree: 1faa7496a5ba98fee2216d56453fffa0162f410e