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

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

Merge "Mass Robolectric migration directories systemui/[g-m]" into main

parents 941e4e94 ea1d7488

packages/SystemUI/Android.bp

+34 −0
Original line number Original line Diff line number Diff line
@@ -78,9 +78,42 @@ filegroup { 
    visibility: ["//visibility:private"],

    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/globalactions/GlobalActionsDialogLiteTest.java",

        "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",

    ],

}



filegroup {

filegroup {

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

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

    srcs: [

    srcs: [

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

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

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

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

        "tests/src/**/systemui/graphics/ImageLoaderTest.kt",

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

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

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

        "tests/src/**/systemui/keyguard/ui/view/layout/sections/ClockSectionTest.kt",

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

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

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

        "tests/src/**/systemui/log/LogBufferTest.kt",

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

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

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

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

        "tests/src/**/systemui/mediaprojection/taskswitcher/ui/TaskSwitcherNotificationCoordinatorTest.kt",

        "tests/src/**/systemui/util/LifecycleFragmentTest.java",

        "tests/src/**/systemui/util/LifecycleFragmentTest.java",

        "tests/src/**/systemui/util/TestableAlertDialogTest.kt",

        "tests/src/**/systemui/util/TestableAlertDialogTest.kt",

        "tests/src/**/systemui/util/kotlin/PairwiseFlowTest",

        "tests/src/**/systemui/util/kotlin/PairwiseFlowTest",
@@ -767,6 +800,7 @@ android_robolectric_test { 
        ":SystemUI-tests-robofiles",

        ":SystemUI-tests-robofiles",

    ],

    ],

    exclude_srcs: [

    exclude_srcs: [

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

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

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

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

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

    ],

    ],

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsGridLayoutTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,11 +21,11 @@ import static junit.framework.Assert.assertEquals; 
import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;





import android.testing.AndroidTestingRunner;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;





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

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith; 
 * Tests for {@link ListGridLayout}.

 * Tests for {@link ListGridLayout}.

 */

 */

@SmallTest

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

public class GlobalActionsGridLayoutTest extends SysuiTestCase {

public class GlobalActionsGridLayoutTest extends SysuiTestCase {





    private GlobalActionsGridLayout mGridLayout;

    private GlobalActionsGridLayout mGridLayout;

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsLayoutTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,11 +24,11 @@ import static org.mockito.Mockito.doReturn; 
import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;





import android.content.Context;

import android.content.Context;

import android.testing.AndroidTestingRunner;

import android.util.AttributeSet;

import android.util.AttributeSet;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;





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

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.systemui.MultiListLayout;

import com.android.systemui.MultiListLayout;
@@ -44,7 +44,7 @@ import java.util.ArrayList; 
 * Tests for {@link ListGridLayout}.

 * Tests for {@link ListGridLayout}.

 */

 */

@SmallTest

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

public class GlobalActionsLayoutTest extends SysuiTestCase {

public class GlobalActionsLayoutTest extends SysuiTestCase {





    private TestLayout mLayout;

    private TestLayout mLayout;

packages/SystemUI/tests/src/com/android/systemui/globalactions/ListGridLayoutTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -18,11 +18,11 @@ package com.android.systemui.globalactions; 




import static junit.framework.Assert.assertEquals;

import static junit.framework.Assert.assertEquals;





import android.testing.AndroidTestingRunner;

import android.view.LayoutInflater;

import android.view.LayoutInflater;

import android.view.View;

import android.view.View;

import android.view.ViewGroup;

import android.view.ViewGroup;





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

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.systemui.SysuiTestCase;

import com.android.systemui.SysuiTestCase;
@@ -36,7 +36,7 @@ import org.junit.runner.RunWith; 
 * Tests for {@link ListGridLayout}.

 * Tests for {@link ListGridLayout}.

 */

 */

@SmallTest

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

public class ListGridLayoutTest extends SysuiTestCase {

public class ListGridLayoutTest extends SysuiTestCase {





    private ListGridLayout mListGridLayout;

    private ListGridLayout mListGridLayout;

packages/SystemUI/tests/src/com/android/systemui/globalactions/ShutdownUiTest.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,8 +26,8 @@ import android.net.platform.flags.Flags; 
import android.os.PowerManager;

import android.os.PowerManager;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.EnableFlags;

import android.testing.AndroidTestingRunner;





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

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;





import com.android.internal.R;

import com.android.internal.R;
@@ -41,7 +41,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.mockito.MockitoAnnotations;





@SmallTest

@SmallTest

@RunWith(AndroidTestingRunner.class)

@RunWith(AndroidJUnit4.class)

public class ShutdownUiTest extends SysuiTestCase {

public class ShutdownUiTest extends SysuiTestCase {





    ShutdownUi mShutdownUi;

    ShutdownUi mShutdownUi;