update package to ee.jakarta.tck.jsonp

Signed-off-by: Scott Marlow <smarlow@redhat.com>
jakartaee · Feb 10, 2022 · 79f57be · 79f57be
1 parent 25b528c
commit 79f57be
Show file tree

Hide file tree

Showing 105 changed files with 1,641 additions and 1,675 deletions.
diff --git a/.../jakarta/jsonp/tck/common/JSONP_Data.java → .../jakarta/tck/jsonp/common/JSONP_Data.java b/.../jakarta/jsonp/tck/common/JSONP_Data.java → .../jakarta/tck/jsonp/common/JSONP_Data.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package ee.jakarta.tck.jsonp.common;
 
 
 import java.util.*;

diff --git a/.../jakarta/jsonp/tck/common/JSONP_Util.java → .../jakarta/tck/jsonp/common/JSONP_Util.java b/.../jakarta/jsonp/tck/common/JSONP_Util.java → .../jakarta/tck/jsonp/common/JSONP_Util.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package ee.jakarta.tck.jsonp.common;
 
 
 import java.util.*;
@@ -52,7 +52,7 @@ public final class JSONP_Util {
   public static final Charset UTF_32LE = Charset.forName("UTF-32LE");
 
   // Test Config properties
-  public static final String FOO_CONFIG = "jakarta.jsonp.tck.common.FOO_CONFIG";
+  public static final String FOO_CONFIG = "ee.jakarta.tck.jsonp.common.FOO_CONFIG";
 
   // Number of parser errors encountered
   private static int parseErrs = 0;

diff --git a/...onp/tck/common/MyBufferedInputStream.java → ...k/jsonp/common/MyBufferedInputStream.java b/...onp/tck/common/MyBufferedInputStream.java → ...k/jsonp/common/MyBufferedInputStream.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package ee.jakarta.tck.jsonp.common;
 
 
 import java.io.*;

diff --git a/...ta/jsonp/tck/common/MyBufferedReader.java → ...ta/tck/jsonp/common/MyBufferedReader.java b/...ta/jsonp/tck/common/MyBufferedReader.java → ...ta/tck/jsonp/common/MyBufferedReader.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package ee.jakarta.tck.jsonp.common;
 
 
 import java.io.*;

diff --git a/...ta/jsonp/tck/common/MyBufferedWriter.java → ...ta/tck/jsonp/common/MyBufferedWriter.java b/...ta/jsonp/tck/common/MyBufferedWriter.java → ...ta/tck/jsonp/common/MyBufferedWriter.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package ee.jakarta.tck.jsonp.common;
 
 
 import java.io.*;

diff --git a/...arta/jsonp/tck/common/MyJsonLocation.java → ...arta/tck/jsonp/common/MyJsonLocation.java b/...arta/jsonp/tck/common/MyJsonLocation.java → ...arta/tck/jsonp/common/MyJsonLocation.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.common;
+package ee.jakarta.tck.jsonp.common;
 
 
 import jakarta.json.stream.JsonLocation;

diff --git a/...arta/jsonp/tck/util/FileUTFConverter.java → ...arta/tck/jsonp/util/FileUTFConverter.java b/...arta/jsonp/tck/util/FileUTFConverter.java → ...arta/tck/jsonp/util/FileUTFConverter.java
@@ -46,7 +46,7 @@
  * UTF-32LE
  */
 
-package jakarta.jsonp.tck.util;
+package ee.jakarta.tck.jsonp.util;
 
 import java.io.*;
 import java.util.logging.Logger;

diff --git a/...ava/jakarta/jsonp/tck/util/MyEncoder.java → .../ee/jakarta/tck/jsonp/util/MyEncoder.java b/...ava/jakarta/jsonp/tck/util/MyEncoder.java → .../ee/jakarta/tck/jsonp/util/MyEncoder.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.util;
+package ee.jakarta.tck.jsonp.util;
 
 import java.io.*;
 import java.util.logging.Logger;

diff --git a/...ta/jsonp/tck/util/StringUTFConverter.java → ...ta/tck/jsonp/util/StringUTFConverter.java b/...ta/jsonp/tck/util/StringUTFConverter.java → ...ta/tck/jsonp/util/StringUTFConverter.java
@@ -31,7 +31,7 @@
  * output file (fooUTF16LE).
  */
 
-package jakarta.jsonp.tck.util;
+package ee.jakarta.tck.jsonp.util;
 
 import java.io.*;
 import java.util.logging.Logger;

diff --git a/...bility/jsonprovidertests/ClientTests.java → ...bility/jsonprovidertests/ClientTests.java b/...bility/jsonprovidertests/ClientTests.java → ...bility/jsonprovidertests/ClientTests.java
@@ -17,8 +17,9 @@
 /*
  * $Id$
  */
-package jakarta.jsonp.tck.pluggability.jsonprovidertests;
+package ee.jakarta.tck.jsonp.pluggability.jsonprovidertests;
 
+import ee.jakarta.tck.jsonp.common.JSONP_Util;
 import jakarta.json.Json;
 import jakarta.json.JsonArrayBuilder;
 import jakarta.json.JsonBuilderFactory;
@@ -33,9 +34,8 @@
 import jakarta.json.stream.JsonGeneratorFactory;
 import jakarta.json.stream.JsonParser;
 import jakarta.json.stream.JsonParserFactory;
-import jakarta.jsonp.tck.common.JSONP_Util;
-import jakarta.jsonp.tck.provider.MyJsonGenerator;
-import jakarta.jsonp.tck.provider.MyJsonProvider;
+import ee.jakarta.tck.jsonp.provider.MyJsonGenerator;
+import ee.jakarta.tck.jsonp.provider.MyJsonProvider;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
@@ -55,7 +55,7 @@
 
 public class ClientTests {
 
-  private static final String MY_JSONPROVIDER_CLASS = "jakarta.jsonp.tck.provider.MyJsonProvider";
+  private static final String MY_JSONPROVIDER_CLASS = "MyJsonProvider";
   private static final Logger LOGGER = Logger.getLogger(ClientTests.class.getName());
 
   private String providerPath = null;

diff --git a/...a/jsonp/tck/provider/MyJsonGenerator.java → ...a/tck/jsonp/provider/MyJsonGenerator.java b/...a/jsonp/tck/provider/MyJsonGenerator.java → ...a/tck/jsonp/provider/MyJsonGenerator.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import java.io.*;
 import java.math.BigDecimal;

diff --git a/.../tck/provider/MyJsonGeneratorFactory.java → ...sonp/provider/MyJsonGeneratorFactory.java b/.../tck/provider/MyJsonGeneratorFactory.java → ...sonp/provider/MyJsonGeneratorFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import jakarta.json.stream.*;
 import java.io.*;

diff --git a/...arta/jsonp/tck/provider/MyJsonParser.java → ...arta/tck/jsonp/provider/MyJsonParser.java b/...arta/jsonp/tck/provider/MyJsonParser.java → ...arta/tck/jsonp/provider/MyJsonParser.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 
 import jakarta.json.stream.*;

diff --git a/...onp/tck/provider/MyJsonParserFactory.java → ...k/jsonp/provider/MyJsonParserFactory.java b/...onp/tck/provider/MyJsonParserFactory.java → ...k/jsonp/provider/MyJsonParserFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import jakarta.json.*;
 import jakarta.json.stream.*;

diff --git a/...ta/jsonp/tck/provider/MyJsonProvider.java → ...ta/tck/jsonp/provider/MyJsonProvider.java b/...ta/jsonp/tck/provider/MyJsonProvider.java → ...ta/tck/jsonp/provider/MyJsonProvider.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import java.io.*;
 import java.util.*;

diff --git a/...arta/jsonp/tck/provider/MyJsonReader.java → ...arta/tck/jsonp/provider/MyJsonReader.java b/...arta/jsonp/tck/provider/MyJsonReader.java → ...arta/tck/jsonp/provider/MyJsonReader.java
@@ -18,14 +18,11 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import jakarta.json.*;
-import jakarta.json.stream.*;
-import jakarta.json.spi.JsonProvider;
+
 import java.io.*;
-import java.nio.charset.Charset;
-import java.util.*;
 import java.util.logging.Logger;
 
 /*

diff --git a/...onp/tck/provider/MyJsonReaderFactory.java → ...k/jsonp/provider/MyJsonReaderFactory.java b/...onp/tck/provider/MyJsonReaderFactory.java → ...k/jsonp/provider/MyJsonReaderFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import jakarta.json.*;
 import java.io.*;

diff --git a/...arta/jsonp/tck/provider/MyJsonWriter.java → ...arta/tck/jsonp/provider/MyJsonWriter.java b/...arta/jsonp/tck/provider/MyJsonWriter.java → ...arta/tck/jsonp/provider/MyJsonWriter.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 import jakarta.json.*;
 import java.io.*;

diff --git a/...onp/tck/provider/MyJsonWriterFactory.java → ...k/jsonp/provider/MyJsonWriterFactory.java b/...onp/tck/provider/MyJsonWriterFactory.java → ...k/jsonp/provider/MyJsonWriterFactory.java
@@ -18,7 +18,7 @@
  * $Id$
  */
 
-package jakarta.jsonp.tck.provider;
+package ee.jakarta.tck.jsonp.provider;
 
 
 import jakarta.json.*;

diff --git a/...tck-tests-pluggability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider b/...tck-tests-pluggability/src/main/resources/META-INF/services/jakarta.json.spi.JsonProvider
@@ -1 +1 @@
-jakarta.jsonp.tck.provider.MyJsonProvider
+ee.jakarta.tck.jsonp.provider.MyJsonProvider
diff --git a/...ck/api/collectortests/CollectorTests.java → ...np/api/collectortests/CollectorTests.java b/...ck/api/collectortests/CollectorTests.java → ...np/api/collectortests/CollectorTests.java
@@ -14,9 +14,9 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.jsonp.tck.api.collectortests;
+package ee.jakarta.tck.jsonp.api.collectortests;
 
-import jakarta.jsonp.tck.api.common.TestResult;
+import ee.jakarta.tck.jsonp.api.common.TestResult;
 import org.junit.jupiter.api.Test;
 import org.opentest4j.AssertionFailedError;
 

diff --git a/...np/tck/api/collectortests/Collectors.java → .../jsonp/api/collectortests/Collectors.java b/...np/tck/api/collectortests/Collectors.java → .../jsonp/api/collectortests/Collectors.java
@@ -14,9 +14,12 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.jsonp.tck.api.collectortests;
+package ee.jakarta.tck.jsonp.api.collectortests;
+
+import ee.jakarta.tck.jsonp.api.common.JsonAssert;
+import ee.jakarta.tck.jsonp.api.common.SimpleValues;
+import ee.jakarta.tck.jsonp.api.common.TestResult;
 
-import jakarta.jsonp.tck.api.common.TestResult;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Map;
@@ -33,9 +36,6 @@
 import jakarta.json.stream.JsonCollectors;
 import jakarta.json.stream.JsonParser;
 
-import static jakarta.jsonp.tck.api.common.JsonAssert.*;
-import static jakarta.jsonp.tck.api.common.SimpleValues.*;
-
 // $Id$
 /**
  * JavaScript Object Notation (JSON) Pointer compatibility tests.<br>
@@ -50,18 +50,18 @@ public class Collectors {
 
   /** Tests input data with JsonArray instances. */
   private static final JsonArray[] ARRAY_VALUES = new JsonArray[] {
-      createSimpleStringArray5(), // JsonArray with String
-      createSimpleIntArray5(), // JsonArray with int
-      createSimpleBoolArray5(), // JsonArray with boolean
-      createSimpleObjectArray5() // JsonArray with JsonObject
+      SimpleValues.createSimpleStringArray5(), // JsonArray with String
+      SimpleValues.createSimpleIntArray5(), // JsonArray with int
+      SimpleValues.createSimpleBoolArray5(), // JsonArray with boolean
+      SimpleValues.createSimpleObjectArray5() // JsonArray with JsonObject
   };
 
   /** Tests input data with JsonArray instances. */
   private static final JsonObject[] OBJ_VALUES = new JsonObject[] {
-      createSimpleObjectWithStr(), // JsonObject with String
-      createSimpleObjectWithInt(), // JsonObject with int
-      createSimpleObjectWithBool(), // JsonObject with boolean
-      createCompoundObject() // JsonObject with JsonObject
+      SimpleValues.createSimpleObjectWithStr(), // JsonObject with String
+      SimpleValues.createSimpleObjectWithInt(), // JsonObject with int
+      SimpleValues.createSimpleObjectWithBool(), // JsonObject with boolean
+      SimpleValues.createCompoundObject() // JsonObject with JsonObject
   };
 
   /** Test input data for {@code groupingBy} methods. */
@@ -116,14 +116,14 @@ TestResult test() {
   private void testToJsonArrayCollector(final TestResult result) {
     LOGGER.info(" - Collector returned by toJsonArray()");
     for (final JsonArray in : ARRAY_VALUES) {
-      LOGGER.info("   - Input: " + valueToString(in));
+      LOGGER.info("   - Input: " + JsonAssert.valueToString(in));
       final Collector<JsonValue, JsonArrayBuilder, JsonArray> col = JsonCollectors
           .toJsonArray();
       final JsonArray out = in.getValuesAs(JsonObject.class).stream()
           .collect(col);
       if (operationFailed(in, out)) {
-        result.fail("toJsonArray()", "Output Stream value " + valueToString(out)
-            + " shall be " + valueToString(in));
+        result.fail("toJsonArray()", "Output Stream value " + JsonAssert.valueToString(out)
+            + " shall be " + JsonAssert.valueToString(in));
       }
     }
   }
@@ -171,19 +171,19 @@ private void testToJsonArrayCollector(final TestResult result) {
   private void testToJsonObjectCollector(final TestResult result) {
     LOGGER.info(" - Collector returned by toJsonObject(Function,Function)");
     final JsonArray in = Json.createArrayBuilder()
-        .add(Json.createObjectBuilder().add("key", STR_NAME).add("value",
-            STR_VALUE))
-        .add(Json.createObjectBuilder().add("key", INT_NAME).add("value",
-            INT_VALUE))
-        .add(Json.createObjectBuilder().add("key", BOOL_NAME).add("value",
-            BOOL_VALUE))
-        .add(Json.createObjectBuilder().add("key", OBJ_NAME).add("value",
-            OBJ_VALUE))
+        .add(Json.createObjectBuilder().add("key", SimpleValues.STR_NAME).add("value",
+            SimpleValues.STR_VALUE))
+        .add(Json.createObjectBuilder().add("key", SimpleValues.INT_NAME).add("value",
+            SimpleValues.INT_VALUE))
+        .add(Json.createObjectBuilder().add("key", SimpleValues.BOOL_NAME).add("value",
+            SimpleValues.BOOL_VALUE))
+        .add(Json.createObjectBuilder().add("key", SimpleValues.OBJ_NAME).add("value",
+            SimpleValues.OBJ_VALUE))
         .build();
-    final JsonObject check = Json.createObjectBuilder().add(STR_NAME, STR_VALUE)
-        .add(INT_NAME, INT_VALUE).add(BOOL_NAME, BOOL_VALUE)
-        .add(OBJ_NAME, OBJ_VALUE).build();
-    LOGGER.info("     Input: " + valueToString(in));
+    final JsonObject check = Json.createObjectBuilder().add(SimpleValues.STR_NAME, SimpleValues.STR_VALUE)
+        .add(SimpleValues.INT_NAME, SimpleValues.INT_VALUE).add(SimpleValues.BOOL_NAME, SimpleValues.BOOL_VALUE)
+        .add(SimpleValues.OBJ_NAME, SimpleValues.OBJ_VALUE).build();
+    LOGGER.info("     Input: " + JsonAssert.valueToString(in));
     final Collector<JsonValue, JsonObjectBuilder, JsonObject> col = JsonCollectors
         .toJsonObject(
             // Build key from stream value.
@@ -202,7 +202,7 @@ private void testToJsonObjectCollector(final TestResult result) {
         .collect(col);
     if (operationFailed(out, check)) {
       result.fail("toJsonObject(Function,Function)", "Output Stream value "
-          + valueToString(out) + " shall be " + valueToString(check));
+          + JsonAssert.valueToString(out) + " shall be " + JsonAssert.valueToString(check));
     }
   }
 
@@ -245,7 +245,7 @@ private void testSimpleGroupingByCollector(final TestResult result) {
                     .add("office", "Green"))
                 .build())
         .build();
-    LOGGER.info("     Input: " + valueToString(OBJ_ARRAY_GROUP));
+    LOGGER.info("     Input: " + JsonAssert.valueToString(OBJ_ARRAY_GROUP));
     final Collector<JsonValue, Map<String, JsonArrayBuilder>, JsonObject> col = JsonCollectors
         .groupingBy((JsonValue v) -> {
           if (v.getValueType() == JsonValue.ValueType.OBJECT)
@@ -256,7 +256,7 @@ private void testSimpleGroupingByCollector(final TestResult result) {
         .stream().collect(col);
     if (operationFailed(out, check)) {
       result.fail("groupingBy(Function)", "Output Stream value "
-          + valueToString(out) + " shall be " + valueToString(check));
+          + JsonAssert.valueToString(out) + " shall be " + JsonAssert.valueToString(check));
     }
   }
 
@@ -486,7 +486,7 @@ private void testSortingGroupingByCollector(final TestResult result) {
     Collector<JsonValue, JsonArrayBuilder, JsonArray> toArray = Collector.of(
         ValueBuilder::new, JsonArrayBuilder::add, JsonArrayBuilder::addAll,
         JsonArrayBuilder::build);
-    LOGGER.info("     Input: " + valueToString(OBJ_ARRAY_GROUP));
+    LOGGER.info("     Input: " + JsonAssert.valueToString(OBJ_ARRAY_GROUP));
     final Collector<JsonValue, Map<String, JsonArrayBuilder>, JsonObject> col = JsonCollectors
         .groupingBy((JsonValue v) -> {
           if (v.getValueType() == JsonValue.ValueType.OBJECT)
@@ -497,7 +497,7 @@ private void testSortingGroupingByCollector(final TestResult result) {
         .stream().collect(col);
     if (operationFailed(out, check)) {
       result.fail("groupingBy(Function,Collector)", "Output Stream value "
-          + valueToString(out) + " shall be " + valueToString(check));
+          + JsonAssert.valueToString(out) + " shall be " + JsonAssert.valueToString(check));
     }
   }
 
@@ -513,8 +513,8 @@ private void testSortingGroupingByCollector(final TestResult result) {
    */
   protected boolean operationFailed(final JsonValue check,
       final JsonValue out) {
-    LOGGER.info("     Checking " + valueToString(out));
-    return out == null || !assertEquals(check, out);
+    LOGGER.info("     Checking " + JsonAssert.valueToString(out));
+    return out == null || !JsonAssert.assertEquals(check, out);
   }
 
 }
diff --git a/...ta/jsonp/tck/api/common/ArrayBuilder.java → ...ta/tck/jsonp/api/common/ArrayBuilder.java b/...ta/jsonp/tck/api/common/ArrayBuilder.java → ...ta/tck/jsonp/api/common/ArrayBuilder.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package jakarta.jsonp.tck.api.common;
+package ee.jakarta.tck.jsonp.api.common;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;