Define `SystemUiRavenTests`, default to "ignored."
With our recent foundational work, we're now in a position to define
a `SystemUiRavenTests` target that runs all `multivalentTests`. This
change uses the `@DisabledOnRavenwood` annotation to "ignore" all
tests by default when executed under the Ravenwood environment, and
future changes will use `@EnabledOnRavenwood` to progressively
opt-in tests that are passing. (Tests continue running as-is under
all other environments.)
As a reminder, our strategy of using a `RavenwoodRule` and
`RavenwoodClassRule` to integrate with JUnit means that all test
classes <clinit> will be run, even if all contained tests will end
up being ignored. We've done a few passes of using `by lazy` and
`lateinit` to ensure that we avoid interacting with Ravenwood
unsupported APIs, but once this change lands it will require that
future test updates remain vigilant to keep presubmit green. This
aligns with the SysUI testing policy outlined in <go/no-static-work>,
but that policy will now be more directly enforced.
Bug: 319647875
Test: atest SystemUiRoboTests
Test: atest SystemUiRavenTests
Change-Id: I5ef7a2ada3047d468ff335511467f9691752e9f1
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 80656e9..90593d6 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -330,6 +330,7 @@
"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_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_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`.