Add TEST_MAPPINGs for java.lang and java.util and subpackages.

This adds package-level mappings to the appropriate test
packages. There are a few special cases, such as running the JSR166
tests for java.util.concurrent.

Test: treehugger
Bug: 130283485
Change-Id: I0a8494845ee298f6293277fdcc1e6dad120f4e58

19 files changed, 278 insertions, 0 deletions

diff --git a/libart/src/main/java/java/lang/TEST_MAPPING b/libart/src/main/java/java/lang/TEST_MAPPING
new file mode 100644
index 0000000000..06575f3247
--- /dev/null
+++ b/libart/src/main/java/java/lang/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "tests.java.lang"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.lang"
+        },
+        {
+          "include-filter": "libcore.java.lang"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/libart/src/main/java/java/lang/invoke/TEST_MAPPING b/libart/src/main/java/java/lang/invoke/TEST_MAPPING
new file mode 100644
index 0000000000..2b6135dd91
--- /dev/null
+++ b/libart/src/main/java/java/lang/invoke/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.lang.invoke"
+        }
+      ]
+    },
+    {
+      "name": "CtsLibcoreOjTestCases",
+      "options": [
+        {
+          "include-filter": "org.openjdk.tests.java.lang.invoke"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/luni/src/main/java/java/lang/TEST_MAPPING b/luni/src/main/java/java/lang/TEST_MAPPING
new file mode 100644
index 0000000000..9374f92dae
--- /dev/null
+++ b/luni/src/main/java/java/lang/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "libcore/libart/src/main/java/java/lang"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/luni/src/main/java/java/lang/ref/TEST_MAPPING b/luni/src/main/java/java/lang/ref/TEST_MAPPING
new file mode 100644
index 0000000000..0614a12f8b
--- /dev/null
+++ b/luni/src/main/java/java/lang/ref/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.lang.ref"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.lang.ref"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/lambda/java/java/lang/invoke/TEST_MAPPING b/ojluni/src/lambda/java/java/lang/invoke/TEST_MAPPING
new file mode 100644
index 0000000000..e321f0bc55
--- /dev/null
+++ b/ojluni/src/lambda/java/java/lang/invoke/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "libcore/libart/src/main/java/java/lang/invoke"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/lang/TEST_MAPPING b/ojluni/src/main/java/java/lang/TEST_MAPPING
new file mode 100644
index 0000000000..9374f92dae
--- /dev/null
+++ b/ojluni/src/main/java/java/lang/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "libcore/libart/src/main/java/java/lang"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING b/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING
new file mode 100644
index 0000000000..f5f636500f
--- /dev/null
+++ b/ojluni/src/main/java/java/lang/annotation/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.lang.reflect.annotations"
+        },
+        {
+          "include-filter": "libcore.java.lang.annotation"
+        },
+        {
+          "include-filter": "org.apache.harmony.annotation.tests.java.lang.annotation"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/lang/invoke/TEST_MAPPING b/ojluni/src/main/java/java/lang/invoke/TEST_MAPPING
new file mode 100644
index 0000000000..e321f0bc55
--- /dev/null
+++ b/ojluni/src/main/java/java/lang/invoke/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "libcore/libart/src/main/java/java/lang/invoke"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/lang/ref/TEST_MAPPING b/ojluni/src/main/java/java/lang/ref/TEST_MAPPING
new file mode 100644
index 0000000000..c90a051bb3
--- /dev/null
+++ b/ojluni/src/main/java/java/lang/ref/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "imports": [
+    {
+      "path": "libcore/luni/src/main/java/java/lang/ref"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING b/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING
new file mode 100644
index 0000000000..2d13e0a2ee
--- /dev/null
+++ b/ojluni/src/main/java/java/lang/reflect/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.lang.reflect"
+        },
+        {
+          "include-filter": "libcore.java.lang.reflect.annotations"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.lang.reflect"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/TEST_MAPPING b/ojluni/src/main/java/java/util/TEST_MAPPING
new file mode 100644
index 0000000000..e1434fbbda
--- /dev/null
+++ b/ojluni/src/main/java/java/util/TEST_MAPPING
@@ -0,0 +1,26 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.util"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.util"
+        }
+      ]
+    },
+    {
+      "name": "CtsLibcoreOjTestCases",
+      "options": [
+        {
+          "include-filter": "test.java.util"
+        },
+        {
+          "include-filter": "org.openjdk.tests.java.util"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING b/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING
new file mode 100644
index 0000000000..5730a289f9
--- /dev/null
+++ b/ojluni/src/main/java/java/util/concurrent/TEST_MAPPING
@@ -0,0 +1,20 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreJsr166TestCases",
+      "options": [
+        {
+          "include-filter": "jsr166"
+        }
+      ]
+    },
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.util.concurrent"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/function/TEST_MAPPING b/ojluni/src/main/java/java/util/function/TEST_MAPPING
new file mode 100644
index 0000000000..5840cf90c3
--- /dev/null
+++ b/ojluni/src/main/java/java/util/function/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.util.function"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/jar/TEST_MAPPING b/ojluni/src/main/java/java/util/jar/TEST_MAPPING
new file mode 100644
index 0000000000..5b26443fff
--- /dev/null
+++ b/ojluni/src/main/java/java/util/jar/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.util.jar"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.util.jar"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/logging/TEST_MAPPING b/ojluni/src/main/java/java/util/logging/TEST_MAPPING
new file mode 100644
index 0000000000..85f4d2bdf4
--- /dev/null
+++ b/ojluni/src/main/java/java/util/logging/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "org.apache.harmony.logging.tests.java.util.logging"
+        },
+        {
+          "include-filter": "libcore.java.util.logging"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/prefs/TEST_MAPPING b/ojluni/src/main/java/java/util/prefs/TEST_MAPPING
new file mode 100644
index 0000000000..3a3445b65b
--- /dev/null
+++ b/ojluni/src/main/java/java/util/prefs/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "org.apache.harmony.tests.java.util.prefs"
+        },
+        {
+          "include-filter": "libcore.java.util.prefs"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/regex/TEST_MAPPING b/ojluni/src/main/java/java/util/regex/TEST_MAPPING
new file mode 100644
index 0000000000..1bd44e2177
--- /dev/null
+++ b/ojluni/src/main/java/java/util/regex/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "org.apache.harmony.regex.tests.java.util.regex"
+        },
+        {
+          "include-filter": "libcore.java.util.regex"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.util.regex"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/stream/TEST_MAPPING b/ojluni/src/main/java/java/util/stream/TEST_MAPPING
new file mode 100644
index 0000000000..9673e09d52
--- /dev/null
+++ b/ojluni/src/main/java/java/util/stream/TEST_MAPPING
@@ -0,0 +1,18 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreOjTestCases",
+      "options": [
+        {
+          "include-filter": "java.util.stream"
+        },
+        {
+          "include-filter": "org.openjdk.tests.java.util.stream"
+        },
+        {
+          "include-filter": "org.openjdk.testlib.java.util.stream"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/ojluni/src/main/java/java/util/zip/TEST_MAPPING b/ojluni/src/main/java/java/util/zip/TEST_MAPPING
new file mode 100644
index 0000000000..52ac9327ce
--- /dev/null
+++ b/ojluni/src/main/java/java/util/zip/TEST_MAPPING
@@ -0,0 +1,15 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLibcoreTestCases",
+      "options": [
+        {
+          "include-filter": "libcore.java.util.zip"
+        },
+        {
+          "include-filter": "org.apache.harmony.tests.java.util.zip"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file