Updated tests to use jakarta

Cousjava · Cousjava · commit d28d11ea3d25 · 2019-09-24T21:31:49.000+01:00
Signed-off-by: Jonathan Coustick &lt;jonathan.coustick@payara.fish&gt;
diff --git 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 @@ public void testHashCode() {
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -18,7 +18,7 @@
 
 import junit.framework.TestCase;
 
-import javax.json.*;
+import jakarta.json.*;
 
 /**
  * @author Jitendra Kotamraju
@@ -163,7 +163,7 @@ public void testHashCode() {
         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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonPointerToStringTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonReaderTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonSamplesParsingTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonStringTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonValueTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java b/tests/src/test/java/org/glassfish/json/tests/JsonWriterTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java b/tests/src/test/java/org/glassfish/json/tests/RFC7159Test.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java b/tests/src/test/java/org/glassfish/json/tests/ToJsonTest.java
diff --git a/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java b/tests/src/test/java/org/glassfish/json/tests/TwitterSearchTest.java
diff --git a/tests/src/test/resources/jsonpatch.json b/tests/src/test/resources/jsonpatch.json
