Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73849f32 authored by Matthew Reynolds's avatar Matthew Reynolds Committed by Android (Google) Code Review
Browse files

Merge "More Robolectric Mass Migration" into main

parents 652d33bd 5af9275c

packages/SystemUI/Android.bp

+56 −60
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ filegroup { 
    srcs: [

        "tests/src/**/systemui/ExpandHelperTest.java",

        "tests/src/**/AAAPlusPlusVerifySysuiRequiredTestPropertiesTest.java",

        "tests/src/**/systemui/accessibility/AccessibilityGestureTargetsObserverTest.java",

        "tests/src/**/systemui/accessibility/floatingmenu/AccessibilityFloatingMenuControllerTest.java",

        "tests/src/**/systemui/accessibility/floatingmenu/AccessibilityTargetAdapterTest.java",

        "tests/src/**/systemui/screenshot/appclips/AppClipsActivityTest.java",
@@ -269,6 +270,42 @@ filegroup { 
        "tests/src/**/systemui/volume/VolumeDialogImplTest.java",

        "tests/src/**/systemui/wallet/controller/QuickAccessWalletControllerTest.java",

        "tests/src/**/systemui/wallet/ui/WalletScreenControllerTest.java",

        "tests/src/**/systemui/accessibility/data/repository/AccessibilityQsShortcutsRepositoryImplForDeviceTest.kt",

        "tests/src/**/systemui/biometrics/UdfpsControllerOverlayTest.kt",

        // TODO(b/322324387): Fails to start due to missing ScreenshotActivity

        "tests/src/**/systemui/bouncer/ui/composable/BouncerContentTest.kt",

        "tests/src/**/systemui/bouncer/ui/composable/PatternBouncerTest.kt",

        "tests/src/**/systemui/clipboardoverlay/ClipboardListenerTest.java",

        "tests/src/**/systemui/communal/data/db/CommunalDatabaseMigrationsTest.kt",

        "tests/src/**/systemui/communal/data/db/CommunalWidgetDaoTest.kt",

        "tests/src/**/systemui/display/data/repository/DisplayWindowPropertiesRepositoryImplTest.kt",

        "tests/src/**/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModelTest.kt",

        "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt",

        "tests/src/**/systemui/lifecycle/ActivatableTest.kt",

        "tests/src/**/systemui/lifecycle/HydratorTest.kt",

        "tests/src/**/systemui/media/dialog/MediaSwitchingControllerTest.java",

        "tests/src/**/systemui/qs/QSImplTest.java",

        "tests/src/**/systemui/qs/panels/ui/compose/DragAndDropTest.kt",

        "tests/src/**/systemui/qs/panels/ui/compose/ResizingTest.kt",

        "tests/src/**/systemui/screenshot/ActionExecutorTest.kt",

        "tests/src/**/systemui/screenshot/ScreenshotDetectionControllerTest.kt",

        "tests/src/**/systemui/screenshot/TakeScreenshotServiceTest.kt",

        "tests/src/**/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java",

        "tests/src/**/systemui/accessibility/floatingmenu/PositionTest.java",

        "tests/src/**/systemui/animation/TransitionAnimatorTest.kt",

        "tests/src/**/systemui/screenshot/scroll/ScrollCaptureControllerTest.java",

        "tests/src/**/systemui/lifecycle/SysuiViewModelTest.kt",

        "tests/src/**/systemui/flags/FakeFeatureFlags.kt",

        "tests/src/**/systemui/animation/TransitionAnimatorTest.kt",

        "tests/src/**/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java",

        "tests/src/**/systemui/statusbar/connectivity/NetworkControllerSignalTest.java",

        "tests/src/**/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt",

        "tests/src/**/systemui/statusbar/policy/RotationLockControllerImplTest.java",

        "tests/src/**/systemui/statusbar/phone/ScrimControllerTest.java",

        "tests/src/**/systemui/stylus/StylusUsiPowerStartableTest.kt",

        "tests/src/**/systemui/toast/ToastUITest.java",

        "tests/src/**/systemui/statusbar/policy/FlashlightControllerImplTest.kt",

        "tests/src/**/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt",

    ],

}
@@ -276,42 +313,23 @@ filegroup { 
filegroup {

    name: "SystemUI-tests-broken-robofiles-compile",

    srcs: [

        "tests/src/**/keyguard/KeyguardUpdateMonitorTest.java",

        "tests/src/**/systemui/statusbar/notification/icon/IconManagerTest.kt",

        "tests/src/**/systemui/statusbar/KeyguardIndicationControllerTest.java",

        "tests/src/**/systemui/doze/DozeScreenStateTest.java",

        "tests/src/**/keyguard/CarrierTextManagerTest.java",

        "tests/src/**/systemui/notetask/NoteTaskInitializerTest.kt",

        "tests/src/**/systemui/media/controls/ui/controller/MediaHierarchyManagerTest.kt",

        "tests/src/**/systemui/media/taptotransfer/receiver/MediaTttChipControllerReceiverTest.kt",

        "tests/src/**/systemui/accessibility/data/repository/AccessibilityQsShortcutsRepositoryImplForDeviceTest.kt",

        "tests/src/**/systemui/biometrics/AuthDialogPanelInteractionDetectorTest.kt",

        "tests/src/**/systemui/controls/management/ControlsFavoritingActivityTest.kt",

        "tests/src/**/systemui/controls/management/ControlsProviderSelectorActivityTest.kt",

        "tests/src/**/systemui/controls/start/ControlsStartableTest.kt",

        "tests/src/**/systemui/haptics/slider/SliderStateTrackerTest.kt",

        "tests/src/**/systemui/keyboard/stickykeys/ui/StickyKeysIndicatorCoordinatorTest.kt",

        "tests/src/**/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt",

        "tests/src/**/systemui/keyguard/data/quickaffordance/MuteQuickAffordanceCoreStartableTest.kt",

        "tests/src/**/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt",

        "tests/src/**/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorSceneContainerTest.kt",

        "tests/src/**/systemui/keyguard/ResourceTrimmerTest.kt",

        "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardBottomAreaViewModelTest.kt",

        "tests/src/**/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt",

        "tests/src/**/systemui/media/controls/ui/controller/MediaHierarchyManagerTest.kt",

        "tests/src/**/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartableTest.kt",

        "tests/src/**/systemui/media/controls/domain/pipeline/MediaTimeoutListenerTest.kt",

        "tests/src/**/systemui/media/taptotransfer/receiver/FakeMediaTttChipControllerReceiver.kt",

        "tests/src/**/systemui/qs/tileimpl/QSTileViewImplTest.kt",

        "tests/src/**/systemui/qs/tiles/DeviceControlsTileTest.kt",

        "tests/src/**/systemui/screenshot/ActionExecutorTest.kt",

        "tests/src/**/systemui/screenshot/ActionIntentCreatorTest.kt",

        "tests/src/**/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt",

        "tests/src/**/systemui/screenshot/TakeScreenshotServiceTest.kt",

        "tests/src/**/systemui/statusbar/notification/collection/TargetSdkResolverTest.kt",

        "tests/src/**/systemui/statusbar/notification/icon/IconManagerTest.kt",

        "tests/src/**/systemui/statusbar/notification/row/BigPictureIconManagerTest.kt",

        "tests/src/**/systemui/statusbar/notification/row/NotificationSettingsControllerTest.kt",

        "tests/src/**/systemui/statusbar/notification/stack/ui/view/NotificationStatsLoggerTest.kt",

        "tests/src/**/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImplTest.kt",

        "tests/src/**/systemui/statusbar/policy/FlashlightControllerImplTest.kt",

        "tests/src/**/systemui/statusbar/policy/SensitiveNotificationProtectionControllerFlagDisabledTest.kt",

        "tests/src/**/systemui/stylus/StylusUsiPowerStartableTest.kt",

        "tests/src/**/systemui/statusbar/policy/BatteryStateNotifierTest.kt",

        "tests/src/**/systemui/temporarydisplay/TemporaryViewDisplayControllerTest.kt",

        "tests/src/**/keyguard/ClockEventControllerTest.kt",

        "tests/src/**/systemui/animation/TransitionAnimatorTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/BluetoothAutoOnRepositoryTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/BluetoothStateInteractorTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/BluetoothTileDialogDelegateTest.kt",
@@ -319,9 +337,6 @@ filegroup { 
        "tests/src/**/systemui/bluetooth/qsdialog/BluetoothTileDialogViewModelTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/DeviceItemFactoryTest.kt",

        "tests/src/**/systemui/bluetooth/qsdialog/DeviceItemInteractorTest.kt",

        // TODO(b/322324387): Fails to start due to missing ScreenshotActivity

        "tests/src/**/systemui/bouncer/ui/composable/BouncerContentTest.kt",

        "tests/src/**/systemui/bouncer/ui/composable/PatternBouncerTest.kt",

        "tests/src/**/systemui/broadcast/UserBroadcastDispatcherTest.kt",

        "tests/src/**/systemui/charging/WiredChargingRippleControllerTest.kt",

        "tests/src/**/systemui/clipboardoverlay/ClipboardModelTest.kt",
@@ -348,8 +363,6 @@ filegroup { 
        "tests/src/**/systemui/media/taptotransfer/sender/MediaTttSenderCoordinatorTest.kt",

        "tests/src/**/systemui/navigationbar/gestural/BackPanelControllerTest.kt",

        "tests/src/**/systemui/notetask/NoteTaskControllerTest.kt",

        "tests/src/**/systemui/notetask/NoteTaskInitializerTest.kt",

        "tests/src/**/systemui/power/domain/interactor/PowerInteractorTest.kt",

        "tests/src/**/systemui/privacy/AppOpsPrivacyItemMonitorTest.kt",

        "tests/src/**/systemui/privacy/PrivacyItemControllerTest.kt",

        "tests/src/**/systemui/qs/external/CustomTileStatePersisterTest.kt",
@@ -376,7 +389,6 @@ filegroup { 
        "tests/src/**/systemui/statusbar/LightRevealScrimTest.kt",

        "tests/src/**/systemui/statusbar/LockscreenShadeTransitionControllerTest.kt",

        "tests/src/**/systemui/statusbar/notification/collection/coordinator/DataStoreCoordinatorTest.kt",

        "tests/src/**/systemui/statusbar/notification/collection/coordinator/KeyguardCoordinatorTest.kt",

        "tests/src/**/systemui/statusbar/notification/collection/coordinator/RowAppearanceCoordinatorTest.kt",

        "tests/src/**/systemui/statusbar/notification/collection/coordinator/ShadeEventCoordinatorTest.kt",

        "tests/src/**/systemui/statusbar/notification/collection/coordinator/StackCoordinatorTest.kt",
@@ -406,8 +418,6 @@ filegroup { 
        "tests/src/**/systemui/statusbar/SplitShadeLockScreenOverScrollerTest.kt",

        "tests/src/**/systemui/stylus/StylusUsiPowerUiTest.kt",

        "tests/src/**/systemui/temporarydisplay/chipbar/ChipbarCoordinatorTest.kt",

        "tests/src/**/keyguard/KeyguardUpdateMonitorTest.java",

        "tests/src/**/keyguard/CarrierTextManagerTest.java",

        "tests/src/**/systemui/ScreenDecorationsTest.java",

        "tests/src/**/systemui/temporarydisplay/chipbar/SwipeChipbarAwayGestureHandlerTest.kt",

        "tests/src/**/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt",
@@ -431,33 +441,17 @@ filegroup { 
        "tests/src/**/systemui/statusbar/policy/BatteryControllerStartableTest.java",

        "tests/src/**/systemui/statusbar/policy/BatteryControllerTest.java",

        "tests/src/**/systemui/statusbar/policy/SensitiveNotificationProtectionControllerTest.kt",

        "tests/src/**/systemui/statusbar/notification/NotificationSectionsFeatureManagerTest.kt",

        "tests/src/**/systemui/statusbar/pipeline/mobile/data/repository/CarrierConfigRepositoryTest.kt",

        "tests/src/**/systemui/statusbar/KeyboardShortcutsReceiverTest.java",

        "tests/src/**/systemui/wmshell/BubblesTest.java",

        "tests/src/**/systemui/biometrics/AuthRippleControllerTest.kt",

        "tests/src/**/keyguard/KeyguardAbsKeyInputViewControllerTest.java",

        "tests/src/**/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java",

        "tests/src/**/systemui/clipboardoverlay/ClipboardListenerTest.java",

        "tests/src/**/systemui/doze/DozeScreenStateTest.java",

        "tests/src/**/systemui/keyguard/WorkLockActivityControllerTest.java",

        "tests/src/**/systemui/media/dialog/MediaSwitchingControllerTest.java",

        "tests/src/**/systemui/navigationbar/views/NavigationBarTest.java",

        "tests/src/**/systemui/power/PowerNotificationWarningsTest.java",

        "tests/src/**/systemui/qs/QSFooterViewControllerTest.java",

        "tests/src/**/systemui/qs/QSImplTest.java",

        "tests/src/**/systemui/qs/tiles/QuickAccessWalletTileTest.java",

        "tests/src/**/systemui/shade/carrier/ShadeCarrierGroupControllerTest.java",

        "tests/src/**/systemui/statusbar/connectivity/NetworkControllerBaseTest.java",

        "tests/src/**/systemui/statusbar/connectivity/NetworkControllerDataTest.java",

        "tests/src/**/systemui/statusbar/connectivity/NetworkControllerEthernetTest.java",

        "tests/src/**/systemui/statusbar/connectivity/NetworkControllerSignalTest.java",

        "tests/src/**/systemui/statusbar/connectivity/NetworkControllerWifiTest.java",

        "tests/src/**/systemui/statusbar/KeyguardIndicationControllerTest.java",

        "tests/src/**/systemui/statusbar/notification/stack/NotificationStackScrollLayoutControllerTest.java",

        "tests/src/**/systemui/statusbar/phone/ScrimControllerTest.java",

        "tests/src/**/systemui/statusbar/policy/RotationLockControllerImplTest.java",

        "tests/src/**/systemui/toast/ToastUITest.java",

        "tests/src/**/systemui/power/PowerUITest.java",

        "tests/src/**/systemui/qs/QSSecurityFooterTest.java",

        "tests/src/**/systemui/qs/tileimpl/QSTileImplTest.java",

        "tests/src/**/systemui/shared/plugins/PluginActionManagerTest.java",

        "tests/src/**/systemui/statusbar/CommandQueueTest.java",

        "tests/src/**/systemui/statusbar/connectivity/CallbackHandlerTest.java",

        "tests/src/**/systemui/statusbar/policy/SecurityControllerTest.java",

        "tests/src/**/systemui/shared/clocks/view/SimpleDigitalClockTextViewTest.kt",

    ],

    visibility: ["//visibility:private"],

}
@@ -885,6 +879,7 @@ android_robolectric_test { 
        "android.test.base.impl",

        "android.test.mock.impl",

        "truth",

        "androidx.test.ext.truth",

    ],



    upstream: true,
@@ -922,6 +917,7 @@ android_robolectric_test { 
        "android.test.base.impl",

        "android.test.mock.impl",

        "truth",

        "androidx.test.ext.truth",

    ],



    upstream: true,

packages/SystemUI/tests/src/com/android/systemui/bluetooth/qsdialog/AudioSharingDialogDelegateTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/bluetooth/qsdialog/AudioSharingDialogDelegateTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.bluetooth.qsdialog



import android.testing.AndroidTestingRunner

import androidx.test.ext.junit.runners.AndroidJUnit4

import android.testing.TestableLooper

import android.widget.Button

import android.widget.TextView
@@ -43,7 +43,7 @@ import org.mockito.kotlin.verify 
import org.mockito.kotlin.whenever



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@OptIn(ExperimentalCoroutinesApi::class)

class AudioSharingDialogDelegateTest : SysuiTestCase() {

packages/SystemUI/tests/src/com/android/systemui/bluetooth/qsdialog/DeviceItemActionInteractorTest.kt→packages/SystemUI/multivalentTests/src/com/android/systemui/bluetooth/qsdialog/DeviceItemActionInteractorTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 */

package com.android.systemui.bluetooth.qsdialog



import android.testing.AndroidTestingRunner

import androidx.test.ext.junit.runners.AndroidJUnit4

import android.testing.TestableLooper

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase
@@ -37,7 +37,7 @@ import org.mockito.junit.MockitoRule 
import org.mockito.kotlin.whenever



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@OptIn(ExperimentalCoroutinesApi::class)

class DeviceItemActionInteractorTest : SysuiTestCase() {

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayServiceTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ import org.mockito.kotlin.firstValue 
import org.mockito.kotlin.mock

import org.mockito.kotlin.spy

import org.mockito.kotlin.times

import org.mockito.kotlin.verifyZeroInteractions

import org.mockito.kotlin.verifyNoMoreInteractions

import org.mockito.kotlin.whenever



@OptIn(ExperimentalCoroutinesApi::class)
@@ -453,7 +453,7 @@ class DreamOverlayServiceTest : SysuiTestCase() { 


        mMainExecutor.runAllReady()



        verifyZeroInteractions(mTouchMonitor)

        verifyNoMoreInteractions(mTouchMonitor)



        val captor = ArgumentCaptor.forClass(DreamOverlayStateController.Callback::class.java)

        verify(mStateController).addCallback(captor.capture())

packages/SystemUI/tests/src/com/android/systemui/power/PowerNotificationWarningsTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/power/PowerNotificationWarningsTest.java

+0 −0

File moved.

View file