signature test migration from jakartaee-tck repo.

Signed-off-by: gurunandan.rao@oracle.com <gurunandan.rao@oracle.com>
jakartaee · Dec 6, 2021 · 523c996 · 523c996
1 parent 1d5a2a5
commit 523c996
Show file tree

Hide file tree

Showing 26 changed files with 4,404 additions and 17 deletions.
diff --git a/impl-tck/pom.xml b/impl-tck/pom.xml
@@ -24,7 +24,7 @@
 
     <groupId>org.eclipse.jsonp</groupId>
     <artifactId>jakarta.json-tck</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -33,9 +33,9 @@
     </modules>
 
     <properties>
-        <jsonp-api.version>2.0.1-SNAPSHOT</jsonp-api.version>
+        <jsonp-api.version>2.1.0-SNAPSHOT</jsonp-api.version>
         <jsonp-impl.version>1.0.1-SNAPSHOT</jsonp-impl.version>
-        <jsonp-tck.version>2.0.0-SNAPSHOT</jsonp-tck.version>
+        <jsonp-tck.version>2.1.0-SNAPSHOT</jsonp-tck.version>
     </properties>
 
     <dependencies>

diff --git a/impl-tck/tck-tests-plugability/pom.xml b/impl-tck/tck-tests-plugability/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.eclipse.jsonp</groupId>
         <artifactId>jakarta.json-tck</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.json-tck-tests-plugability</artifactId>

diff --git a/impl-tck/tck-tests/pom.xml b/impl-tck/tck-tests/pom.xml
@@ -25,11 +25,15 @@
     <parent>
         <groupId>org.eclipse.jsonp</groupId>
         <artifactId>jakarta.json-tck</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.json-tck-tests</artifactId>
 
+    <properties>
+        <jakarta.json.version>2.1.0-SNAPSHOT</jakarta.json.version>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>jakarta.json</groupId>
@@ -43,10 +47,86 @@
             <version>${jsonp-tck.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.netbeans.tools</groupId>
+            <artifactId>sigtest-maven-plugin</artifactId>
+            <version>1.4</version>
+        </dependency>
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-jsonp-tck-signature-files</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                        <artifactItems>
+                            <artifactItem>
+                                <groupId>jakarta.json</groupId>
+                                <artifactId>jakarta.json-tck-tests</artifactId>
+                                <version>${jsonp-tck.version}</version>
+                                <type>jar</type>
+                                <overWrite>true</overWrite>
+                            </artifactItem>
+                      </artifactItems>
+                      <!-- We need the signature file, mapping file and package list file -->
+                      <includes>**/*sig-test*,**/*jakarta.json.sig_*,**/*sig-test-pkg-list.txt</includes>
+                      <outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory>
+                      </configuration>
+                    </execution>
+                </executions>
+            </plugin> 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                  <execution>
+                    <id>copy</id>
+                    <phase>generate-test-sources</phase>
+                    <goals>
+                        <goal>copy</goal>
+                    </goals>
+                    <configuration>
+                      <artifactItems>
+                           <artifactItem>
+                              <groupId>jakarta.json</groupId>
+                              <artifactId>jakarta.json-api</artifactId>
+                              <version>${jakarta.json.version}</version>
+                              <type>jar</type>
+                              <overWrite>true</overWrite>
+                              <outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory>
+                              <destFileName>jakarta.json-api.jar</destFileName>
+                          </artifactItem>
+                      </artifactItems>
+                    </configuration>
+                  </execution>
+                </executions>
+            </plugin> 
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M4</version>
+                <configuration>
+                  <trimStackTrace>false</trimStackTrace>
+                  <failIfNoTests>true</failIfNoTests>
+                    <dependenciesToScan>jakarta.json:jakarta.json-tck-tests</dependenciesToScan>
+                    <systemPropertyVariables>
+                        <jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
+                        <signature.mapfile>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest/sig-test.map</signature.mapfile>
+                        <signature.repositoryDir>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest</signature.repositoryDir>
+                        <signature.packagelist>${project.build.directory}/signaturedirectory/jakarta/jsonp/tck/signaturetest/sig-test-pkg-list.txt</signature.packagelist>
+                        <signature.sigTestClasspath>${project.build.directory}/signaturedirectory/jakarta.json-api.jar:${project.build.directory}/jdk11-bundle/java.base:${project.build.directory}/jdk11-bundle/java.rmi:${project.build.directory}/jdk11-bundle/java.sql:${project.build.directory}/jdk11-bundle/java.naming</signature.sigTestClasspath>
+                    </systemPropertyVariables>
+                  </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M4</version>

diff --git a/tck/pom.xml b/tck/pom.xml
@@ -27,7 +27,7 @@
 
     <groupId>jakarta.json</groupId>
     <artifactId>jakarta.json-tck</artifactId>
-    <version>2.0.0-SNAPSHOT</version>
+    <version>2.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -54,8 +54,8 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
         <junit.jupiter.version>5.7.2</junit.jupiter.version>
         <arquillian.junit5.version>1.7.0.Alpha5</arquillian.junit5.version>
     </properties>
@@ -64,7 +64,7 @@
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-api</artifactId>
-            <version>2.0.1-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/tck/tck-common/pom.xml b/tck/tck-common/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) 2021 Oracle 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
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.json</groupId>
         <artifactId>jakarta.json-tck</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.json-tck-common</artifactId>

diff --git a/tck/tck-tests-plugability/pom.xml b/tck/tck-tests-plugability/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) 2021 Oracle 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
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.json</groupId>
         <artifactId>jakarta.json-tck</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.json-tck-tests-plugability</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-tck-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/tck/tck-tests/pom.xml b/tck/tck-tests/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>jakarta.json</groupId>
         <artifactId>jakarta.json-tck</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>jakarta.json-tck-tests</artifactId>
@@ -32,7 +32,7 @@
         <dependency>
             <groupId>jakarta.json</groupId>
             <artifactId>jakarta.json-tck-common</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>2.1.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/tck/tck-tests/src/main/java/jakarta/jsonp/tck/api/provider/JsonProviderTest.java b/tck/tck-tests/src/main/java/jakarta/jsonp/tck/api/provider/JsonProviderTest.java
@@ -43,13 +43,16 @@
  *
  */
 public class JsonProviderTest {
+
+    private static final String JSONP_PROVIDER_FACTORY = "jakarta.json.provider";
+
 
     /**
      * Verifies it is possible to obtain the JsonProvider implementation from a System property.
      */
     @Test
     public void systemProperty() {
-        System.setProperty(JsonProvider.JSONP_PROVIDER_FACTORY, DummyJsonProvider.class.getName());
+        System.setProperty(JSONP_PROVIDER_FACTORY, DummyJsonProvider.class.getName());
         JsonProvider provider = JsonProvider.provider();
         assertEquals(DummyJsonProvider.class, provider.getClass());
     }