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

Commit 10484610 authored by John Wu's avatar John Wu
Browse files

Enable resources in SystemUiRavenTests 

Annotations added with script

Bug: 319647875
Flag: EXEMPT host side change only
Test: atest SystemUiRavenTests
Change-Id: Ia2b692863ed35f034654f018d8f354ab05852c72
parent bfc37d2a

packages/SystemUI/Android.bp

+22 −4
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ android_library { 
        "SystemUISharedLib",

        "SystemUICustomizationLib",

        "SettingsLib",

        "WindowManager-Shell",

        "androidx.leanback_leanback",

        "androidx.slice_slice-core",

        "androidx.slice_slice-view",
@@ -748,6 +749,24 @@ android_library { 
    ],

}



android_app {

    name: "SystemUI-tests-res",

    // SystemUiRavenTests references the .aapt.srcjar

    use_resource_processor: false,

    manifest: "tests/AndroidManifest-base.xml",

    resource_dirs: [

        "tests/res",

    ],

    asset_dirs: [

        "tests/goldens",

        "schemas",

    ],

    static_libs: [

        "SystemUI-res",

    ],

    platform_apis: true,

}



android_library {

    name: "SystemUI-tests",

    use_resource_processor: true,
@@ -824,8 +843,7 @@ android_library { 


android_app {

    name: "SystemUIRobo-stub",

    // SystemUiRavenTests references the .aapt.srcjar

    use_resource_processor: false,

    use_resource_processor: true,

    defaults: [

        "platform_app_defaults",

        "SystemUI_optimized_defaults",
@@ -960,11 +978,10 @@ android_ravenwood_test { 
        ":SystemUI-tests-multivalent",

        // TODO(b/294256649): pivot to using {.aapt.jar} and re-enable

        // use_resource_processor: true when better supported by soong

        ":SystemUIRobo-stub{.aapt.srcjar}",

        ":SystemUI-tests-res{.aapt.srcjar}",

    ],

    static_libs: [

        "SystemUI-core",

        "SystemUI-res",

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",
@@ -979,6 +996,7 @@ android_ravenwood_test { 
        "android.test.base.impl",

        "android.test.mock.impl",

    ],

    resource_apk: "SystemUI-tests-res",

    auto_gen_config: true,

    team: "trendy_team_ravenwood",

    plugins: [

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/floatingmenu/AnnotationLinkSpanTest.java

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ import java.util.concurrent.atomic.AtomicBoolean; 
/** Tests for {@link AnnotationLinkSpan}. */

@SmallTest

@RunWith(AndroidJUnit4.class)

@android.platform.test.annotations.EnabledOnRavenwood

public class AnnotationLinkSpanTest extends SysuiTestCase {



    private AnnotationLinkSpan.LinkInfo mLinkInfo;

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/domain/interactor/EditTilesListInteractorTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import org.junit.runner.RunWith 


@RunWith(AndroidJUnit4::class)

@SmallTest

@android.platform.test.annotations.EnabledOnRavenwood

class EditTilesListInteractorTest : SysuiTestCase() {

    private val kosmos = testKosmos()

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeViewModelTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import platform.test.runner.parameterized.Parameters 


@RunWith(ParameterizedAndroidJunit4::class)

@SmallTest

@android.platform.test.annotations.EnabledOnRavenwood

class EditModeViewModelTest(flags: FlagsParameterization) : SysuiTestCase() {



    init {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/TileUiStateTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import org.junit.runner.RunWith 


@SmallTest

@RunWith(AndroidJUnit4::class)

@android.platform.test.annotations.EnabledOnRavenwood

class TileUiStateTest : SysuiTestCase() {



    private val kosmos = testKosmos()