summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andrei Onea <andreionea@google.com> 2020-02-07 19:37:28 +0000
committer Andrei-Valentin Onea <andreionea@google.com> 2020-02-10 18:25:06 +0000
commit1a0195349b543b89cd516e6a81ff64d0bedf5555 (patch)
tree35ff7c2eb52a7b798397011547f57feb7149e02a
parent142a3f86e3536cf9a5f3b1b02b31b297542eb874 (diff)
Add TEST_MAPPING for gating and logging
The tests included are unit tests for the implementation (under FrameworksServicesTests), for the corresponding TestRule (PlatformCompatGating) and CTS tests. Bug: 137821288 Test: cd frameworks/base/core/java/android/app/compat && atest Test: cd frameworks/base/services/core/java/com/android/server/compat \ && atest Change-Id: I1a652775715f1a9738cc72725303bc78dfa17d03
-rw-r--r--core/java/android/app/compat/TEST_MAPPING7
-rw-r--r--services/core/java/com/android/server/compat/TEST_MAPPING21
-rw-r--r--tests/PlatformCompatGating/Android.bp1
3 files changed, 29 insertions, 0 deletions
diff --git a/core/java/android/app/compat/TEST_MAPPING b/core/java/android/app/compat/TEST_MAPPING
new file mode 100644
index 000000000000..c047df514e8d
--- /dev/null
+++ b/core/java/android/app/compat/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "imports": [
+ {
+ "path": "frameworks/base/services/core/java/com/android/services/compat"
+ }
+ ]
+} \ No newline at end of file
diff --git a/services/core/java/com/android/server/compat/TEST_MAPPING b/services/core/java/com/android/server/compat/TEST_MAPPING
new file mode 100644
index 000000000000..0c30c790c5dd
--- /dev/null
+++ b/services/core/java/com/android/server/compat/TEST_MAPPING
@@ -0,0 +1,21 @@
+{
+ "presubmit": [
+ // Unit tests
+ {
+ "name": "FrameworksServicesTests",
+ "options": [
+ {
+ "include-filter": "com.android.server.compat"
+ }
+ ]
+ },
+ // Tests for the TestRule
+ {
+ "name": "PlatformCompatGating"
+ },
+ // CTS tests
+ {
+ "name": "CtsAppCompatHostTestCases#"
+ }
+ ]
+} \ No newline at end of file
diff --git a/tests/PlatformCompatGating/Android.bp b/tests/PlatformCompatGating/Android.bp
index 74dfde848191..342c47de755a 100644
--- a/tests/PlatformCompatGating/Android.bp
+++ b/tests/PlatformCompatGating/Android.bp
@@ -18,6 +18,7 @@ android_test {
name: "PlatformCompatGating",
// Only compile source java files in this apk.
srcs: ["src/**/*.java"],
+ test_suites: ["device-tests"],
static_libs: [
"junit",
"androidx.test.runner",