From 7e79215965feef01bf9d7fdb021f9097d7fe9ae2 Mon Sep 17 00:00:00 2001 From: harrel56 Date: Tue, 15 Oct 2024 15:14:29 +0000 Subject: [PATCH] chore(test-suite): regenerate YAML test suite --- .../suite-yaml/remotes/{ => draft3}/subSchemas.yml | 0 .../locationIndependentIdentifier.yml} | 0 .../resources/suite-yaml/remotes/{ => draft4}/name.yml | 0 .../resources/suite-yaml/remotes/draft4/subSchemas.yml | 5 +++++ .../locationIndependentIdentifier.yml} | 0 src/test/resources/suite-yaml/remotes/draft7/name.yml | 6 ++++++ .../remotes/{ => draft7}/ref-and-definitions.yml | 2 +- .../resources/suite-yaml/remotes/draft7/subSchemas.yml | 5 +++++ .../resources/suite-yaml/tests/draft7/refRemote.yml | 10 +++++----- 9 files changed, 22 insertions(+), 6 deletions(-) rename src/test/resources/suite-yaml/remotes/{ => draft3}/subSchemas.yml (100%) rename src/test/resources/suite-yaml/remotes/{locationIndependentIdentifierDraft4.yml => draft4/locationIndependentIdentifier.yml} (100%) rename src/test/resources/suite-yaml/remotes/{ => draft4}/name.yml (100%) create mode 100644 src/test/resources/suite-yaml/remotes/draft4/subSchemas.yml rename src/test/resources/suite-yaml/remotes/{locationIndependentIdentifierPre2019.yml => draft7/locationIndependentIdentifier.yml} (100%) create mode 100644 src/test/resources/suite-yaml/remotes/draft7/name.yml rename src/test/resources/suite-yaml/remotes/{ => draft7}/ref-and-definitions.yml (64%) create mode 100644 src/test/resources/suite-yaml/remotes/draft7/subSchemas.yml diff --git a/src/test/resources/suite-yaml/remotes/subSchemas.yml b/src/test/resources/suite-yaml/remotes/draft3/subSchemas.yml similarity index 100% rename from src/test/resources/suite-yaml/remotes/subSchemas.yml rename to src/test/resources/suite-yaml/remotes/draft3/subSchemas.yml diff --git a/src/test/resources/suite-yaml/remotes/locationIndependentIdentifierDraft4.yml b/src/test/resources/suite-yaml/remotes/draft4/locationIndependentIdentifier.yml similarity index 100% rename from src/test/resources/suite-yaml/remotes/locationIndependentIdentifierDraft4.yml rename to src/test/resources/suite-yaml/remotes/draft4/locationIndependentIdentifier.yml diff --git a/src/test/resources/suite-yaml/remotes/name.yml b/src/test/resources/suite-yaml/remotes/draft4/name.yml similarity index 100% rename from src/test/resources/suite-yaml/remotes/name.yml rename to src/test/resources/suite-yaml/remotes/draft4/name.yml diff --git a/src/test/resources/suite-yaml/remotes/draft4/subSchemas.yml b/src/test/resources/suite-yaml/remotes/draft4/subSchemas.yml new file mode 100644 index 00000000..a1004577 --- /dev/null +++ b/src/test/resources/suite-yaml/remotes/draft4/subSchemas.yml @@ -0,0 +1,5 @@ +definitions: + integer: + type: integer + refToInteger: + $ref: '#/definitions/integer' diff --git a/src/test/resources/suite-yaml/remotes/locationIndependentIdentifierPre2019.yml b/src/test/resources/suite-yaml/remotes/draft7/locationIndependentIdentifier.yml similarity index 100% rename from src/test/resources/suite-yaml/remotes/locationIndependentIdentifierPre2019.yml rename to src/test/resources/suite-yaml/remotes/draft7/locationIndependentIdentifier.yml diff --git a/src/test/resources/suite-yaml/remotes/draft7/name.yml b/src/test/resources/suite-yaml/remotes/draft7/name.yml new file mode 100644 index 00000000..97ae817c --- /dev/null +++ b/src/test/resources/suite-yaml/remotes/draft7/name.yml @@ -0,0 +1,6 @@ +definitions: + orNull: + anyOf: + - type: "null" + - $ref: '#' +type: string diff --git a/src/test/resources/suite-yaml/remotes/ref-and-definitions.yml b/src/test/resources/suite-yaml/remotes/draft7/ref-and-definitions.yml similarity index 64% rename from src/test/resources/suite-yaml/remotes/ref-and-definitions.yml rename to src/test/resources/suite-yaml/remotes/draft7/ref-and-definitions.yml index 76c7c44e..02f1c753 100644 --- a/src/test/resources/suite-yaml/remotes/ref-and-definitions.yml +++ b/src/test/resources/suite-yaml/remotes/draft7/ref-and-definitions.yml @@ -1,4 +1,4 @@ -$id: http://localhost:1234/ref-and-definitions.json +$id: http://localhost:1234/draft7/ref-and-definitions.json definitions: inner: properties: diff --git a/src/test/resources/suite-yaml/remotes/draft7/subSchemas.yml b/src/test/resources/suite-yaml/remotes/draft7/subSchemas.yml new file mode 100644 index 00000000..a1004577 --- /dev/null +++ b/src/test/resources/suite-yaml/remotes/draft7/subSchemas.yml @@ -0,0 +1,5 @@ +definitions: + integer: + type: integer + refToInteger: + $ref: '#/definitions/integer' diff --git a/src/test/resources/suite-yaml/tests/draft7/refRemote.yml b/src/test/resources/suite-yaml/tests/draft7/refRemote.yml index bb2708cd..9170eb65 100644 --- a/src/test/resources/suite-yaml/tests/draft7/refRemote.yml +++ b/src/test/resources/suite-yaml/tests/draft7/refRemote.yml @@ -10,7 +10,7 @@ valid: false - description: fragment within remote ref schema: - $ref: http://localhost:1234/subSchemas.json#/definitions/integer + $ref: http://localhost:1234/draft7/subSchemas.json#/definitions/integer tests: - description: remote fragment valid data: 1 @@ -20,7 +20,7 @@ valid: false - description: ref within remote ref schema: - $ref: http://localhost:1234/subSchemas.json#/definitions/refToInteger + $ref: http://localhost:1234/draft7/subSchemas.json#/definitions/refToInteger tests: - description: ref within ref valid data: 1 @@ -100,7 +100,7 @@ type: object properties: name: - $ref: name.json#/definitions/orNull + $ref: draft7/name.json#/definitions/orNull tests: - description: string is valid data: @@ -119,7 +119,7 @@ schema: $id: http://localhost:1234/schema-remote-ref-ref-defs1.json allOf: - - $ref: ref-and-definitions.json + - $ref: draft7/ref-and-definitions.json tests: - description: invalid data: @@ -131,7 +131,7 @@ valid: true - description: Location-independent identifier in remote ref schema: - $ref: http://localhost:1234/locationIndependentIdentifierPre2019.json#/definitions/refToInteger + $ref: http://localhost:1234/draft7/locationIndependentIdentifier.json#/definitions/refToInteger tests: - description: integer is valid data: 1