Merge svm.test.jdk11 package into svm.test package

Author: Christian Wimmer

substratevm/src/com.oracle.svm.test/src/META-INF/native-image/com.oracle.svm.test/native-image.properties

@@ -1 +1 @@
-Args = --initialize-at-run-time=com.oracle.svm.test --initialize-at-build-time=com.oracle.svm.test.AbstractClassSerializationTest,com.oracle.svm.test.SerializationRegistrationTest --features=com.oracle.svm.test.SerializationRegistrationTestFeature -H:+AllowVMInspection
+Args=--initialize-at-run-time=com.oracle.svm.test --initialize-at-build-time=com.oracle.svm.test.AbstractClassSerializationTest,com.oracle.svm.test.SerializationRegistrationTest --features=com.oracle.svm.test.SerializationRegistrationTestFeature -H:+AllowVMInspection --features=com.oracle.svm.test.AbstractServiceLoaderTest$TestFeature,com.oracle.svm.test.NoProviderConstructorServiceLoaderTest$TestFeature

substratevm/src/com.oracle.svm.test/src/META-INF/native-image/com/oracle/svm/test/jdk11/native-image.properties

@@ -0,0 +1,2 @@
+com.oracle.svm.test.AbstractServiceLoaderTest$ConcreteService
+com.oracle.svm.test.AbstractServiceLoaderTest$AbstractService

substratevm/src/com.oracle.svm.test/src/META-INF/services/com.oracle.svm.test.AbstractServiceLoaderTest$ServiceInterface

@@ -0,0 +1,2 @@
+com.oracle.svm.test.NoProviderConstructorServiceLoaderTest$ProperService
+com.oracle.svm.test.NoProviderConstructorServiceLoaderTest$NoProviderConstructorService

substratevm/src/com.oracle.svm.test/src/META-INF/services/com.oracle.svm.test.NoProviderConstructorServiceLoaderTest$ServiceInterface

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.test.jdk11;
+package com.oracle.svm.test;
 
 import java.util.HashSet;
 import java.util.ServiceConfigurationError;

substratevm/src/com.oracle.svm.test/src/META-INF/services/com.oracle.svm.test.jdk11.AbstractServiceLoaderTest$ServiceInterface

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.test.jdk11;
+package com.oracle.svm.test;
 
 import java.util.HashSet;
 import java.util.ServiceConfigurationError;

substratevm/src/com.oracle.svm.test/src/META-INF/services/com.oracle.svm.test.jdk11.NoProviderConstructorServiceLoaderTest$ServiceInterface

@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package com.oracle.svm.test.jdk11;
+package com.oracle.svm.test;
 
 import java.net.Socket;
 

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jdk11/AbstractServiceLoaderTest.java renamed to substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/AbstractServiceLoaderTest.java

@@ -24,8 +24,12 @@
  */
 package com.oracle.svm.test;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.ServiceLoader;
 
+import javax.tools.JavaCompiler;
+
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 import org.graalvm.nativeimage.hosted.Feature;
@@ -155,4 +159,24 @@ public void test02JDKService() {
 
         Assert.assertTrue(foundZip);
     }
+
+    @Test
+    public void test03JavaCompiler() {
+        ServiceLoader<JavaCompiler> loader = ServiceLoader.load(JavaCompiler.class, ClassLoader.getSystemClassLoader());
+        boolean foundJavacTool = false;
+        List<JavaCompiler> unexpected = new ArrayList<>();
+
+        for (JavaCompiler javaCompiler : loader) {
+            if (javaCompiler.getClass().getName().equals("com.sun.tools.javac.api.JavacTool")) {
+                foundJavacTool = true;
+            } else {
+                unexpected.add(javaCompiler);
+            }
+        }
+
+        if (!unexpected.isEmpty()) {
+            Assert.fail("Found unexpected JavaCompiler providers: " + unexpected);
+        }
+        Assert.assertTrue("Did not find JavacTool", foundJavacTool);
+    }
 }