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

Remove jdk17 test sources post databind#4820 #179

Merged
merged 2 commits into from
Dec 12, 2024
+13 −142
Merged

Remove jdk17 test sources post databind#4820 #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
134774b
clean up and merge record tests into main
JooHyukKim Dec 10, 2024
cd0faee
Delete .java-version
JooHyukKim Dec 11, 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
7 changes: 3 additions & 4 deletions .../test-jdk17/java/jr/Java17RecordTest.java → ...ackson/jr/ob/record/Java17RecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package jr;
package tools.jackson.jr.ob.record;

import java.util.Map;

import junit.framework.TestCase;

import tools.jackson.jr.ob.JSON;
import tools.jackson.jr.ob.TestBase;

/**
* This test is in test module since the JDK version to be tested is higher than other, and hence supports Records.
*/
public class Java17RecordTest extends TestCase
public class Java17RecordTest extends TestBase
{
private final JSON jsonHandler = JSON.std;

Expand Down
7 changes: 3 additions & 4 deletions ...est-jdk17/java/jr/RecordDeser167Test.java → ...kson/jr/ob/record/RecordDeser167Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package jr;
package tools.jackson.jr.ob.record;

import tools.jackson.jr.ob.JSON;
import tools.jackson.jr.ob.TestBase;

import junit.framework.TestCase;

public class RecordDeser167Test extends TestCase
public class RecordDeser167Test extends TestBase
{
record FoundDependency(String id, String g, String a, String v, String timestamp) {}

Expand Down
7 changes: 3 additions & 4 deletions ...est-jdk17/java/jr/RecordDeser172Test.java → ...kson/jr/ob/record/RecordDeser172Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package jr;
package tools.jackson.jr.ob.record;

import java.time.Instant;
import java.time.ZoneId;

import junit.framework.TestCase;

import tools.jackson.jr.ob.JSON;
import tools.jackson.jr.ob.TestBase;

public class RecordDeser172Test extends TestCase
public class RecordDeser172Test extends TestBase
{
record FoundDependency(String id, String g, String a, String v, long timestamp) {
public String getDateTime() {
Expand Down
10 changes: 4 additions & 6 deletions ...-test/src/test-jdk17/java/jr/Wrapper.java → ...a/tools/jackson/jr/ob/record/Wrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
package jr;

import jr.Java17RecordTest.Cow;
package tools.jackson.jr.ob.record;

import java.util.Objects;

public final class Wrapper {
Cow cow;
Java17RecordTest.Cow cow;
String farmerName;

public Cow getCow() {
public Java17RecordTest.Cow getCow() {
return cow;
}

public void setCow(Cow cow) {
public void setCow(Java17RecordTest.Cow cow) {
this.cow = cow;
}

Expand Down
123 changes: 0 additions & 123 deletions jr-record-test/pom.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<module>jr-stree</module>
<module>jr-annotation-support</module>
<module>jr-extension-javatime</module>
<module>jr-record-test</module>
<module>jr-groovy-test</module>
<module>jr-all</module>
</modules>
Expand Down