tests tidyup

simbo1905 · simbo1905 · commit 841b98524822 · 2025-09-20T10:27:47.000+01:00
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaAnnotationsTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaAnnotationsTest.java
@@ -8,7 +8,7 @@
 /// Covers annotation-only keywords from JSON Schema such as
 /// title, description, $comment, and examples. These MUST NOT
 /// affect validation (they are informational).
-class JsonSchemaAnnotationsTest extends JsonSchemaLoggingConfig {
+class JsonSchemaAnnotationsTest extends JsonSchemaTestBase {
 
     @Test
     void examplesDoNotAffectValidation() {
@@ -69,4 +69,3 @@ void unknownAnnotationKeywordsAreIgnored() {
         assertThat(schema.validate(Json.parse("123"))).extracting("valid").isEqualTo(false);
     }
 }
-
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaArrayKeywordsTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaArrayKeywordsTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaArrayKeywordsTest extends JsonSchemaLoggingConfig {
+class JsonSchemaArrayKeywordsTest extends JsonSchemaTestBase {
 
     @Test
     void testContains_only_defaults() {
@@ -361,4 +361,4 @@ void testContains_minContainsZero() {
         /// Valid: mixed with booleans
         assertThat(schema.validate(Json.parse("[1,true,2]")).valid()).isTrue();
     }
-}
+}
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaDependenciesAndOneOfTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaDependenciesAndOneOfTest.java
@@ -5,7 +5,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaDependenciesAndOneOfTest extends JsonSchemaLoggingConfig {
+class JsonSchemaDependenciesAndOneOfTest extends JsonSchemaTestBase {
 
     @Test
     void testDependentRequiredBasics() {
@@ -302,4 +302,4 @@ void testComplexDependenciesAndOneOf() {
         assertThat(missingRouting.valid()).isFalse();
         assertThat(missingRouting.errors().getFirst().message()).contains("Property 'accountNumber' requires property 'routingNumber' (dependentRequired)");
     }
-}
+}
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaErrorMessagesTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaErrorMessagesTest.java
@@ -5,7 +5,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaErrorMessagesTest extends JsonSchemaLoggingConfig {
+class JsonSchemaErrorMessagesTest extends JsonSchemaTestBase {
 
     @Test
     void typeMismatchMessages() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaFormatTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaFormatTest.java
@@ -8,7 +8,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaFormatTest extends JsonSchemaLoggingConfig {
+class JsonSchemaFormatTest extends JsonSchemaTestBase {
   @Test
   void testCommonFormats_whenAssertionOn_invalidsFail_validsPass() {
     // Toggle "assert formats" ON (wire however your implementation exposes it).
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaLoggingConfig.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaLoggingConfig.java
@@ -1,8 +1,6 @@
 package io.github.simbo1905.json.schema;
 
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.TestInfo;
 import java.util.Locale;
 import java.util.logging.*;
 
@@ -44,10 +42,4 @@ static void enableJulDebug() {
         }
     }
 
-    @BeforeEach
-    void announce(TestInfo info) {
-        final String cls = info.getTestClass().map(Class::getSimpleName).orElse("UnknownTest");
-        final String method = info.getTestMethod().map(java.lang.reflect.Method::getName).orElse(info.getDisplayName());
-        io.github.simbo1905.json.schema.SchemaLogging.LOG.info(() -> "TEST: " + cls + "#" + method);
-    }
 }
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaObjectKeywordsTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaObjectKeywordsTest.java
@@ -5,7 +5,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaObjectKeywordsTest extends JsonSchemaLoggingConfig {
+class JsonSchemaObjectKeywordsTest extends JsonSchemaTestBase {
 
     @Test
     void additionalPropertiesFalseDisallowsUnknown() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaPatternTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaPatternTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaPatternTest extends JsonSchemaLoggingConfig {
+class JsonSchemaPatternTest extends JsonSchemaTestBase {
   @Test
   void testPattern_unanchored_singleChar_findVsMatches() {
     // Unanchored semantics: pattern "a" must validate any string that CONTAINS 'a',
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaRefLocalTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaRefLocalTest.java
@@ -14,7 +14,7 @@
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 /// Test local reference resolution for JSON Schema 2020-12
-class JsonSchemaRefLocalTest extends JsonSchemaLoggingConfig {
+class JsonSchemaRefLocalTest extends JsonSchemaTestBase {
 
     @Test
     void testRootReference() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaRemoteRefTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaRemoteRefTest.java
@@ -16,7 +16,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-final class JsonSchemaRemoteRefTest extends JsonSchemaLoggingConfig {
+final class JsonSchemaRemoteRefTest extends JsonSchemaTestBase {
 
     @Test
     void resolves_http_ref_to_pointer_inside_remote_doc() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaTest extends JsonSchemaLoggingConfig {
+class JsonSchemaTest extends JsonSchemaTestBase {
 
     @Test
     void testStringTypeValidation() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaTestBase.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaTestBase.java
@@ -0,0 +1,98 @@
+package io.github.simbo1905.json.schema;
+
+import jdk.sandbox.java.util.json.Json;
+import jdk.sandbox.java.util.json.JsonValue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import static io.github.simbo1905.json.schema.SchemaLogging.LOG;
+
+/// Base class for all schema tests.
+/// - Emits an INFO banner per test.
+/// - Provides common helpers for loading resources and assertions.
+class JsonSchemaTestBase extends JsonSchemaLoggingConfig {
+
+    @BeforeEach
+    void announce(TestInfo testInfo) {
+        final String cls = testInfo.getTestClass().map(Class::getSimpleName).orElse("UnknownTest");
+        final String name = testInfo.getTestMethod().map(java.lang.reflect.Method::getName)
+                .orElseGet(testInfo::getDisplayName);
+        LOG.info(() -> "TEST: " + cls + "#" + name);
+    }
+
+    protected final JsonValue readJson(String resourcePath) {
+        return Json.parse(readText(resourcePath));
+    }
+
+    protected final String readText(String resourcePath) {
+        try {
+            Path p = Path.of(Objects.requireNonNull(
+                    getClass().getClassLoader().getResource(resourcePath), resourcePath
+            ).toURI());
+            return Files.readString(p, StandardCharsets.UTF_8);
+        } catch (URISyntaxException | IOException e) {
+            throw new RuntimeException("Failed to read resource: " + resourcePath, e);
+        }
+    }
+
+    protected final URI uriOf(String relativeResourcePath) {
+        return TestResourceUtils.getTestResourceUri(relativeResourcePath);
+    }
+
+    protected final JsonSchema.ValidationResult validate(JsonSchema schema, JsonValue instance) {
+        return schema.validate(instance);
+    }
+
+    protected final void assertValid(JsonSchema schema, String instanceJson) {
+        final var res = schema.validate(Json.parse(instanceJson));
+        org.assertj.core.api.Assertions.assertThat(res.valid()).isTrue();
+    }
+
+    protected final void assertInvalid(JsonSchema schema, String instanceJson) {
+        final var res = schema.validate(Json.parse(instanceJson));
+        org.assertj.core.api.Assertions.assertThat(res.valid()).isFalse();
+    }
+
+    protected static CapturedLogs captureLogs(java.util.logging.Level level) {
+        return new CapturedLogs(level);
+    }
+
+    static final class CapturedLogs implements AutoCloseable {
+        private final java.util.logging.Handler handler;
+        private final List<String> lines = new ArrayList<>();
+        private final java.util.logging.Level original;
+
+        CapturedLogs(java.util.logging.Level level) {
+            original = LOG.getLevel();
+            LOG.setLevel(level);
+            handler = new java.util.logging.Handler() {
+                @Override public void publish(java.util.logging.LogRecord record) {
+                    if (record.getLevel().intValue() >= level.intValue()) {
+                        lines.add(record.getMessage());
+                    }
+                }
+                @Override public void flush() { }
+                @Override public void close() throws SecurityException { }
+            };
+            LOG.addHandler(handler);
+        }
+
+        List<String> lines() { return List.copyOf(lines); }
+
+        @Override
+        public void close() {
+            LOG.removeHandler(handler);
+            LOG.setLevel(original);
+        }
+    }
+}
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaTypeAndEnumTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/JsonSchemaTypeAndEnumTest.java
@@ -4,7 +4,7 @@
 import org.junit.jupiter.api.Test;
 import static org.assertj.core.api.Assertions.*;
 
-class JsonSchemaTypeAndEnumTest extends JsonSchemaLoggingConfig {
+class JsonSchemaTypeAndEnumTest extends JsonSchemaTestBase {
 
   @Test
   void testEnum_strict_noTypeCoercion_edgeCases() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/OpenRPCFragmentsUnitTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/OpenRPCFragmentsUnitTest.java
@@ -9,7 +9,7 @@
 /// Unit tests that exercise OpenRPC-like schema fragments using only
 /// keywords currently supported by the validator. These build confidence
 /// incrementally before the larger IT that validates full documents.
-class OpenRPCFragmentsUnitTest extends JsonSchemaLoggingConfig {
+class OpenRPCFragmentsUnitTest extends JsonSchemaTestBase {
 
     @Test
     void info_object_minimal_required_fields() {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/OpenRPCSchemaValidationIT.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/OpenRPCSchemaValidationIT.java
@@ -23,7 +23,7 @@
 /// - Schema: src/test/resources/openrpc/schema.json
 /// - Examples: src/test/resources/openrpc/examples/*.json
 ///   Files containing "-bad-" are intentionally invalid and must fail validation.
-class OpenRPCSchemaValidationIT extends JsonSchemaLoggingConfig {
+class OpenRPCSchemaValidationIT extends JsonSchemaTestBase {
 
     private static String readResource(String name) throws IOException {
         try {
diff --git a/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/Pack1Pack2VerificationTest.java b/json-java21-schema/src/test/java/io/github/simbo1905/json/schema/Pack1Pack2VerificationTest.java
@@ -5,7 +5,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 /// Verification test for Pack 1 and Pack 2 implementation completeness
-class Pack1Pack2VerificationTest extends JsonSchemaLoggingConfig {
+class Pack1Pack2VerificationTest extends JsonSchemaTestBase {
 
     @Test
     void testPatternSemantics_unanchoredFind() {
@@ -243,4 +243,4 @@ void testPrefixItemsTupleValidation() {
         assertThat(prefixOnly.validate(Json.parse("[1,\"anything\",{},null]")).valid()).isTrue(); // prefix + any extras
         assertThat(prefixOnly.validate(Json.parse("[\"not integer\"]")).valid()).isFalse(); // wrong prefix type
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`/// Covers annotation-only keywords from JSON Schema such as`
`9`	`9`	`/// title, description, $comment, and examples. These MUST NOT`
`10`	`10`	`/// affect validation (they are informational).`
`11`		`-class JsonSchemaAnnotationsTest extends JsonSchemaLoggingConfig {`
	`11`	`+class JsonSchemaAnnotationsTest extends JsonSchemaTestBase {`
`12`	`12`
`13`	`13`	`@Test`
`14`	`14`	`void examplesDoNotAffectValidation() {`
`@@ -69,4 +69,3 @@ void unknownAnnotationKeywordsAreIgnored() {`
`69`	`69`	`assertThat(schema.validate(Json.parse("123"))).extracting("valid").isEqualTo(false);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`		`-`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,6 @@`
`1`	`1`	`package io.github.simbo1905.json.schema;`
`2`	`2`
`3`	`3`	`import org.junit.jupiter.api.BeforeAll;`
`4`		`-import org.junit.jupiter.api.BeforeEach;`
`5`		`-import org.junit.jupiter.api.TestInfo;`
`6`	`4`	`import java.util.Locale;`
`7`	`5`	`import java.util.logging.*;`
`8`	`6`
`@@ -44,10 +42,4 @@ static void enableJulDebug() {`
`44`	`42`	`}`
`45`	`43`	`}`
`46`	`44`
`47`		`- @BeforeEach`
`48`		`- void announce(TestInfo info) {`
`49`		`- final String cls = info.getTestClass().map(Class::getSimpleName).orElse("UnknownTest");`
`50`		`- final String method = info.getTestMethod().map(java.lang.reflect.Method::getName).orElse(info.getDisplayName());`
`51`		`- io.github.simbo1905.json.schema.SchemaLogging.LOG.info(() -> "TEST: " + cls + "#" + method);`
`52`		`- }`
`53`	`45`	`}`