Skip to content

Commit 2c4ef80

Browse files
lukasjlukasj
committed
remove unneded arquillian from tck,
fix up number of tests in the release notes, fix up tck test run configs Signed-off-by: Lukas Jungmann <[email protected]>
1 parent 593d432 commit 2c4ef80

File tree

6 files changed

+56
-105
lines changed

6 files changed

+56
-105
lines changed

‎impl-tck/pom.xml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,31 +39,27 @@
3939
</properties>
4040

4141
<dependencies>
42-
<!-- FIX ME: this API hides the one included in the jakarta.json artifact -->
42+
<!-- this API hides the one used by the implementation -->
4343
<!-- <dependency>
4444
<groupId>jakarta.json</groupId>
4545
<artifactId>jakarta.json-api</artifactId>
4646
<version>${jsonp-api.version}</version>
4747
<scope>test</scope>
4848
</dependency>-->
49+
<!-- this is implementation only -->
4950
<dependency>
5051
<groupId>org.eclipse.parsson</groupId>
5152
<artifactId>parsson</artifactId>
5253
<version>${jsonp-impl.version}</version>
5354
<scope>test</scope>
5455
</dependency>
55-
<dependency>
56-
<groupId>org.jboss.arquillian.container</groupId>
57-
<artifactId>arquillian-weld-embedded</artifactId>
58-
<version>2.1.0.Final</version>
59-
<scope>test</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.jboss.weld.se</groupId>
63-
<artifactId>weld-se</artifactId>
64-
<version>2.4.8.Final</version>
65-
<scope>test</scope>
66-
</dependency>
56+
<!-- this is API+Impl bundle -->
57+
<!-- <dependency>-->
58+
<!-- <groupId>org.eclipse.parsson</groupId>-->
59+
<!-- <artifactId>jakarta.json</artifactId>-->
60+
<!-- <version>${jsonp-impl.version}</version>-->
61+
<!-- <scope>test</scope>-->
62+
<!-- </dependency>-->
6763
</dependencies>
6864

6965
</project>

‎impl-tck/tck-tests-pluggability/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
</dependenciesToScan>
5757
<trimStackTrace>false</trimStackTrace>
5858
<failIfNoTests>true</failIfNoTests>
59-
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
6059
</configuration>
6160
</plugin>
6261
</plugins>

‎impl-tck/tck-tests/pom.xml

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030

3131
<artifactId>jakarta.json-tck-tests</artifactId>
3232

33-
<properties>
34-
<jakarta.json.version>2.1.0-SNAPSHOT</jakarta.json.version>
35-
</properties>
36-
3733
<dependencies>
3834
<dependency>
3935
<groupId>jakarta.json</groupId>
@@ -72,7 +68,7 @@
7268
<artifactItem>
7369
<groupId>jakarta.json</groupId>
7470
<artifactId>jakarta.json-api</artifactId>
75-
<version>${jakarta.json.version}</version>
71+
<version>${jsonp-api.version}</version>
7672
<type>jar</type>
7773
<overWrite>true</overWrite>
7874
<outputDirectory>${project.build.directory}/signaturedirectory</outputDirectory>
@@ -83,19 +79,6 @@
8379
</execution>
8480
</executions>
8581
</plugin>
86-
<plugin>
87-
<artifactId>maven-surefire-plugin</artifactId>
88-
<version>3.0.0-M4</version>
89-
<configuration>
90-
<trimStackTrace>false</trimStackTrace>
91-
<failIfNoTests>true</failIfNoTests>
92-
<dependenciesToScan>jakarta.json:jakarta.json-tck-tests</dependenciesToScan>
93-
<systemPropertyVariables>
94-
<jimage.dir>${project.build.directory}/jdk11-bundle</jimage.dir>
95-
<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>
96-
</systemPropertyVariables>
97-
</configuration>
98-
</plugin>
9982
<plugin>
10083
<artifactId>maven-surefire-plugin</artifactId>
10184
<version>3.0.0-M4</version>
@@ -105,13 +88,15 @@
10588
</dependenciesToScan>
10689
<trimStackTrace>false</trimStackTrace>
10790
<failIfNoTests>true</failIfNoTests>
108-
<argLine>--add-opens java.base/java.lang=ALL-UNNAMED</argLine>
10991
<forkCount>1</forkCount>
11092
<reuseForks>false</reuseForks>
11193
</configuration>
11294
<executions>
11395
<execution>
11496
<id>sigtests</id>
97+
<goals>
98+
<goal>test</goal>
99+
</goals>
115100
<configuration>
116101
<includes>
117102
<include>**/JSONPSigTest.java</include>
@@ -127,21 +112,9 @@
127112
<configuration>
128113
<excludes>
129114
<exclude>**/JSONPSigTest.java</exclude>
130-
<exclude>**/JsonProviderTest.java</exclude>
131115
</excludes>
132116
</configuration>
133117
</execution>
134-
<execution>
135-
<id>providertests</id>
136-
<configuration>
137-
<includes>
138-
<include>**/JsonProviderTest.java</include>
139-
</includes>
140-
<systemPropertyVariables>
141-
<jakarta.json.provider>jakarta.jsonp.tck.api.provider.JsonProviderTest.DummyJsonProvider</jakarta.json.provider>
142-
</systemPropertyVariables>
143-
</configuration>
144-
</execution>
145118
</executions>
146119
</plugin>
147120
</plugins>

‎tck/pom.xml

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
<maven.compiler.target>11</maven.compiler.target>
6161
<maven.compiler.source>11</maven.compiler.source>
6262
<junit.jupiter.version>5.7.2</junit.jupiter.version>
63-
<arquillian.junit5.version>1.7.0.Alpha5</arquillian.junit5.version>
63+
64+
<jakarta.json-api.version>2.1.0</jakarta.json-api.version>
6465
</properties>
6566

6667
<dependencyManagement>
@@ -79,12 +80,7 @@
7980
<dependency>
8081
<groupId>jakarta.json</groupId>
8182
<artifactId>jakarta.json-api</artifactId>
82-
<version>2.1.0-SNAPSHOT</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>jakarta.inject</groupId>
86-
<artifactId>jakarta.inject-api</artifactId>
87-
<version>1.0</version>
83+
<version>${jakarta.json-api.version}</version>
8884
</dependency>
8985
<dependency>
9086
<groupId>org.junit.jupiter</groupId>
@@ -96,11 +92,6 @@
9692
<artifactId>junit-jupiter-engine</artifactId>
9793
<version>${junit.jupiter.version}</version>
9894
</dependency>
99-
<dependency>
100-
<groupId>org.jboss.arquillian.junit5</groupId>
101-
<artifactId>arquillian-junit5-container</artifactId>
102-
<version>${arquillian.junit5.version}</version>
103-
</dependency>
10495
</dependencies>
10596
</dependencyManagement>
10697

@@ -110,11 +101,6 @@
110101
<artifactId>jakarta.json-api</artifactId>
111102
<scope>provided</scope>
112103
</dependency>
113-
<dependency>
114-
<groupId>jakarta.inject</groupId>
115-
<artifactId>jakarta.inject-api</artifactId>
116-
<scope>provided</scope>
117-
</dependency>
118104
<dependency>
119105
<groupId>org.junit.jupiter</groupId>
120106
<artifactId>junit-jupiter-api</artifactId>
@@ -123,10 +109,6 @@
123109
<groupId>org.junit.jupiter</groupId>
124110
<artifactId>junit-jupiter-engine</artifactId>
125111
</dependency>
126-
<dependency>
127-
<groupId>org.jboss.arquillian.junit5</groupId>
128-
<artifactId>arquillian-junit5-container</artifactId>
129-
</dependency>
130112
</dependencies>
131113

132114
<build>

‎tck/tck-docs/JSONP2.1-ReleaseNotes.html

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,35 +50,37 @@ <h2><a name="kit_contents">Kit Contents</a></h2>
5050
<li>
5151
<p><strong>Jakarta EE JSON Processing TCK tests signature, API, and
5252
pluggability tests:</strong></p>
53-
</li>
54-
<ul type="square">
55-
<li>
56-
<p>A <strong>signature test</strong> that checks that all of the
53+
<ul type="square">
54+
<li>
55+
<p>A <strong>signature test</strong> that checks that all of the
5756
public APIs are supported in the Jakarta EE JSON Processing Version
5857
2.1 implementation that is being tested</p>
59-
</li>
60-
<li>
61-
<p><strong>API tests</strong> for all of the public APIs under the <code>jakarta.json</code>,
58+
</li>
59+
<li>
60+
<p><strong>API tests</strong> for all of the public APIs under the <code>jakarta.json</code>,
6261
<code>jakarta.json.spi</code>, <code>jakarta.json.stream</code>
6362
package</p>
64-
</li>
65-
<li>
63+
</li>
64+
<li>
6665
<p><strong>Pluggability tests</strong> for testing the SPI provider
6766
interface for supplying your own JsonProvider</p>
68-
</li>
69-
</ul>
67+
</li>
68+
</ul>
69+
</li>
7070
</ul>
7171
<hr>
7272
<h2>Jakarta EE JSON Processing TCK Facts</h2>
7373
<blockquote>
7474
<p>The test suite bundle contains the following:</p>
7575
<ul>
76-
<li>187 total tests</li>
76+
<li>1 signature test</li>
77+
<li>178 API tests</li>
78+
<li>18 pluggability tests</li>
7779
</ul>
7880
</blockquote>
7981
<hr>
8082
<h2><a name="platform">Platform Notes</a></h2>
81-
<p>The Jakarta EE JSON Processing TCK tests have been built with JDK 11
83+
<p>The Jakarta EE JSON Processing TCK tests have been built with JDK 11
8284
and tested with Java<font size="-2"><sup>TM</sup></font> Platform,
8385
Standard Edition 11+</p>
8486
<p>The Jakarta EE JSON Processing TCK tests have been run on the following

‎tck/tck-tests-pluggability/src/main/java/jakarta/jsonp/tck/pluggability/jsonprovidertests/ClientTests.java

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,47 @@
1919
*/
2020
package jakarta.jsonp.tck.pluggability.jsonprovidertests;
2121

22-
import jakarta.json.*;
22+
import jakarta.json.Json;
23+
import jakarta.json.JsonArrayBuilder;
24+
import jakarta.json.JsonBuilderFactory;
25+
import jakarta.json.JsonException;
26+
import jakarta.json.JsonObjectBuilder;
27+
import jakarta.json.JsonReader;
28+
import jakarta.json.JsonReaderFactory;
29+
import jakarta.json.JsonWriter;
30+
import jakarta.json.JsonWriterFactory;
2331
import jakarta.json.spi.JsonProvider;
24-
import jakarta.json.stream.*;
25-
26-
import java.io.*;
27-
28-
import java.util.ServiceLoader;
29-
30-
import java.util.List;
31-
import java.util.Iterator;
32-
import java.util.ArrayList;
33-
import java.util.HashMap;
34-
import java.util.logging.Logger;
35-
32+
import jakarta.json.stream.JsonGenerator;
33+
import jakarta.json.stream.JsonGeneratorFactory;
34+
import jakarta.json.stream.JsonParser;
35+
import jakarta.json.stream.JsonParserFactory;
3636
import jakarta.jsonp.tck.common.JSONP_Util;
37-
import jakarta.jsonp.tck.provider.MyJsonProvider;
3837
import jakarta.jsonp.tck.provider.MyJsonGenerator;
39-
import org.jboss.arquillian.container.test.api.Deployment;
40-
import org.jboss.arquillian.junit5.ArquillianExtension;
41-
import org.jboss.shrinkwrap.api.ShrinkWrap;
42-
import org.jboss.shrinkwrap.api.spec.WebArchive;
38+
import jakarta.jsonp.tck.provider.MyJsonProvider;
4339
import org.junit.jupiter.api.AfterEach;
4440
import org.junit.jupiter.api.Test;
45-
import org.junit.jupiter.api.extension.ExtendWith;
41+
42+
import java.io.ByteArrayOutputStream;
43+
import java.io.InputStream;
44+
import java.io.StringReader;
45+
import java.io.StringWriter;
46+
import java.util.ArrayList;
47+
import java.util.HashMap;
48+
import java.util.Iterator;
49+
import java.util.List;
50+
import java.util.ServiceLoader;
51+
import java.util.logging.Logger;
4652

4753
import static org.junit.jupiter.api.Assertions.assertTrue;
4854
import static org.junit.jupiter.api.Assertions.fail;
4955

50-
@ExtendWith(ArquillianExtension.class)
5156
public class ClientTests {
5257

5358
private static final String MY_JSONPROVIDER_CLASS = "jakarta.jsonp.tck.provider.MyJsonProvider";
5459
private static final Logger LOGGER = Logger.getLogger(ClientTests.class.getName());
5560

5661
private String providerPath = null;
5762

58-
@Deployment
59-
public static WebArchive createTestArchive() {
60-
return ShrinkWrap.create(WebArchive.class)
61-
.addPackages(true, ClientTests.class.getPackage().getName());
62-
}
63-
6463
@AfterEach
6564
public void after() {
6665
MyJsonProvider.clearCalls();

0 commit comments

Comments
 (0)