fix json tests

Author: mudkipdev

json/src/main/java/alpine/json/JsonReader.java

@@ -20,7 +20,14 @@ Element read(String input) throws ParsingException {
         this.characters = input.toCharArray();
         this.position = 0;
         this.skipWhitespace();
-        return this.readElement();
+        var element = this.readElement();
+        this.skipWhitespace();
+
+        if (this.position < this.characters.length) {
+            throw new ParsingException(this.input, "Unexpected trailing content!", this.position);
+        }
+
+        return element;
     }
 
     private Element readElement() throws ParsingException {

json/src/main/java/alpine/json/ObjectElement.java

@@ -181,7 +181,7 @@ public boolean hasValue(Element value) {
         return this.elements.containsValue(value);
     }
 
-    public boolean hasString(String value) {
+    public boolean hasValue(String value) {
         return this.hasValue(Element.string(value));
     }
 

json/src/test/java/alpine/json/ExternalTests.java

@@ -12,6 +12,9 @@
 import java.util.Objects;
 import java.util.stream.Stream;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.junit.jupiter.api.Assertions.fail;
+
 final class ExternalTests {
     @SuppressWarnings("resource")
     static Stream<Arguments> arguments() {
@@ -42,14 +45,15 @@ static Stream<Arguments> arguments() {
     @ParameterizedTest(name = "{0}")
     @MethodSource("arguments")
     void test(String name, Behavior behavior, String string) {
-        try {
-            Json.read(string);
-        } catch (ParsingException e) {
-            if (behavior == Behavior.SHOULD_PASS) {
-                throw new AssertionError(name + " should have passed!", e);
-            }
-        } catch (StackOverflowError ignored) {
+        if (behavior == Behavior.SHOULD_PASS) {
+            assertDoesNotThrow(() -> Json.read(string));
+        } else if (behavior == Behavior.SHOULD_FAIL) {
+            try {
+                Json.read(string);
+                fail("Expected ParsingException or StackOverflowError");
+            } catch (ParsingException | StackOverflowError ignored) {
 
+            }
         }
     }
 

json/src/test/java/alpine/json/JsonTest.java

@@ -18,7 +18,8 @@ void testInvalid() {
             "test",
             "{", "}", "[", "]",
             "\"", "\"\0\"",
-            "123abc", "[123e]", "0.", ".0"
+            "123abc", "[123e]", "0.", ".0",
+            "[],", "{}abc"
         }) {
             assertThrows(ParsingException.class, () -> Json.read(string));
         }
@@ -65,7 +66,7 @@ void testObjectAccess() {
 
     @Test
     void testObjectSetting() {
-        object().set("key", "value").expect("key", StringElement.class);
+        assertDoesNotThrow(() -> object().set("key", "value").expect("key", StringElement.class));
         assertThrows(AssertionError.class, () -> object().set("key", "value").expect("key", NullElement.class));
     }