diff options
-rw-r--r-- | TEST_MAPPING | 3 | ||||
-rw-r--r-- | tests/unit/Android.bp | 21 |
2 files changed, 20 insertions, 4 deletions
diff --git a/TEST_MAPPING b/TEST_MAPPING index e5c8117..48370c0 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,6 +2,9 @@ "presubmit": [ { "name": "NetworkStackTests" + }, + { + "name": "NetworkStackNextTests" } ], "postsubmit": [ diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp index 03bcf95..1b67041 100644 --- a/tests/unit/Android.bp +++ b/tests/unit/Android.bp @@ -14,18 +14,16 @@ // limitations under the License. // -android_test { - name: "NetworkStackTests", +java_defaults { + name: "NetworkStackTestsDefaults", certificate: "platform", srcs: ["src/**/*.java", "src/**/*.kt"], - test_suites: ["device-tests"], resource_dirs: ["res"], static_libs: [ "androidx.test.rules", "kotlin-reflect", "mockito-target-extended-minus-junit4", "net-tests-utils", - "NetworkStackApiCurrentLib", "testables", ], libs: [ @@ -42,6 +40,21 @@ android_test { ], } +android_test { + name: "NetworkStackNextTests", + srcs: [], // TODO: tests that only apply to the current, non-stable API can be added here + test_suites: ["device-tests"], + defaults: ["NetworkStackTestsDefaults"], + static_libs: ["NetworkStackApiCurrentLib"], +} + +android_test { + name: "NetworkStackTests", + test_suites: ["device-tests"], + defaults: ["NetworkStackTestsDefaults"], + static_libs: ["NetworkStackApiStableLib"], +} + // Additional dependencies of libnetworkstackutilsjni that are not provided by the system when // running as a test application. // Using java_defaults as jni_libs does not support filegroups. |