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

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

Merge "Convert remaining tests to Robolectric" into main

parents 0ae69b63 9b949c90

packages/SystemUI/Android.bp

+55 −1
Original line number Diff line number Diff line
@@ -98,13 +98,66 @@ filegroup { 
    ],

}



// Tests where robolectric failed at runtime. (go/multivalent-tests)

// Tests where robolectric failed at runtime. (go/central-multivalent)

filegroup {

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

    srcs: [

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

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

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

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

        "tests/src/**/systemui/screenshot/appclips/AppClipsActivityTest.java",

        "tests/src/**/systemui/screenshot/appclips/AppClipsTrampolineActivityTest.java",

        "tests/src/**/systemui/screenshot/appclips/AppClipsViewModelTest.java",

        "tests/src/**/systemui/appops/AppOpsControllerTest.java",

        "tests/src/**/systemui/biometrics/BiometricNotificationServiceTest.java",

        "tests/src/**/systemui/bluetooth/BroadcastDialogDelegateTest.java",

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

        "tests/src/**/systemui/communal/data/backup/CommunalBackupHelperTest.kt",

        "tests/src/**/systemui/controls/ui/ControlsPopupMenuTest.kt",

        "tests/src/**/systemui/classifier/DistanceClassifierTest.java",

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

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

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

        "tests/src/**/systemui/classifier/FalsingDataProviderTest.java",

        "tests/src/**/systemui/screenshot/ImageExporterTest.java",

        "tests/src/**/systemui/bouncer/data/repository/KeyguardBouncerRepositoryTest.kt",

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

        "tests/src/**/systemui/logcat/LogAccessDialogActivityTest.java",

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

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

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

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

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

        "tests/src/**/systemui/classifier/PointerCountClassifierTest.java",

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

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

        "tests/src/**/systemui/screenrecord/RecordingControllerTest.java",

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

        "tests/src/**/systemui/media/controls/domain/resume/ResumeMediaBrowserTest.kt",

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

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

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

        "tests/src/**/systemui/media/controls/ui/viewmodel/SeekBarViewModelTest.kt",

        "tests/src/**/systemui/qs/external/TileServicesTest.java",

        "tests/src/**/systemui/ambient/touch/TouchMonitorTest.java",

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

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

        "tests/src/androidx/core/animation/AnimatorTestRuleIsolationTest.kt",

        "tests/src/**/systemui/CameraProtectionLoaderImplTest.kt",

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

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

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

        "tests/src/**/systemui/SystemUIApplicationTest.kt",

        "tests/src/**/systemui/SysUICutoutProviderTest.kt",

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

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

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

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

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

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

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

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

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

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

        "tests/src/**/systemui/animation/TextAnimatorTest.kt",
@@ -160,6 +213,7 @@ filegroup { 
        "tests/src/**/systemui/statusbar/KeyboardShortcutsTest.java",

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

        "tests/src/**/systemui/statusbar/notification/AssistantFeedbackControllerTest.java",

        "tests/src/**/systemui/statusbar/notification/PropertyAnimatorTest.java",

        "tests/src/**/systemui/statusbar/notification/collection/NotifCollectionTest.java",

        "tests/src/**/systemui/statusbar/notification/collection/NotificationEntryTest.java",

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

packages/SystemUI/tests/src/androidx/core/animation/AnimatorTestRuleIsolationTest.kt

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

package androidx.core.animation



import android.testing.AndroidTestingRunner

import android.testing.TestableLooper.RunWithLooper

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.util.doOnEnd
@@ -29,7 +29,7 @@ import org.junit.runner.RunWith 
 * This test class validates that two tests' animators are isolated from each other when using the

 * same animator test rule. This is a test to prevent future instances of b/275602127.

 */

@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

@SmallTest

@RunWithLooper

class AnimatorTestRuleIsolationTest : SysuiTestCase() {

packages/SystemUI/tests/src/com/android/keyguard/AuthKeyguardMessageAreaTest.java

+2 −2
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.keyguard; 


import static com.google.common.truth.Truth.assertThat;



import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper.RunWithLooper;

import android.view.View;



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

import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;
@@ -32,7 +32,7 @@ import org.junit.runner.RunWith; 
import org.mockito.MockitoAnnotations;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

@RunWithLooper

public class AuthKeyguardMessageAreaTest extends SysuiTestCase {

    private KeyguardMessageArea mKeyguardMessageArea;

packages/SystemUI/tests/src/com/android/keyguard/BouncerKeyguardMessageAreaTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.keyguard



import android.content.Context

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper.RunWithLooper

import android.util.AttributeSet

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.google.common.truth.Truth.assertThat
@@ -31,7 +31,7 @@ import org.mockito.Mockito.times 
import org.mockito.Mockito.verify



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

@RunWithLooper

class BouncerKeyguardMessageAreaTest : SysuiTestCase() {

    class FakeBouncerKeyguardMessageArea(context: Context, attrs: AttributeSet?) :

packages/SystemUI/tests/src/com/android/keyguard/BouncerPanelExpansionCalculatorTest.kt

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


package com.android.keyguard



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

import androidx.test.filters.SmallTest

import android.testing.AndroidTestingRunner

import com.android.systemui.SysuiTestCase

import com.google.common.truth.Truth.assertThat

import org.junit.Assert.assertEquals

import org.junit.Test

import org.junit.runner.RunWith



@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

@SmallTest

class BouncerPanelExpansionCalculatorTest : SysuiTestCase() {

    @Test