Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Data TCK to version 1.0.1 #28705

Merged
merged 4 commits into from
Oct 2, 2024
Merged

Update Data TCK to version 1.0.1 #28705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a997e0
Update Data TCK to version 1.0.1
KyleAure Jun 10, 2024
c546566
https://github.com/jakartaee/data/issues/768
KyleAure Jun 14, 2024
c4a664f
Run with staged TCK https://github.com/jakartaee/data/issues/762
KyleAure Sep 19, 2024
8e4a886
finalize changes
KyleAure Oct 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ...jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataCoreTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ public void launchDataTckCorePersistence() throws Exception {
additionalProps.put("jimage.dir", persistenceServer.getServerSharedPath() + "jimage/output/");
additionalProps.put("tck_protocol", "rest");
additionalProps.put("jakarta.profile", "core");
additionalProps.put("jakarta.tck.database.type", "relational");
additionalProps.put("jakarta.tck.database.name", FATSuite.relationalDatabase.getClass().getSimpleName());

if (FATSuite.shouldRunSignatureTests()) {
additionalProps.put("included.groups", "core & persistence");
Expand All @@ -79,12 +81,12 @@ public void launchDataTckCorePersistence() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckCorePersistence";
Type type = Type.JAKARTA;
String specName = "Data(Core-Persistence)";
String specName = "Data (Core, Persistence)";
String relativeTckRunner = "publish/tckRunner/platform/";
TCKRunner.runTCK(persistenceServer, bucketName, testName, type, specName, null, relativeTckRunner, additionalProps);
}
Expand All @@ -107,6 +109,8 @@ public void launchDataTckCoreNoSQL() throws Exception {
additionalProps.put("jimage.dir", noSQLServer.getServerSharedPath() + "jimage/output/");
additionalProps.put("tck_protocol", "rest");
additionalProps.put("jakarta.profile", "core");
additionalProps.put("jakarta.tck.database.type", "document");
additionalProps.put("jakarta.tck.database.name", FATSuite.noSQLDatabase.getClass().getSimpleName());

if (FATSuite.shouldRunSignatureTests()) {
additionalProps.put("included.groups", "core & nosql");
Expand All @@ -116,12 +120,12 @@ public void launchDataTckCoreNoSQL() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckCoreNoSQL";
Type type = Type.JAKARTA;
String specName = "Data-(Core-NoSQL)";
String specName = "Data (Core, NoSQL)";
String relativeTckRunner = "publish/tckRunner/platform/";
TCKRunner.runTCK(noSQLServer, bucketName, testName, type, specName, null, relativeTckRunner, additionalProps);
}
Expand Down
6 changes: 4 additions & 2 deletions ...jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataFullTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,17 @@ public void launchDataTckFullPersistence() throws Exception {
additionalProps.put("jimage.dir", server.getServerSharedPath() + "jimage/output/");
additionalProps.put("tck_protocol", "servlet");
additionalProps.put("jakarta.profile", "full");
additionalProps.put("jakarta.tck.database.type", "relational");
additionalProps.put("jakarta.tck.database.name", FATSuite.relationalDatabase.getClass().getSimpleName());

//Always skip signature tests on full profile (already tested in core profile)
additionalProps.put("included.groups", "full & persistence & !signature");
additionalProps.put("included.groups", "platform & persistence & !signature");

additionalProps.put("excluded.tests", FATSuite.getExcludedTestByDatabase(DatabaseContainerType.valueOf(FATSuite.relationalDatabase)));

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckFull";
Expand Down
5 changes: 3 additions & 2 deletions ...a.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataStandaloneTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,13 @@ public void launchDataTckStandaloneNoSQL() throws Exception {
Map<String, String> additionalProps = new HashMap<>();
additionalProps.put("jimage.dir", "/jimage/output/");
additionalProps.put("jakarta.profile", "none");

additionalProps.put("jakarta.tck.database.type", "document");
additionalProps.put("jakarta.tck.database.name", FATSuite.noSQLDatabase.getClass().getSimpleName());
additionalProps.put("included.groups", "standalone & nosql");

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckStandaloneNoSQL";
Expand Down
6 changes: 4 additions & 2 deletions ....jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/DataWebTckLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ public void launchDataTckWebPersistence() throws Exception {
additionalProps.put("jimage.dir", server.getServerSharedPath() + "jimage/output/");
additionalProps.put("tck_protocol", "servlet");
additionalProps.put("jakarta.profile", "web");
additionalProps.put("jakarta.tck.database.type", "relational");
additionalProps.put("jakarta.tck.database.name", FATSuite.relationalDatabase.getClass().getSimpleName());

//Always skip signature tests on Web profile (already tested in core profile)
additionalProps.put("included.groups", "web & persistence & !signature");
Expand All @@ -71,12 +73,12 @@ public void launchDataTckWebPersistence() throws Exception {

//Comment out to use SNAPSHOT
additionalProps.put("jakarta.data.groupid", "jakarta.data");
additionalProps.put("jakarta.data.tck.version", "1.0.0-RC1");
additionalProps.put("jakarta.data.tck.version", "1.0.1");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckWeb";
Type type = Type.JAKARTA;
String specName = "Data-(Web-Persistence)";
String specName = "Data (Web, Persistence)";
String relativeTckRunner = "publish/tckRunner/platform/";
TCKRunner.runTCK(server, bucketName, testName, type, specName, null, relativeTckRunner, additionalProps);
}
Expand Down
2 changes: 1 addition & 1 deletion ...penliberty.jakarta.data.1.0_fat_tck/fat/src/io/openliberty/jakarta/data/tck/FATSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public static String getExcludedTestByDatabase(DatabaseContainerType type) {
case DerbyClient:
return ""; // Derby client currently not tested during DB Rotation
case Oracle:
return ""; // All tests pasing on Oracle
return ""; // All tests passing on Oracle
case Postgres:
//TODO testInsertEntityThatAlreadyExists PostgreSQL throws org.postgresql.util.PSQLException which is not a subclass of SQLIntegrityConstraintViolationException
exclude.add("ee.jakarta.tck.data.standalone.persistence.PersistenceEntityTests");
Expand Down
4 changes: 2 additions & 2 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/logging.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ee.jakarta.tck.data.level=ALL

# Arquillian and JNoSQL - By default log everything, might reduce after development is complete.
org.jboss.arquillian.level=ALL
org.eclipse.jnosql=all
org.eclipse.jnosql.level=ALL

#Formatting for the simple formatter
java.util.logging.SimpleFormatter.class.log=true
Expand Down Expand Up @@ -38,4 +38,4 @@ java.util.logging.FileHandler.pattern=DataTCK%g%u.log
java.util.logging.FileHandler.limit = 500000
java.util.logging.FileHandler.count = 5
java.util.logging.FileHandler.formatter=java.util.logging.SimpleFormatter
java.util.logging.FileHandler.level=CONFIG
java.util.logging.FileHandler.level=ALL
35 changes: 8 additions & 27 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,6 @@
<artifactId>tck.runner.platform</artifactId>
<name>Jakarta Data TCK Runner TCK Module</name>

<repositories>
<!-- For artifacts not yet in Maven Central -->
<repository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!-- For artifacts not yet in Stagging repo use DHE -->
<repository>
<name>IBM DHE Maven repository</name>
<id>DHE</id>
<url>https://public.dhe.ibm.com/ibmdl/export/pub/software/olrepo</url>
</repository>
</repositories>

<properties>
<!-- Used in arquillian.xml passed from test suite -->
<wlp>${wlp}</wlp>
Expand Down Expand Up @@ -93,9 +72,9 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0</version>
<version>6.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.servlet.6.0}</systemPath>
<systemPath>${io.openliberty.jakarta.servlet.6.1}</systemPath>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
Expand All @@ -107,9 +86,9 @@
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0</version>
<version>4.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.cdi.4.0}</systemPath>
<systemPath>${io.openliberty.jakarta.cdi.4.1}</systemPath>
</dependency>
<dependency>
<groupId>org.jboss.weld5</groupId>
Expand All @@ -131,7 +110,7 @@

<!-- Test dependency for signature testing -->
<dependency>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
Expand Down Expand Up @@ -193,12 +172,14 @@
<java.util.logging.config.file>${basedir}/../logging.properties</java.util.logging.config.file>
<jimage.dir>${jimage.dir}</jimage.dir>
<jakarta.tck.skip.deployment>false</jakarta.tck.skip.deployment>
<jakarta.tck.database.type>${jakarta.tck.database.type}</jakarta.tck.database.type>
<jakarta.tck.database.name>${jakarta.tck.database.name}</jakarta.tck.database.name>
</systemPropertyVariables>
<excludes>
<exclude>${excluded.tests}</exclude>
</excludes>
<groups>${included.groups}</groups>
<reportNameSuffix>${jakarta.profile}</reportNameSuffix>
<reportNameSuffix>${jakarta.profile}-${jakarta.tck.database.type}</reportNameSuffix>
<testSourceDirectory>${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator}</testSourceDirectory>
</configuration>
</plugin>
Expand Down
8 changes: 5 additions & 3 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/platform/verification.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.1.0-M2</version>
<version>6.1.0</version>
</dependency>
<dependency>
<groupId>jakarta.transaction</groupId>
Expand Down Expand Up @@ -84,7 +84,7 @@

<!-- Test dependency for signature testing -->
<dependency>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
Expand Down Expand Up @@ -146,9 +146,11 @@
<java.util.logging.config.file>${basedir}/../logging.properties</java.util.logging.config.file>
<jimage.dir>${jimage.dir}</jimage.dir>
<jakarta.tck.skip.deployment>false</jakarta.tck.skip.deployment>
<jakarta.tck.database.type>${jakarta.tck.database.type}</jakarta.tck.database.type>
<jakarta.tck.database.name>${jakarta.tck.database.name}</jakarta.tck.database.name>
</systemPropertyVariables>
<groups><![CDATA[persistence & ${jakarta.tck.platform}]]></groups>
<reportNameSuffix>${jakarta.tck.platform}</reportNameSuffix>
<reportNameSuffix>${jakarta.profile}-${jakarta.tck.database.type}</reportNameSuffix>
<testSourceDirectory>${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator}</testSourceDirectory>
</configuration>
</plugin>
Expand Down
6 changes: 3 additions & 3 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@

<!-- Jakarta EE API -->
<jakarta.data.groupid>jakarta.data</jakarta.data.groupid>
<jakarta.data.version>1.0.0-SNAPSHOT</jakarta.data.version>
<jakarta.data.tck.version>1.0.0-SNAPSHOT</jakarta.data.tck.version>
<jakarta.data.version>1.0.1-SNAPSHOT</jakarta.data.version>
<jakarta.data.tck.version>1.0.1-SNAPSHOT</jakarta.data.tck.version>
<jakarta.cdi.version>4.0.1</jakarta.cdi.version>

<!-- JNoSQL Implementation -->
Expand All @@ -43,7 +43,7 @@
<arquillian.version>1.7.0.Final</arquillian.version>
<arquillian.wlp.version>2.1.3</arquillian.wlp.version>
<junit.version>5.10.0</junit.version>
<sigtest.version>1.6</sigtest.version>
<sigtest.version>2.3</sigtest.version>
</properties>

<dependencyManagement>
Expand Down
37 changes: 8 additions & 29 deletions dev/io.openliberty.jakarta.data.1.0_fat_tck/publish/tckRunner/standalone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,6 @@
<artifactId>tck.runner.standalone</artifactId>
<name>Jakarta Data TCK Runner TCK Module</name>

<repositories>
<!-- For artifacts not yet in Maven Central -->
<repository>
<id>sonatype-nexus-staging</id>
<name>Sonatype Nexus Staging</name>
<url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<!-- For artifacts not yet in Stagging repo use DHE -->
<repository>
<name>IBM DHE Maven repository</name>
<id>DHE</id>
<url>https://public.dhe.ibm.com/ibmdl/export/pub/software/olrepo</url>
</repository>
</repositories>

<properties>
<targetDirectory>${project.basedir}/target</targetDirectory>
</properties>
Expand Down Expand Up @@ -74,7 +53,7 @@
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.netbeans.tools</groupId>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${sigtest.version}</version>
</dependency>
Expand All @@ -89,26 +68,24 @@
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
<version>1.2.6</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<version>1.7.0.Alpha13</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0</version>
<version>6.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.servlet.6.0}</systemPath>
<systemPath>${io.openliberty.jakarta.servlet.6.1}</systemPath>
</dependency>
<dependency>
<groupId>jakarta.enterprise</groupId>
<artifactId>jakarta.enterprise.cdi-api</artifactId>
<version>4.0</version>
<version>4.1</version>
<scope>system</scope>
<systemPath>${io.openliberty.jakarta.cdi.4.0}</systemPath>
<systemPath>${io.openliberty.jakarta.cdi.4.1}</systemPath>
</dependency>
</dependencies>

Expand Down Expand Up @@ -153,12 +130,14 @@
<jimage.dir>${jimage.dir}</jimage.dir>
<signature.sigTestClasspath>${project.build.directory}/signaturedirectory/jakarta.data-api.jar:${jimage.dir}/java.base:${jimage.dir}/java.rmi:${jimage.dir}/java.sql:${jimage.dir}/java.naming</signature.sigTestClasspath>
<jakarta.tck.skip.deployment>true</jakarta.tck.skip.deployment>
<jakarta.tck.database.type>${jakarta.tck.database.type}</jakarta.tck.database.type>
<jakarta.tck.database.name>${jakarta.tck.database.name}</jakarta.tck.database.name>
</systemPropertyVariables>
<excludes>
<exclude>${excluded.tests}</exclude>
</excludes>
<groups>${included.groups}</groups>
<reportNameSuffix>${jakarta.profile}</reportNameSuffix>
<reportNameSuffix>${jakarta.profile}-${jakarta.tck.database.type}</reportNameSuffix>
<testSourceDirectory>${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator}</testSourceDirectory>
</configuration>
</plugin>
Expand Down