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

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

Merge "Mass Robolectric Migration systemui/[a-f]* Attempt #2" into main

parents e0405511 d0ef2864

packages/SystemUI/Android.bp

+42 −3
Original line number Diff line number Diff line
@@ -78,10 +78,50 @@ filegroup { 
    visibility: ["//visibility:private"],

}



// Tests where robolectric conversion caused errors in SystemUITests at runtime

filegroup {

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

    srcs: [

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

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

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

        "tests/src/**/systemui/globalactions/GlobalActionsDialogLiteTest.java",

        "tests/src/**/systemui/globalactions/GlobalActionsImeTest.java",

        "tests/src/**/systemui/keyguard/data/repository/KeyguardTransitionRepositoryTest.kt",

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

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

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

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

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

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

        "tests/src/**/systemui/mediaprojection/permission/MediaProjectionPermissionDialogDelegateTest.kt",

    ],

}



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

filegroup {

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

    srcs: [

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

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

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

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

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

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

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

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

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

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

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

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

        "tests/src/**/systemui/compose/ComposeInitializerTest.kt",

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

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

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

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

        "tests/src/**/systemui/doze/DozeMachineTest.kt",

        "tests/src/**/systemui/fontscaling/FontScalingDialogDelegateTest.kt",

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

        "tests/src/**/systemui/globalactions/GlobalActionsColumnLayoutTest.java",

        "tests/src/**/systemui/globalactions/GlobalActionsDialogLiteTest.java",

        "tests/src/**/systemui/globalactions/GlobalActionsImeTest.java",
@@ -176,9 +216,7 @@ filegroup { 
    ],

}



// We are running robolectric tests in the tests directory as well as

// multivalent tests.  If you add a test, and it doesn't run in robolectric,

// it should be added to this exclusion list. go/multivalent-tests

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

filegroup {

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

    srcs: [
@@ -811,6 +849,7 @@ android_robolectric_test { 
    exclude_srcs: [

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

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

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

    ],

    static_libs: [

        "RoboTestLibraries",

packages/SystemUI/tests/src/com/android/systemui/accessibility/AccessibilityLoggerTest.kt

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


package com.android.systemui.accessibility



import android.testing.AndroidTestingRunner

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

import androidx.test.filters.SmallTest

import com.android.internal.logging.UiEventLogger

import com.android.systemui.SysuiTestCase
@@ -34,7 +34,7 @@ import org.mockito.Mockito.verify 
import org.mockito.junit.MockitoJUnit



@SmallTest

@RunWith(AndroidTestingRunner::class)

@RunWith(AndroidJUnit4::class)

class AccessibilityLoggerTest : SysuiTestCase() {

    @JvmField @Rule val mockito = MockitoJUnit.rule()

packages/SystemUI/tests/src/com/android/systemui/accessibility/DisplayIdIndexSupplierTest.java

+2 −2
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ import static org.junit.Assert.assertNotEquals; 
import static org.junit.Assert.assertNotNull;



import android.hardware.display.DisplayManager;

import android.testing.AndroidTestingRunner;

import android.view.Display;



import androidx.annotation.NonNull;

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

import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;
@@ -33,7 +33,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

public class DisplayIdIndexSupplierTest extends SysuiTestCase {



    private DisplayIdIndexSupplier<Object> mDisplayIdIndexSupplier;

packages/SystemUI/tests/src/com/android/systemui/accessibility/IMagnificationConnectionTest.java

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ import android.platform.test.annotations.RequiresFlagsEnabled; 
import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.Display;

import android.view.accessibility.AccessibilityManager;
@@ -45,6 +44,7 @@ import android.view.accessibility.IMagnificationConnection; 
import android.view.accessibility.IMagnificationConnectionCallback;

import android.view.accessibility.IRemoteMagnificationAnimationCallback;



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

import androidx.test.filters.SmallTest;



import com.android.systemui.Flags;
@@ -67,7 +67,7 @@ import org.mockito.MockitoAnnotations; 
 * {@link Magnification}

 */

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class IMagnificationConnectionTest extends SysuiTestCase {

packages/SystemUI/tests/src/com/android/systemui/accessibility/MagnificationGestureDetectorTest.java

+2 −2
Original line number Diff line number Diff line
@@ -26,11 +26,11 @@ import static org.mockito.Mockito.verify; 


import android.os.Handler;

import android.os.SystemClock;

import android.testing.AndroidTestingRunner;

import android.view.MotionEvent;

import android.view.View;

import android.view.ViewConfiguration;



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

import androidx.test.filters.SmallTest;



import com.android.systemui.SysuiTestCase;
@@ -45,7 +45,7 @@ import org.mockito.Mockito; 
import org.mockito.MockitoAnnotations;



@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

public class MagnificationGestureDetectorTest extends SysuiTestCase {



    private static final float ACTION_DOWN_X = 100;