Skip to content

Address ee.jakarta.tck.persistence.core.annotations.version.Client* failures by allowing null to be used for initial version field/property value #2187

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

Merged
scottmarlow merged 1 commit into from
Apr 11, 2025
Merged

Address ee.jakarta.tck.persistence.core.annotations.version.Client* failures by allowing null to be used for initial version field/property value #2187

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
8 changes: 6 additions & 2 deletions ...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ public void integerFieldTest() throws Exception {
getEntityTransaction().commit();
Integer_Field a1 = getEntityManager().find(Integer_Field.class, "3");
if (a1 != null) {
if (a1.getVersion() > version) {
if (a1.getVersion() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getVersion() > version) {
logTrace( "version:" + a1.getVersion());
pass = true;
} else {
Expand Down Expand Up @@ -223,7 +225,9 @@ public void integerPropertyTest() throws Exception {
getEntityTransaction().commit();
Integer_Property a1 = getEntityManager().find(Integer_Property.class, "4");
if (a1 != null) {
if (a1.getBasicInteger() > version) {
if (a1.getBasicInteger() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getBasicInteger() > version) {
logTrace( "version:" + a1.getBasicInteger());
pass = true;
} else {
Expand Down
9 changes: 7 additions & 2 deletions ...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ public void shortClassFieldTest() throws Exception {
ShortClass_Field a1 = getEntityManager().find(ShortClass_Field.class, "3");
log.info("shortFieldTest, a1="+a1);
if (a1 != null) {
if (a1.getVersion() > version) {
if (a1.getVersion() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getVersion() > version) {
logTrace( "version:" + a1.getVersion());
pass = true;
} else {
Expand Down Expand Up @@ -230,7 +232,10 @@ public void shortClassPropertyTest() throws Exception {
getEntityTransaction().commit();
ShortClass_Property a1 = getEntityManager().find(ShortClass_Property.class, "4");
if (a1 != null) {
if (a1.getBasicShort() > version) {
if (a1.getBasicShort() == null) {
logErr("version is null for updated entity");
}
else if (version == null || a1.getBasicShort() > version) {
logTrace( "version:" + a1.getBasicShort());
pass = true;
} else {
Expand Down
8 changes: 6 additions & 2 deletions ...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ public void longClassFieldTest() throws Exception {
getEntityTransaction().commit();
LongClass_Field a1 = getEntityManager().find(LongClass_Field.class, "3");
if (a1 != null) {
if (a1.getVersion() > version) {
if (a1.getVersion() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getVersion() > version) {
logTrace( "version:" + a1.getVersion());
pass = true;
} else {
Expand Down Expand Up @@ -221,7 +223,9 @@ public void longClassPropertyTest() throws Exception {
getEntityTransaction().commit();
LongClass_Property a1 = getEntityManager().find(LongClass_Property.class, "4");
if (a1 != null) {
if (a1.getBasicLong() > version) {
if (a1.getBasicLong() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getBasicLong() > version) {
logTrace( "version:" + a1.getBasicLong());
pass = true;
} else {
Expand Down
8 changes: 6 additions & 2 deletions ...spec-tests/src/main/java/ee/jakarta/tck/persistence/core/annotations/version/Client4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ public void timestampFieldTest() throws Exception {
getEntityTransaction().commit();
Timestamp_Field a1 = getEntityManager().find(Timestamp_Field.class, "1");
if (a1 != null) {
if (a1.getVersion().after(version)) {
if (a1.getVersion() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getVersion().after(version)) {
logTrace( "version:" + a1.getVersion());
pass = true;
} else {
Expand Down Expand Up @@ -134,7 +136,9 @@ public void timestampPropertyTest() throws Exception {
getEntityTransaction().commit();
Timestamp_Property a1 = getEntityManager().find(Timestamp_Property.class, "2");
if (a1 != null) {
if (a1.getBasicTimestamp().after(version)) {
if (a1.getBasicTimestamp() == null) {
logErr("version is null for updated entity");
} else if (version == null || a1.getBasicTimestamp().after(version)) {
logTrace( "version:" + a1.getBasicTimestamp());
pass = true;
} else {
Expand Down