Changeset 36122 in osm for applications/editors/josm/plugins/MicrosoftStreetside/test

Timestamp:

2023-08-22T17:40:36+02:00 (17 months ago)

Author:

taylor.smock

Message:

Use jakarta.json instead of java.json

This also fixes various lint issues

Location:

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils

Files:

• JsonUtil.java (modified) (1 diff)
• api/JsonDecoderTest.java (modified) (3 diffs)
• api/JsonSequencesDecoderTest.java (modified) (1 diff)

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils/JsonUtil.java

@@ -5 +5 @@
 import java.nio.charset.StandardCharsets;
 
-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 
 public final class JsonUtil {

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils/api/JsonDecoderTest.java

@@ -3 +3 @@
 
 
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -9 +10 @@
 import java.util.function.Function;
 
-import javax.json.Json;
-import javax.json.JsonObject;
+import jakarta.json.Json;
+import jakarta.json.JsonObject;
 
 import org.junit.jupiter.api.Test;
@@ -24 +25 @@
   @Test
   void testDecodeDoublePair() {
-    assertNull(JsonDecoder.decodeDoublePair(null));
+    assertArrayEquals(new double[0], JsonDecoder.decodeDoublePair(null));
   }
 

applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils/api/JsonSequencesDecoderTest.java

@@ -13 +13 @@
 import java.util.function.Function;
 
-import javax.json.Json;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
+import jakarta.json.Json;
+import jakarta.json.JsonArray;
+import jakarta.json.JsonObject;
+import jakarta.json.JsonValue;
 
 import org.junit.jupiter.api.Assertions;