Updated tests to use jakarta Signed-off-by: Jonathan Coustick <jonathan.coustick@payara.fish>
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java index 17b516b..fdbfd0e 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonArrayTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase; -import javax.json.*; +import jakarta.json.*; import java.io.StringReader; import java.io.StringWriter; import java.util.List; @@ -119,7 +119,7 @@ assertTrue(array1.hashCode() == array2.hashCode()); JsonArray array3 = Json.createArrayBuilder().build(); //org.glassfish.json.JsonArrayBuilderImpl.JsonArrayImpl - JsonArray array4 = JsonValue.EMPTY_JSON_ARRAY; //javax.json.EmptyArray + JsonArray array4 = JsonValue.EMPTY_JSON_ARRAY; //jakarta.json.EmptyArray assertTrue(array3.equals(array4)); assertTrue(array3.hashCode() == array4.hashCode()); //equal instances have same hashCode
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java index 0ca9655..e04a9a6 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderFactoryTest.java
@@ -17,11 +17,11 @@ package org.glassfish.json.tests; import java.util.Map; -import javax.json.Json; -import javax.json.JsonArrayBuilder; -import javax.json.JsonBuilderFactory; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; +import jakarta.json.Json; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonBuilderFactory; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; import org.junit.Assert; import org.junit.Test;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java index 3263bcf..8809574 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonBuilderTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase; -import javax.json.*; +import jakarta.json.*; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java index 0885547..df255ab 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonCollectorTest.java
@@ -19,12 +19,12 @@ import org.junit.BeforeClass; import org.junit.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonPatchBuilder; -import javax.json.JsonValue; -import javax.json.stream.JsonCollectors; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonPatchBuilder; +import jakarta.json.JsonValue; +import jakarta.json.stream.JsonCollectors; import org.glassfish.json.JsonUtil; import static org.junit.Assert.assertEquals;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java index a3141ab..f047750 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonFieldTest.java
@@ -18,13 +18,13 @@ import junit.framework.TestCase; -import javax.json.Json; -import javax.json.JsonBuilderFactory; -import javax.json.JsonObject; -import javax.json.JsonObjectBuilder; -import javax.json.JsonValue; -import javax.json.stream.JsonGenerationException; -import javax.json.stream.JsonGenerator; +import jakarta.json.Json; +import jakarta.json.JsonBuilderFactory; +import jakarta.json.JsonObject; +import jakarta.json.JsonObjectBuilder; +import jakarta.json.JsonValue; +import jakarta.json.stream.JsonGenerationException; +import jakarta.json.stream.JsonGenerator; import java.io.StringWriter; import java.math.BigDecimal; import java.math.BigInteger;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java index de8b8a1..bba031a 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorFactoryTest.java
@@ -18,9 +18,9 @@ import junit.framework.TestCase; -import javax.json.*; -import javax.json.stream.JsonGenerator; -import javax.json.stream.JsonGeneratorFactory; +import jakarta.json.*; +import jakarta.json.stream.JsonGenerator; +import jakarta.json.stream.JsonGeneratorFactory; import java.io.StringWriter; import java.util.HashMap; import java.util.Map;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java index 932c4b0..227608d 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonGeneratorTest.java
@@ -19,8 +19,8 @@ import junit.framework.TestCase; import org.glassfish.json.api.BufferPool; -import javax.json.*; -import javax.json.stream.*; +import jakarta.json.*; +import jakarta.json.stream.*; import java.io.*; import java.util.HashMap; import java.util.Map;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java index 2ea6a0b..4fed520 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchDiffTest.java
@@ -26,12 +26,12 @@ import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonString; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java index 7a81bf3..4d76300 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonMergePatchTest.java
@@ -26,12 +26,12 @@ import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonString; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java index e55a357..abc3476 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonNumberTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase; -import javax.json.*; +import jakarta.json.*; import java.io.StringReader; import java.io.StringWriter; import java.math.BigDecimal;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java index c1c4b98..a1de2e4 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonObjectTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase; -import javax.json.*; +import jakarta.json.*; /** * @author Jitendra Kotamraju @@ -163,7 +163,7 @@ assertTrue(object1.hashCode() == object2.hashCode()); JsonObject object3 = Json.createObjectBuilder().build(); //org.glassfish.json.JsonArrayBuilderImpl.JsonArrayImpl - JsonObject object4 = JsonValue.EMPTY_JSON_OBJECT; //javax.json.EmptyObject + JsonObject object4 = JsonValue.EMPTY_JSON_OBJECT; //jakarta.json.EmptyObject assertTrue(object3.equals(object4)); assertTrue(object3.hashCode() == object4.hashCode()); //equal instances have same hashCode
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java index 8e8753b..450faa8 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserFactoryTest.java
@@ -18,9 +18,9 @@ import junit.framework.TestCase; -import javax.json.Json; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParserFactory; +import jakarta.json.Json; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParserFactory; import java.io.StringReader; import java.util.HashMap; import java.util.Map;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java index c77d87b..9627f77 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserSkipTest.java
@@ -17,8 +17,8 @@ package org.glassfish.json.tests; import java.io.StringReader; -import javax.json.Json; -import javax.json.stream.JsonParser; +import jakarta.json.Json; +import jakarta.json.stream.JsonParser; import junit.framework.TestCase; import static junit.framework.TestCase.assertEquals; import static junit.framework.TestCase.assertFalse;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java index 83eb517..e7cb155 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonParserTest.java
@@ -23,11 +23,11 @@ import java.io.StringReader; import junit.framework.TestCase; -import javax.json.*; -import javax.json.stream.JsonLocation; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParser.Event; -import javax.json.stream.JsonParserFactory; +import jakarta.json.*; +import jakarta.json.stream.JsonLocation; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParser.Event; +import jakarta.json.stream.JsonParserFactory; import java.math.BigDecimal; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -36,7 +36,7 @@ import java.util.NoSuchElementException; import java.util.Random; import java.util.Scanner; -import javax.json.stream.JsonParsingException; +import jakarta.json.stream.JsonParsingException; import org.glassfish.json.api.BufferPool;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java index be724bb..3e17de5 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonParsingExceptionTest.java
@@ -18,10 +18,10 @@ import junit.framework.TestCase; -import javax.json.Json; -import javax.json.stream.JsonLocation; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParsingException; +import jakarta.json.Json; +import jakarta.json.stream.JsonLocation; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParsingException; import java.io.StringReader; /**
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java index 6267b84..089dab9 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBugsTest.java
@@ -16,10 +16,10 @@ package org.glassfish.json.tests; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonException; -import javax.json.JsonPatch; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonException; +import jakarta.json.JsonPatch; import org.junit.Test; /**
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java index d37d5bb..1607faa 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchBuilderTest.java
@@ -19,9 +19,9 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonPatchBuilder; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonPatchBuilder; import org.junit.Test;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java index cc95ec5..d799e8e 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchDiffTest.java
@@ -26,14 +26,14 @@ import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonPatch; -import javax.json.JsonReader; -import javax.json.JsonString; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonPatch; +import jakarta.json.JsonReader; +import jakarta.json.JsonString; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java index f523118..a1e3909 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchOperationTest.java
@@ -16,8 +16,8 @@ package org.glassfish.json.tests; -import javax.json.JsonException; -import javax.json.JsonPatch.Operation; +import jakarta.json.JsonException; +import jakarta.json.JsonPatch.Operation; import org.junit.Assert; import org.junit.Test;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java index daeca41..dfda6e3 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPatchTest.java
@@ -26,14 +26,14 @@ import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonObject; -import javax.json.JsonPatch; -import javax.json.JsonReader; -import javax.json.JsonString; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonObject; +import jakarta.json.JsonPatch; +import jakarta.json.JsonReader; +import jakarta.json.JsonString; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java index 41a92e6..5330320 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerAddOperationTest.java
@@ -21,11 +21,11 @@ import java.util.Arrays; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonPointer; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonPointer; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java index cd9a8d8..de77a1a 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerEscapeTest.java
@@ -18,7 +18,7 @@ import org.junit.Test; -import javax.json.Json; +import jakarta.json.Json; import static org.junit.Assert.assertEquals;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java index bc9abdf..2fce02d 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerRemoveOperationTest.java
@@ -21,11 +21,11 @@ import java.util.Arrays; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonPointer; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonObject; +import jakarta.json.JsonPointer; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java index cc42002..5ef5b20 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerReplaceOperationTest.java
@@ -24,12 +24,12 @@ import java.util.Arrays; -import javax.json.Json; -import javax.json.JsonException; -import javax.json.JsonObject; -import javax.json.JsonPointer; -import javax.json.JsonStructure; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonException; +import jakarta.json.JsonObject; +import jakarta.json.JsonPointer; +import jakarta.json.JsonStructure; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java index 40459e4..9b79c18 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerTest.java
@@ -26,12 +26,12 @@ import java.io.Reader; import java.util.Arrays; -import javax.json.Json; -import javax.json.JsonException; -import javax.json.JsonObject; -import javax.json.JsonPointer; -import javax.json.JsonReader; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonException; +import jakarta.json.JsonObject; +import jakarta.json.JsonPointer; +import jakarta.json.JsonReader; +import jakarta.json.JsonValue; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java index b4f08e6..dcfaa48 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
@@ -22,8 +22,8 @@ import java.util.Arrays; -import javax.json.Json; -import javax.json.JsonPointer; +import jakarta.json.Json; +import jakarta.json.JsonPointer; import org.junit.Test; import org.junit.runner.RunWith;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java index 7a245fe..0e26778 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
@@ -24,13 +24,13 @@ import java.util.HashMap; import java.util.Map; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonNumber; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonReaderFactory; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonNumber; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonReaderFactory; +import jakarta.json.JsonValue; import org.glassfish.json.api.BufferPool;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java index a845688..68b50ef 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
@@ -18,9 +18,9 @@ import junit.framework.TestCase; -import javax.json.Json; -import javax.json.JsonException; -import javax.json.stream.JsonParser; +import jakarta.json.Json; +import jakarta.json.JsonException; +import jakarta.json.stream.JsonParser; import java.io.InputStreamReader; import java.io.Reader; import java.nio.charset.StandardCharsets;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java index 6d1b164..d0aebb6 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java
@@ -18,7 +18,7 @@ import junit.framework.TestCase; -import javax.json.*; +import jakarta.json.*; import java.io.StringReader; /**
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java index 5a5174d..4dcff40 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
@@ -22,9 +22,9 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.Collections; -import javax.json.JsonObject; -import javax.json.JsonString; -import javax.json.JsonValue; +import jakarta.json.JsonObject; +import jakarta.json.JsonString; +import jakarta.json.JsonValue; import org.junit.Assert; import org.junit.Test;
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java index e74b0ce..375d9f8 100644 --- a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
@@ -16,7 +16,7 @@ package org.glassfish.json.tests; -import javax.json.*; +import jakarta.json.*; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringWriter;
diff --git a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java index 80e3a5e..e809060 100644 --- a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java +++ b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
@@ -21,8 +21,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import javax.json.*; -import javax.json.stream.JsonGenerator; +import jakarta.json.*; +import jakarta.json.stream.JsonGenerator; import java.io.StringWriter; import java.io.StringReader;
diff --git a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java index 47a97a2..cf5d561 100644 --- a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
@@ -18,10 +18,10 @@ import org.junit.Test; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonValue; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonValue; import org.glassfish.json.JsonUtil;
diff --git a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java index 33574d2..b1ce9e4 100644 --- a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java +++ b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
@@ -18,9 +18,9 @@ import junit.framework.TestCase; -import javax.json.*; -import javax.json.stream.JsonParser; -import javax.json.stream.JsonParser.Event; +import jakarta.json.*; +import jakarta.json.stream.JsonParser; +import jakarta.json.stream.JsonParser.Event; import java.io.*; import java.net.URL;
diff --git a/tests/src/test/resources/jsonpatch.json b/tests/src/test/resources/jsonpatch.json index 785c82d..4db4794 100644 --- a/tests/src/test/resources/jsonpatch.json +++ b/tests/src/test/resources/jsonpatch.json
@@ -7,22 +7,22 @@ { "op": { "op": "test", "path": "/x", "value": {} }, "target": [ 1, 2 ], - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "test", "path": "", "value": true }, "target": [ 1, 2 ], - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "test", "path": "/x", "value": -30.000 }, "target": { "x": -29.020 }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "replace", "path": "", "value": false }, "target": { "x": { "a": "b", "y": {} } }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "replace", "path": "/x/y", "value": "hello" }, @@ -42,7 +42,7 @@ { "op": { "op": "replace", "path": "/x/y", "value": 42 }, "target": { "x": {} }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "remove", "path": "/x/y" }, @@ -62,7 +62,7 @@ { "op": { "op": "remove", "path": "/x/y" }, "target": { "x": {} }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "move", "from": "/x/a", "path": "/x/b" }, @@ -77,7 +77,7 @@ { "op": { "op": "move", "from": "/0", "path": "/0/x" }, "target": [ "victim", {}, {} ], - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "move", "from": "/0", "path": "/-" }, @@ -92,17 +92,17 @@ { "op": { "op": "move", "from": "/a", "path": "/a/b" }, "target": {}, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "move", "from": "/a", "path": "/b/c" }, "target": { "a": "b" }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "move", "from": "/x/a", "path": "/x/c" }, "target": { "x": { "b": "helo" } }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "copy", "from": "/a", "path": "/b" }, @@ -127,37 +127,37 @@ { "op": { "op": "copy", "from": "/a", "path": "/b" }, "target": {}, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "copy", "from": "/a", "path": "/b/c" }, "target": { "a": 1 }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "add", "path": "/a/b/c", "value": 1 }, "target": { "a": "b" }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "add", "path": "/~1", "value": 1 }, "target": [], - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "add", "path": "/3", "value": 1 }, "target": [ 1, 2 ], - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "add", "path": "/-2", "value": 1 }, "target": [ 1, 2 ], - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "add", "path": "/foo/f", "value": "bar" }, "target": { "foo": "bar" }, - "exception": "javax.json.JsonException" + "exception": "jakarta.json.JsonException" }, { "op": { "op": "add", "path": "/a", "value": "b" },