Update TCK tests to use Arquillian

Author: aguibert

tck/pom.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2020 IBM and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -71,11 +71,15 @@
             <version>1.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.arquillian.junit</groupId>
+            <artifactId>arquillian-junit-container</artifactId>
+            <version>1.6.0.Final</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
-            <scope>compile</scope>
         </dependency>
     </dependencies>
 </project>

tck/src/main/java/jakarta/json/bind/cdi/customizedmapping/adapters/beans.xml

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.json.bind;
+package jakarta.json.bind.tck;
 
 import static org.junit.Assert.fail;
 
@@ -30,6 +30,9 @@
 import java.util.function.BiPredicate;
 import java.util.regex.Pattern;
 
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+
 public class MappingTester<T> {
   private static final String JSON_PATTERN_PREFIX = "\\{\\s*";
 

tck/src/main/java/jakarta/json/bind/cdi/customizedmapping/serializers/beans.xml

@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
-package jakarta.json.bind;
+package jakarta.json.bind.tck;
 
 import org.hamcrest.Description;
 import org.hamcrest.TypeSafeMatcher;

tck/src/main/java/jakarta/json/bind/MappingTester.java renamed to tck/src/main/java/jakarta/json/bind/tck/MappingTester.java

@@ -0,0 +1,57 @@
+package jakarta.json.bind.tck;
+
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.Filter;
+import org.jboss.shrinkwrap.api.Filters;
+import org.jboss.shrinkwrap.api.GenericArchive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ExplodedImporter;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+
+public class ShrinkwrapHelper {
+    
+    public static WebArchive createDefaultWar(Class<?> testClass) {
+        return ShrinkWrap.create(WebArchive.class, testClass.getSimpleName() + ".war")
+                .addPackages(true, testClass.getPackage().getName());
+    }
+    
+//    public static WebArchive buildDefaultApp(String appName, String... packages) throws Exception {
+//        String appArchiveName = appName.endsWith(".war") ? appName : appName + ".war";
+//        WebArchive app = ShrinkWrap.create(WebArchive.class, appArchiveName);
+//        for (String p : packages) {
+//            if (p.endsWith(".*"))
+//                app = app.addPackages(true, p.replace(".*", ""));
+//            else
+//                app = app.addPackages(false, p);
+//        }
+//        String testAppResourcesDir = (appPath == null ? "" : appPath) + "test-applications/" + appName + "/resources/";
+//        if (new File(testAppResourcesDir).exists()) {
+//            app = (WebArchive) addDirectory(app, testAppResourcesDir);
+//        }
+//        return app;
+//    }
+    
+    /**
+     * Recursively adds a folder and all of its contents to an archive.
+     *
+     * @param a The archive to add the files to
+     * @param dir The directory which will be recursively added to the archive.
+     */
+    public static Archive<?> addDirectory(Archive<?> a, String dir) throws Exception {
+        return addDirectory(a, dir, Filters.includeAll());
+    }
+
+    /**
+     * Recursively adds a folder and all of its contents matching a filter to an archive.
+     *
+     * @param a The archive to add the files to
+     * @param dir The directory which will be recursively added to the archive.
+     * @param filter A filter indicating which files should be included in the archive
+     */
+    public static Archive<?> addDirectory(Archive<?> a, String dir, Filter<ArchivePath> filter) throws Exception {
+        return a.merge(ShrinkWrap.create(GenericArchive.class).as(ExplodedImporter.class).importDirectory(dir).as(GenericArchive.class),
+                       "/", filter);
+    }
+
+}

tck/src/main/java/jakarta/json/bind/RegexMatcher.java renamed to tck/src/main/java/jakarta/json/bind/tck/RegexMatcher.java

@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.json.bind;
+package jakarta.json.bind.tck;
 
 import static org.junit.Assert.fail;
 
@@ -26,6 +26,9 @@
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 
+import jakarta.json.bind.Jsonb;
+import jakarta.json.bind.JsonbBuilder;
+
 public class SimpleMappingTester<T> {
   private final Jsonb jsonb = JsonbBuilder.create();
 

tck/src/main/java/jakarta/json/bind/tck/ShrinkwrapHelper.java

@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.json.bind;
+package jakarta.json.bind.tck;
 
 public interface TypeContainer<T> {
   T getInstance();

tck/src/main/java/jakarta/json/bind/SimpleMappingTester.java renamed to tck/src/main/java/jakarta/json/bind/tck/SimpleMappingTester.java

@@ -18,35 +18,47 @@
  * $Id$
  */
 
-package jakarta.json.bind.api.annotation;
+package jakarta.json.bind.tck.api.annotation;
 
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 
-import org.hamcrest.Matcher;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
-import jakarta.json.bind.RegexMatcher;
-import jakarta.json.bind.api.model.SimpleAnnotatedAdaptedContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedDateContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedDoubleContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedNillableContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedNillablePropertyContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedPropertyOrderContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedPropertyVisibilityContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedSerializedArrayContainer;
-import jakarta.json.bind.api.model.SimpleAnnotatedSerializedContainer;
-import jakarta.json.bind.api.model.SimpleContainer;
-import jakarta.json.bind.api.model.SimplePartiallyAnnotatedPropertyOrderContainer;
+import jakarta.json.bind.tck.RegexMatcher;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedAdaptedContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedDateContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedDoubleContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedNillableContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedNillablePropertyContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedPropertyOrderContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedPropertyVisibilityContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedSerializedArrayContainer;
+import jakarta.json.bind.tck.api.model.SimpleAnnotatedSerializedContainer;
+import jakarta.json.bind.tck.api.model.SimpleContainer;
+import jakarta.json.bind.tck.api.model.SimplePartiallyAnnotatedPropertyOrderContainer;
 
 /**
  * @test
  * @sources AnnotationTest.java
  * @executeClass com.sun.ts.tests.jsonb.api.AnnotationTest
  **/
+@RunWith(Arquillian.class)
 public class AnnotationTest {
+    
+    @Deployment
+    public static WebArchive createTestArchive() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addPackages(true, AnnotationTest.class.getPackage().getName());
+    }
+    
   private Jsonb jsonb = JsonbBuilder.create();
 
   /*

tck/src/main/java/jakarta/json/bind/TypeContainer.java renamed to tck/src/main/java/jakarta/json/bind/tck/TypeContainer.java

@@ -18,25 +18,37 @@
  * $Id$
  */
 
-package jakarta.json.bind.api.builder;
+package jakarta.json.bind.tck.api.builder;
 
 import static org.junit.Assert.fail;
 
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import jakarta.json.bind.Jsonb;
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.JsonbConfig;
-import jakarta.json.bind.api.model.SimpleContainer;
 import jakarta.json.bind.spi.JsonbProvider;
+import jakarta.json.bind.tck.api.model.SimpleContainer;
 import jakarta.json.spi.JsonProvider;
 
 /**
  * @test
  * @sources JsonbBuilderTest.java
  * @executeClass com.sun.ts.tests.jsonb.api.JsonbBuilderTest
  **/
+@RunWith(Arquillian.class)
 public class JsonbBuilderTest {
+    
+    @Deployment
+    public static WebArchive createTestArchive() {
+        return ShrinkWrap.create(WebArchive.class)
+                .addPackages(true, JsonbBuilderTest.class.getPackage().getName());
+    }
 
   /*
    * @testName: testBuild