Skip to content

Commit

Permalink
clean up and merge record tests into main
Browse files Browse the repository at this point in the history
  • Loading branch information
JooHyukKim committed Dec 10, 2024
1 parent 4f4ef5c commit 134774b
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 142 deletions.
1 change: 1 addition & 0 deletions .java-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
temurin64-17.0.8.1
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
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
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
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

This file was deleted.

1 change: 0 additions & 1 deletion pom.xml
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

0 comments on commit 134774b

Please sign in to comment.