summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Anton Hansson <hansson@google.com> 2019-12-06 12:21:39 -0800
committer android-build-merger <android-build-merger@google.com> 2019-12-06 12:21:39 -0800
commite6ef4c306d17736dbdcc036c10f3f90cb267717c (patch)
tree478a006ac2b10c777a0addf8d138f2c8d5a4a705
parentbc68555ae54ff9944ec5cf9933bf12583c4381ac (diff)
parented8cbcca551b8030a11648ad9c4f39a2fe83d525 (diff)
Merge "Add TEST_MAPPING"
am: ed8cbcca55 Change-Id: Ic1c6a713fc626e4dacb540103528868733af723f
-rw-r--r--apex/sdkext/TEST_MAPPING7
-rw-r--r--apex/sdkext/framework/tests/Android.bp1
-rw-r--r--apex/sdkext/framework/tests/src/android/os/ext/SdkExtensionsTest.java5
3 files changed, 8 insertions, 5 deletions
diff --git a/apex/sdkext/TEST_MAPPING b/apex/sdkext/TEST_MAPPING
new file mode 100644
index 000000000000..8dc732d36c79
--- /dev/null
+++ b/apex/sdkext/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "framework-sdkext-tests"
+ }
+ ]
+}
diff --git a/apex/sdkext/framework/tests/Android.bp b/apex/sdkext/framework/tests/Android.bp
index 3d5dbb3d8a2d..ab6327582efd 100644
--- a/apex/sdkext/framework/tests/Android.bp
+++ b/apex/sdkext/framework/tests/Android.bp
@@ -6,5 +6,6 @@ android_test {
"android.test.runner",
],
static_libs: [ "framework-sdkext" ],
+ test_suites: [ "general-tests" ],
platform_apis: true,
}
diff --git a/apex/sdkext/framework/tests/src/android/os/ext/SdkExtensionsTest.java b/apex/sdkext/framework/tests/src/android/os/ext/SdkExtensionsTest.java
index 688511096a43..d7dca90e0b8f 100644
--- a/apex/sdkext/framework/tests/src/android/os/ext/SdkExtensionsTest.java
+++ b/apex/sdkext/framework/tests/src/android/os/ext/SdkExtensionsTest.java
@@ -29,11 +29,6 @@ public class SdkExtensionsTest extends TestCase {
SdkExtensions.getExtensionVersion(Build.VERSION_CODES.Q);
fail("expected IllegalArgumentException");
} catch (IllegalArgumentException expected) { }
-
- try {
- SdkExtensions.getExtensionVersion(999999);
- fail("expected IllegalArgumentException");
- } catch (IllegalArgumentException expected) { }
}
@SmallTest