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 Jakarta Data for M4 #27985

Merged
merged 1 commit into from
Mar 25, 2024
+6 −11
Merged

Update Jakarta Data for M4 #27985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 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 @@ -55,7 +55,6 @@ public void tearDown() throws Exception {
}

@Test
@Ignore("Behavior change in spec after M3 caused failures") // TODO re-enable with M4 or RC1
@AllowedFFDC // The tested exceptions cause FFDC so we have to allow for this.
public void launchDataTckCorePersistence() throws Exception {

Expand All @@ -75,7 +74,7 @@ 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-M3");
additionalProps.put("jakarta.data.tck.version", "1.0.0-M4");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckCorePersistence";
Expand Down Expand Up @@ -108,8 +107,8 @@ public void launchDataTckCoreNoSQL() throws Exception {
additionalProps.put("included.groups", "core & nosql & !signature");

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

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckCoreNoSQL";
Expand Down
4 changes: 1 addition & 3 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 @@ -17,7 +17,6 @@

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand Down Expand Up @@ -59,7 +58,6 @@ public static void tearDown() throws Exception {
* Run the TCK (controlled by autoFVT/publish/tckRunner/tck/*)
*/
@Test
@Ignore("Behavior change in spec after M3 caused failures") // TODO re-enable with M4 or RC1
@AllowedFFDC // The tested exceptions cause FFDC so we have to allow for this.
public void launchDataTckFullPersistence() throws Exception {
// Test groups to run
Expand All @@ -73,7 +71,7 @@ public void launchDataTckFullPersistence() throws Exception {

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

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckFull";
Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -59,7 +59,7 @@ public void launchDataTckStandaloneNoSQL() throws Exception {

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

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckStandaloneNoSQL";
Expand Down
4 changes: 1 addition & 3 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 @@ -17,7 +17,6 @@

import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;

Expand Down Expand Up @@ -57,7 +56,6 @@ public static void tearDown() throws Exception {
* Run the TCK (controlled by autoFVT/publish/tckRunner/tck/*)
*/
@Test
@Ignore("Behavior change in spec after M3 caused failures") // TODO re-enable with M4 or RC1
@AllowedFFDC // The tested exceptions cause FFDC so we have to allow for this.
public void launchDataTckWebPersistence() throws Exception {
// Test groups to run
Expand All @@ -71,7 +69,7 @@ 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-M3");
additionalProps.put("jakarta.data.tck.version", "1.0.0-M4");

String bucketName = "io.openliberty.jakarta.data.1.0_fat_tck";
String testName = this.getClass() + ":launchDataTckWeb";
Expand Down