Fix tests

Looks like something has changed in Jackson that means the def references are in double quotes, not single quotes.
creek-service · Jun 22, 2024 · 329720a · 329720a
1 parent 82b7a33
commit 329720a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/...or/src/test/java/org/creekservice/internal/json/schema/generator/SchemaGeneratorTest.java b/...or/src/test/java/org/creekservice/internal/json/schema/generator/SchemaGeneratorTest.java
@@ -31,6 +31,7 @@
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeName;
+import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
@@ -92,6 +93,7 @@ class SchemaGeneratorTest {
                     .addModule(new JavaTimeModule())
                     .serializationInclusion(JsonInclude.Include.NON_EMPTY)
                     .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+                    .disable(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE)
                     .build();
     private final ObjectMapper yamlMapper =
             new ObjectMapper(new YAMLFactory().enable(YAMLGenerator.Feature.MINIMIZE_QUOTES));
@@ -371,9 +373,9 @@ void shouldIncludeExplicitSubTypesRegardlessOfFilters() {
                         ""
                                 + "oneOf:"
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/ExplicitlyNamed'"
+                                + "- $ref: \"#/definitions/ExplicitlyNamed\""
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/ImplicitlyNamed'"));
+                                + "- $ref: \"#/definitions/ImplicitlyNamed\""));
 
         assertThat(result.text(), containsString("default: " + explicitType));
         assertThat(result.text(), containsString("default: " + implicitType));
@@ -409,11 +411,11 @@ void shouldIncludeImplicitSubTypesUsingTypeName() {
                         ""
                                 + "oneOf:"
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/ImplicitlyNamed'"
+                                + "- $ref: \"#/definitions/ImplicitlyNamed\""
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/"
+                                + "- $ref: \"#/definitions/"
                                 + explicitType
-                                + "'"));
+                                + "\""));
 
         assertThat(result.text(), containsString("default: " + explicitType));
         assertThat(result.text(), containsString("default: " + implicitType));
@@ -447,11 +449,11 @@ void shouldIncludeImplicitSubTypesUsingSimpleName() {
                         ""
                                 + "oneOf:"
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/"
+                                + "- $ref: \"#/definitions/"
                                 + explicitType
-                                + "'"
+                                + "\""
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/ImplicitlyNamed'"));
+                                + "- $ref: \"#/definitions/ImplicitlyNamed\""));
 
         assertThat(result.text(), containsString("default: " + explicitType));
         assertThat(result.text(), containsString("default: " + implicitType));
@@ -478,9 +480,9 @@ void shouldIncludeImplicitSubTypesUsingClass() {
                 containsString(
                         "oneOf:"
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/the-explicit-name'"
+                                + "- $ref: \"#/definitions/the-explicit-name\""
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/ImplicitlyNamed'"));
+                                + "- $ref: \"#/definitions/ImplicitlyNamed\""));
 
         assertThat(result.text(), containsString("default: " + explicitClass));
         assertThat(result.text(), containsString("default: " + implicitClass));
@@ -507,9 +509,9 @@ void shouldIncludeImplicitSubTypesUsingMinimalClass() {
                 containsString(
                         "oneOf:"
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/the-explicit-name'"
+                                + "- $ref: \"#/definitions/the-explicit-name\""
                                 + lineSeparator()
-                                + "- $ref: '#/definitions/ImplicitlyNamed'"));
+                                + "- $ref: \"#/definitions/ImplicitlyNamed\""));
 
         assertThat(result.text(), containsString("default: " + explicitClass));
         assertThat(result.text(), containsString("default: " + implicitClass));

diff --git a/generator/src/test/resources/schemas/flat/org.creekservice.test.types.Thing.yml b/generator/src/test/resources/schemas/flat/org.creekservice.test.types.Thing.yml
@@ -3,8 +3,8 @@
 $schema: http://json-schema.org/draft-07/schema#
 title: Thing
 oneOf:
-- $ref: '#/definitions/SmallThing'
-- $ref: '#/definitions/big'
+- $ref: "#/definitions/SmallThing"
+- $ref: "#/definitions/big"
 definitions:
   SmallThing:
     type: object

diff --git a/...tor/src/test/resources/schemas/flat/org.creekservice.test.types.more.PolymorphicModel.yml b/...tor/src/test/resources/schemas/flat/org.creekservice.test.types.more.PolymorphicModel.yml
@@ -3,8 +3,8 @@
 $schema: http://json-schema.org/draft-07/schema#
 title: Polymorphic Model
 oneOf:
-- $ref: '#/definitions/SubType1'
-- $ref: '#/definitions/SubType2'
+- $ref: "#/definitions/SubType1"
+- $ref: "#/definitions/SubType2"
 definitions:
   SubType1:
     type: object

diff --git a/generator/src/test/resources/schemas/tree/org/creekservice/test/types/Thing.yml b/generator/src/test/resources/schemas/tree/org/creekservice/test/types/Thing.yml
@@ -3,8 +3,8 @@
 $schema: http://json-schema.org/draft-07/schema#
 title: Thing
 oneOf:
-- $ref: '#/definitions/SmallThing'
-- $ref: '#/definitions/big'
+- $ref: "#/definitions/SmallThing"
+- $ref: "#/definitions/big"
 definitions:
   SmallThing:
     type: object

diff --git a/...tor/src/test/resources/schemas/tree/org/creekservice/test/types/more/PolymorphicModel.yml b/...tor/src/test/resources/schemas/tree/org/creekservice/test/types/more/PolymorphicModel.yml
@@ -3,8 +3,8 @@
 $schema: http://json-schema.org/draft-07/schema#
 title: Polymorphic Model
 oneOf:
-- $ref: '#/definitions/SubType1'
-- $ref: '#/definitions/SubType2'
+- $ref: "#/definitions/SubType1"
+- $ref: "#/definitions/SubType2"
 definitions:
   SubType1:
     type: object