Merge "Add TEST_MAPPING"

am: ed8cbcca55 Change-Id: Ic1c6a713fc626e4dacb540103528868733af723f
2019-12-06 12:21:39 -08:00
parent bc68555ae5 ed8cbcca55
commit e6ef4c306d
3 changed files with 8 additions and 5 deletions
--- a/apex/sdkext/TEST_MAPPING
+++ b/apex/sdkext/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "framework-sdkext-tests"
+    }
+  ]
+}
--- 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,
 }
--- 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