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

Commit 79068207 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge changes from topic "jan25" into main 

* changes:
  Enable some QS `multivalentTests` under Ravenwood.
  Define `SystemUiRavenTests`, default to "ignored."
  Offer `RavenwoodClassRule`.
parents c0a4a1b0 7189df1e

packages/SystemUI/Android.bp

+31 −1
Original line number Diff line number Diff line
@@ -330,6 +330,7 @@ android_library { 
        "androidx.core_core-animation-testing-nodeps",

        "androidx.compose.ui_ui",

        "flag-junit",

        "ravenwood-junit",

        "platform-test-annotations",

        "notification_flags_lib",

    ],
@@ -386,7 +387,8 @@ android_library { 


android_app {

    name: "SystemUIRobo-stub",

    use_resource_processor: true,

    // SystemUiRavenTests references the .aapt.srcjar

    use_resource_processor: false,

    defaults: [

        "platform_app_defaults",

        "SystemUI_optimized_defaults",
@@ -458,6 +460,34 @@ android_robolectric_test { 
    ],

}



android_ravenwood_test {

    name: "SystemUiRavenTests",

    srcs: [

        ":SystemUI-tests-utils",

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

    ],

    static_libs: [

        "SystemUI-core",

        "SystemUI-res",

        "SystemUI-tests-base",

        "androidx.test.uiautomator_uiautomator",

        "androidx.core_core-animation-testing",

        "androidx.test.ext.junit",

    ],

    libs: [

        "android.test.runner",

        "android.test.base",

        "android.test.mock",

    ],

    auto_gen_config: true,

    plugins: [

        "dagger2-compiler",

    ],

}



// Opt-out config for optimizing the SystemUI target using R8.

// Disabled via `export SYSTEMUI_OPTIMIZE_JAVA=false`, or explicitly in Make via

// `SYSTEMUI_OPTIMIZE_JAVA := false`.

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/data/repository/AutoAddSettingsRepositoryTest.kt

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


package com.android.systemui.qs.pipeline.data.repository



import android.platform.test.annotations.EnabledOnRavenwood

import android.provider.Settings

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

import androidx.test.filters.SmallTest
@@ -38,6 +39,7 @@ import org.mockito.MockitoAnnotations 


@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@EnabledOnRavenwood

@RunWith(AndroidJUnit4::class)

class AutoAddSettingsRepositoryTest : SysuiTestCase() {

    private val secureSettings = FakeSettings()

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/data/repository/CustomTileAddedSharedPreferencesRepositoryTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.systemui.qs.pipeline.data.repository 


import android.content.ComponentName

import android.content.SharedPreferences

import android.platform.test.annotations.EnabledOnRavenwood

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase
@@ -29,6 +30,7 @@ import org.junit.Test 
import org.junit.runner.RunWith



@SmallTest

@EnabledOnRavenwood

@RunWith(AndroidJUnit4::class)

class CustomTileAddedSharedPreferencesRepositoryTest : SysuiTestCase() {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/data/repository/TileSpecSettingsRepositoryTest.kt

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


package com.android.systemui.qs.pipeline.data.repository



import android.platform.test.annotations.EnabledOnRavenwood

import android.provider.Settings

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

import androidx.test.filters.SmallTest
@@ -39,6 +40,7 @@ import org.mockito.Mock 
import org.mockito.MockitoAnnotations



@SmallTest

@EnabledOnRavenwood

@RunWith(AndroidJUnit4::class)

@OptIn(ExperimentalCoroutinesApi::class)

class TileSpecSettingsRepositoryTest : SysuiTestCase() {

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/pipeline/data/repository/TilesSettingConverterTest.kt

+2 −0
Original line number Diff line number Diff line 
package com.android.systemui.qs.pipeline.data.repository



import android.platform.test.annotations.EnabledOnRavenwood

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

import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase
@@ -9,6 +10,7 @@ import org.junit.Test 
import org.junit.runner.RunWith



@SmallTest

@EnabledOnRavenwood

@RunWith(AndroidJUnit4::class)

class TilesSettingConverterTest : SysuiTestCase() {