Resolves test resource issues and re-enables test
Fixes: b/291104503
Test: ThemePickerRoboTests pass in atest and Studio
Change-Id: I03da527b4ccb2d5abfc4320879aeaaa43809a64c
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index c34ed2c..d4dde59 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -2,22 +2,30 @@
default_applicable_licenses: ["Android-Apache-2.0"],
}
+android_app {
+ name: "ThemePickerShell",
+ defaults: ["ThemePicker_defaults"],
+ platform_apis: true,
+ static_libs: ["ThemePickerTestLib"],
+}
+
android_robolectric_test {
name: "ThemePickerRoboTests",
srcs: [
"src/**/*.java",
"src/**/*.kt",
],
- // TODO(b/291104503) Enable this test
- exclude_srcs: ["src/com/android/customization/model/picker/quickaffordance/ui/viewmodel/KeyguardQuickAffordancePickerViewModelTest.kt"],
java_resource_dirs: ["config"],
+
+ // Do not add picker-related dependencies here. Add them to ThemePickerShell
+ // instead.
static_libs: [
- "WallpaperPicker2TestLib",
"androidx.test.rules",
"junit",
"kotlinx_coroutines_test",
"truth",
],
+
libs: [
"androidx.test.core",
"androidx.test.runner",
@@ -25,5 +33,5 @@
upstream: true,
- instrumentation_for: "ThemePicker",
+ instrumentation_for: "ThemePickerShell",
}