diff --git a/DEPENDENCIES b/DEPENDENCIES index 5758eec2..a1db1eca 100644 --- a/DEPENDENCIES +++ b/DEPENDENCIES @@ -1,3 +1,3 @@ vendorpull /~https://github.com/sourcemeta/vendorpull dea311b5bfb53b6926a4140267959ae334d3ecf4 core /~https://github.com/sourcemeta/core 1257bcddc2797de7c95dedefebf6c2fb1e00717a -jsonschema-test-suite /~https://github.com/json-schema-org/JSON-Schema-Test-Suite c2badb1298a8698f86dadf1aea7b44b3a894e5ac +jsonschema-test-suite /~https://github.com/json-schema-org/JSON-Schema-Test-Suite 4ba013d58e747ecaf48c8bb7cf248cb0d564afbc diff --git a/test/evaluator/officialsuite.cc b/test/evaluator/officialsuite.cc index da2e2476..7051e752 100644 --- a/test/evaluator/officialsuite.cc +++ b/test/evaluator/officialsuite.cc @@ -31,8 +31,20 @@ static auto test_resolver(std::string_view identifier) // We keep an explicit list instead of dynamically reading into the directory // to make sure we are only pulling in the right files + + READ_SCHEMA_FILE("http://localhost:1234/different-id-ref-string.json", + "different-id-ref-string.json") READ_SCHEMA_FILE("http://localhost:1234/integer.json", "integer.json") - READ_SCHEMA_FILE("http://localhost:1234/subSchemas.json", "subSchemas.json") + READ_SCHEMA_FILE("http://localhost:1234/nested-absolute-ref-to-string.json", + "nested-absolute-ref-to-string.json") + READ_SCHEMA_FILE("http://localhost:1234/urn-ref-string.json", + "urn-ref-string.json") + + READ_SCHEMA_FILE("http://localhost:1234/nested/foo-ref-string.json", + std::filesystem::path{"nested"} / "foo-ref-string.json") + READ_SCHEMA_FILE("http://localhost:1234/nested/string.json", + std::filesystem::path{"nested"} / "string.json") + READ_SCHEMA_FILE("http://localhost:1234/baseUriChange/folderInteger.json", std::filesystem::path{"baseUriChange"} / "folderInteger.json") @@ -43,26 +55,7 @@ static auto test_resolver(std::string_view identifier) "http://localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json", std::filesystem::path{"baseUriChangeFolderInSubschema"} / "folderInteger.json") - READ_SCHEMA_FILE("http://localhost:1234/name.json", "name.json") - READ_SCHEMA_FILE( - "http://localhost:1234/locationIndependentIdentifierDraft4.json", - "locationIndependentIdentifierDraft4.json") - READ_SCHEMA_FILE("http://localhost:1234/ref-and-definitions.json", - "ref-and-definitions.json") - READ_SCHEMA_FILE( - "http://localhost:1234/locationIndependentIdentifierPre2019.json", - "locationIndependentIdentifierPre2019.json") - READ_SCHEMA_FILE("http://localhost:1234/nested/foo-ref-string.json", - std::filesystem::path{"nested"} / "foo-ref-string.json") - READ_SCHEMA_FILE("http://localhost:1234/nested/string.json", - std::filesystem::path{"nested"} / "string.json") - READ_SCHEMA_FILE("http://localhost:1234/draft6/detached-ref.json", - std::filesystem::path{"draft6"} / "detached-ref.json") - READ_SCHEMA_FILE("http://localhost:1234/draft7/detached-ref.json", - std::filesystem::path{"draft7"} / "detached-ref.json") - READ_SCHEMA_FILE("http://localhost:1234/draft7/ignore-dependentRequired.json", - std::filesystem::path{"draft7"} / - "ignore-dependentRequired.json") + READ_SCHEMA_FILE( "http://localhost:1234/draft2019-09/metaschema-no-validation.json", std::filesystem::path{"draft2019-09"} / "metaschema-no-validation.json") @@ -101,12 +94,6 @@ static auto test_resolver(std::string_view identifier) READ_SCHEMA_FILE("http://localhost:1234/draft2019-09/nested/string.json", std::filesystem::path{"draft2019-09"} / "nested" / "string.json") - READ_SCHEMA_FILE("http://localhost:1234/different-id-ref-string.json", - "different-id-ref-string.json") - READ_SCHEMA_FILE("http://localhost:1234/urn-ref-string.json", - "urn-ref-string.json") - READ_SCHEMA_FILE("http://localhost:1234/nested-absolute-ref-to-string.json", - "nested-absolute-ref-to-string.json") READ_SCHEMA_FILE("http://localhost:1234/draft2019-09/detached-ref.json", std::filesystem::path{"draft2019-09"} / "detached-ref.json") READ_SCHEMA_FILE("http://localhost:1234/draft2019-09/dependentRequired.json", @@ -115,6 +102,7 @@ static auto test_resolver(std::string_view identifier) READ_SCHEMA_FILE("http://localhost:1234/draft2019-09/ignore-prefixItems.json", std::filesystem::path{"draft2019-09"} / "ignore-prefixItems.json") + READ_SCHEMA_FILE("http://localhost:1234/draft2020-12/prefixItems.json", std::filesystem::path{"draft2020-12"} / "prefixItems.json") READ_SCHEMA_FILE( @@ -171,6 +159,41 @@ static auto test_resolver(std::string_view identifier) std::filesystem::path{"draft2020-12"} / "nested" / "string.json") + READ_SCHEMA_FILE("http://localhost:1234/draft7/detached-ref.json", + std::filesystem::path{"draft7"} / "detached-ref.json") + READ_SCHEMA_FILE("http://localhost:1234/draft7/ignore-dependentRequired.json", + std::filesystem::path{"draft7"} / + "ignore-dependentRequired.json") + READ_SCHEMA_FILE( + "http://localhost:1234/draft7/locationIndependentIdentifier.json", + std::filesystem::path{"draft7"} / "locationIndependentIdentifier.json") + READ_SCHEMA_FILE("http://localhost:1234/draft7/name.json", + std::filesystem::path{"draft7"} / "name.json") + READ_SCHEMA_FILE("http://localhost:1234/draft7/ref-and-definitions.json", + std::filesystem::path{"draft7"} / "ref-and-definitions.json") + READ_SCHEMA_FILE("http://localhost:1234/draft7/subSchemas.json", + std::filesystem::path{"draft7"} / "subSchemas.json") + + READ_SCHEMA_FILE("http://localhost:1234/draft6/detached-ref.json", + std::filesystem::path{"draft6"} / "detached-ref.json") + READ_SCHEMA_FILE( + "http://localhost:1234/draft6/locationIndependentIdentifier.json", + std::filesystem::path{"draft6"} / "locationIndependentIdentifier.json") + READ_SCHEMA_FILE("http://localhost:1234/draft6/name.json", + std::filesystem::path{"draft6"} / "name.json") + READ_SCHEMA_FILE("http://localhost:1234/draft6/ref-and-definitions.json", + std::filesystem::path{"draft6"} / "ref-and-definitions.json") + READ_SCHEMA_FILE("http://localhost:1234/draft6/subSchemas.json", + std::filesystem::path{"draft6"} / "subSchemas.json") + + READ_SCHEMA_FILE( + "http://localhost:1234/draft4/locationIndependentIdentifier.json", + std::filesystem::path{"draft4"} / "locationIndependentIdentifier.json") + READ_SCHEMA_FILE("http://localhost:1234/draft4/name.json", + std::filesystem::path{"draft4"} / "name.json") + READ_SCHEMA_FILE("http://localhost:1234/draft4/subSchemas.json", + std::filesystem::path{"draft4"} / "subSchemas.json") + #undef READ_SCHEMA_FILE return sourcemeta::core::official_resolver(identifier); @@ -299,15 +322,21 @@ int main(int argc, char **argv) { "https://json-schema.org/draft/2020-12/schema", {// TODO: Enable all tests "bignum", "ecmascript-regex", "format-assertion", "non-bmp-regex"}); - register_tests( - std::filesystem::path{"draft2020-12"} / "optional" / "format", - "JSONSchemaOfficialSuite_2020_12_Optional_Format", - "https://json-schema.org/draft/2020-12/schema", - // TODO: Enable all tests - {"date-time", "date", "duration", "email", "hostname", "idn-email", - "idn-hostname", "ipv4", "ipv6", "iri-reference", "iri", "json-pointer", - "regex", "relative-json-pointer", "time", "uri-reference", - "uri-template", "uri", "uuid"}); + register_tests(std::filesystem::path{"draft2020-12"} / "optional" / + "format", + "JSONSchemaOfficialSuite_2020_12_Optional_Format", + "https://json-schema.org/draft/2020-12/schema", + // TODO: Enable all tests + {"date-time", "date", + "duration", "email", + "hostname", "idn-email", + "idn-hostname", "ipv4", + "ipv6", "iri-reference", + "iri", "json-pointer", + "regex", "relative-json-pointer", + "time", "uri-reference", + "uri-template", "uri", + "uuid", "ecmascript-regex"}); // 2019-09 register_tests("draft2019-09", "JSONSchemaOfficialSuite_2019_09", diff --git a/vendor/jsonschema-test-suite/remotes/subSchemas.json b/vendor/jsonschema-test-suite/remotes/draft3/subSchemas.json similarity index 100% rename from vendor/jsonschema-test-suite/remotes/subSchemas.json rename to vendor/jsonschema-test-suite/remotes/draft3/subSchemas.json diff --git a/vendor/jsonschema-test-suite/remotes/locationIndependentIdentifierDraft4.json b/vendor/jsonschema-test-suite/remotes/draft4/locationIndependentIdentifier.json similarity index 100% rename from vendor/jsonschema-test-suite/remotes/locationIndependentIdentifierDraft4.json rename to vendor/jsonschema-test-suite/remotes/draft4/locationIndependentIdentifier.json diff --git a/vendor/jsonschema-test-suite/remotes/name.json b/vendor/jsonschema-test-suite/remotes/draft4/name.json similarity index 100% rename from vendor/jsonschema-test-suite/remotes/name.json rename to vendor/jsonschema-test-suite/remotes/draft4/name.json diff --git a/vendor/jsonschema-test-suite/remotes/draft4/subSchemas.json b/vendor/jsonschema-test-suite/remotes/draft4/subSchemas.json new file mode 100644 index 00000000..6e9b3de3 --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft4/subSchemas.json @@ -0,0 +1,10 @@ +{ + "definitions": { + "integer": { + "type": "integer" + }, + "refToInteger": { + "$ref": "#/definitions/integer" + } + } +} diff --git a/vendor/jsonschema-test-suite/remotes/locationIndependentIdentifierPre2019.json b/vendor/jsonschema-test-suite/remotes/draft6/locationIndependentIdentifier.json similarity index 100% rename from vendor/jsonschema-test-suite/remotes/locationIndependentIdentifierPre2019.json rename to vendor/jsonschema-test-suite/remotes/draft6/locationIndependentIdentifier.json diff --git a/vendor/jsonschema-test-suite/remotes/draft6/name.json b/vendor/jsonschema-test-suite/remotes/draft6/name.json new file mode 100644 index 00000000..fceacb80 --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft6/name.json @@ -0,0 +1,15 @@ +{ + "definitions": { + "orNull": { + "anyOf": [ + { + "type": "null" + }, + { + "$ref": "#" + } + ] + } + }, + "type": "string" +} diff --git a/vendor/jsonschema-test-suite/remotes/ref-and-definitions.json b/vendor/jsonschema-test-suite/remotes/draft6/ref-and-definitions.json similarity index 74% rename from vendor/jsonschema-test-suite/remotes/ref-and-definitions.json rename to vendor/jsonschema-test-suite/remotes/draft6/ref-and-definitions.json index e0ee802a..b80deeb7 100644 --- a/vendor/jsonschema-test-suite/remotes/ref-and-definitions.json +++ b/vendor/jsonschema-test-suite/remotes/draft6/ref-and-definitions.json @@ -1,5 +1,5 @@ { - "$id": "http://localhost:1234/ref-and-definitions.json", + "$id": "http://localhost:1234/draft6/ref-and-definitions.json", "definitions": { "inner": { "properties": { diff --git a/vendor/jsonschema-test-suite/remotes/draft6/subSchemas.json b/vendor/jsonschema-test-suite/remotes/draft6/subSchemas.json new file mode 100644 index 00000000..6e9b3de3 --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft6/subSchemas.json @@ -0,0 +1,10 @@ +{ + "definitions": { + "integer": { + "type": "integer" + }, + "refToInteger": { + "$ref": "#/definitions/integer" + } + } +} diff --git a/vendor/jsonschema-test-suite/remotes/draft7/locationIndependentIdentifier.json b/vendor/jsonschema-test-suite/remotes/draft7/locationIndependentIdentifier.json new file mode 100644 index 00000000..e72815cd --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft7/locationIndependentIdentifier.json @@ -0,0 +1,11 @@ +{ + "definitions": { + "refToInteger": { + "$ref": "#foo" + }, + "A": { + "$id": "#foo", + "type": "integer" + } + } +} diff --git a/vendor/jsonschema-test-suite/remotes/draft7/name.json b/vendor/jsonschema-test-suite/remotes/draft7/name.json new file mode 100644 index 00000000..fceacb80 --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft7/name.json @@ -0,0 +1,15 @@ +{ + "definitions": { + "orNull": { + "anyOf": [ + { + "type": "null" + }, + { + "$ref": "#" + } + ] + } + }, + "type": "string" +} diff --git a/vendor/jsonschema-test-suite/remotes/draft7/ref-and-definitions.json b/vendor/jsonschema-test-suite/remotes/draft7/ref-and-definitions.json new file mode 100644 index 00000000..d5929380 --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft7/ref-and-definitions.json @@ -0,0 +1,11 @@ +{ + "$id": "http://localhost:1234/draft7/ref-and-definitions.json", + "definitions": { + "inner": { + "properties": { + "bar": { "type": "string" } + } + } + }, + "allOf": [ { "$ref": "#/definitions/inner" } ] +} diff --git a/vendor/jsonschema-test-suite/remotes/draft7/subSchemas.json b/vendor/jsonschema-test-suite/remotes/draft7/subSchemas.json new file mode 100644 index 00000000..6e9b3de3 --- /dev/null +++ b/vendor/jsonschema-test-suite/remotes/draft7/subSchemas.json @@ -0,0 +1,10 @@ +{ + "definitions": { + "integer": { + "type": "integer" + }, + "refToInteger": { + "$ref": "#/definitions/integer" + } + } +} diff --git a/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/duration.json b/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/duration.json index 00d5f47a..2d515a64 100644 --- a/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/duration.json +++ b/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/duration.json @@ -46,6 +46,11 @@ "data": "PT1D", "valid": false }, + { + "description": "must start with P", + "data": "4DT12H30M5S", + "valid": false + }, { "description": "no elements present", "data": "P", diff --git a/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/hostname.json b/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/hostname.json index f3b7181c..9db7c967 100644 --- a/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/hostname.json @@ -120,6 +120,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/idn-hostname.json b/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/idn-hostname.json index e8649ec2..05bff0df 100644 --- a/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/idn-hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft2019-09/optional/format/idn-hostname.json @@ -326,6 +326,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/ecmascript-regex.json b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/ecmascript-regex.json index 23b962e4..a4d62e0c 100644 --- a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/ecmascript-regex.json +++ b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/ecmascript-regex.json @@ -405,20 +405,6 @@ } ] }, - { - "description": "\\a is not an ECMA 262 control escape", - "schema": { - "$schema": "https://json-schema.org/draft/2020-12/schema", - "$ref": "https://json-schema.org/draft/2020-12/schema" - }, - "tests": [ - { - "description": "when used as a pattern", - "data": { "pattern": "\\a" }, - "valid": false - } - ] - }, { "description": "pattern with non-ASCII digits", "schema": { diff --git a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/duration.json b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/duration.json index a3af56ef..a09fec5e 100644 --- a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/duration.json +++ b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/duration.json @@ -46,6 +46,11 @@ "data": "PT1D", "valid": false }, + { + "description": "must start with P", + "data": "4DT12H30M5S", + "valid": false + }, { "description": "no elements present", "data": "P", diff --git a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/ecmascript-regex.json b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/ecmascript-regex.json new file mode 100644 index 00000000..b0648084 --- /dev/null +++ b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/ecmascript-regex.json @@ -0,0 +1,16 @@ +[ + { + "description": "\\a is not an ECMA 262 control escape", + "schema": { + "$schema": "https://json-schema.org/draft/2020-12/schema", + "format": "regex" + }, + "tests": [ + { + "description": "when used as a pattern", + "data": "\\a", + "valid": false + } + ] + } +] \ No newline at end of file diff --git a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/hostname.json b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/hostname.json index 41418dd4..0e00af2c 100644 --- a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/hostname.json @@ -120,6 +120,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/idn-hostname.json b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/idn-hostname.json index 1df732af..30a0f494 100644 --- a/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/idn-hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft2020-12/optional/format/idn-hostname.json @@ -326,6 +326,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft4/optional/format/hostname.json b/vendor/jsonschema-test-suite/tests/draft4/optional/format/hostname.json index a8ecd194..d7c72a7f 100644 --- a/vendor/jsonschema-test-suite/tests/draft4/optional/format/hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft4/optional/format/hostname.json @@ -112,6 +112,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft4/refRemote.json b/vendor/jsonschema-test-suite/tests/draft4/refRemote.json index 64a618b8..65e45190 100644 --- a/vendor/jsonschema-test-suite/tests/draft4/refRemote.json +++ b/vendor/jsonschema-test-suite/tests/draft4/refRemote.json @@ -17,7 +17,7 @@ }, { "description": "fragment within remote ref", - "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"}, + "schema": {"$ref": "http://localhost:1234/draft4/subSchemas.json#/definitions/integer"}, "tests": [ { "description": "remote fragment valid", @@ -34,7 +34,7 @@ { "description": "ref within remote ref", "schema": { - "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger" + "$ref": "http://localhost:1234/draft4/subSchemas.json#/definitions/refToInteger" }, "tests": [ { @@ -139,7 +139,7 @@ "id": "http://localhost:1234/object", "type": "object", "properties": { - "name": {"$ref": "name.json#/definitions/orNull"} + "name": {"$ref": "draft4/name.json#/definitions/orNull"} } }, "tests": [ @@ -171,7 +171,7 @@ { "description": "Location-independent identifier in remote ref", "schema": { - "$ref": "http://localhost:1234/locationIndependentIdentifierDraft4.json#/definitions/refToInteger" + "$ref": "http://localhost:1234/draft4/locationIndependentIdentifier.json#/definitions/refToInteger" }, "tests": [ { diff --git a/vendor/jsonschema-test-suite/tests/draft6/optional/format/hostname.json b/vendor/jsonschema-test-suite/tests/draft6/optional/format/hostname.json index a8ecd194..d7c72a7f 100644 --- a/vendor/jsonschema-test-suite/tests/draft6/optional/format/hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft6/optional/format/hostname.json @@ -112,6 +112,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft6/refRemote.json b/vendor/jsonschema-test-suite/tests/draft6/refRemote.json index 28459c4a..49ead6d1 100644 --- a/vendor/jsonschema-test-suite/tests/draft6/refRemote.json +++ b/vendor/jsonschema-test-suite/tests/draft6/refRemote.json @@ -17,7 +17,7 @@ }, { "description": "fragment within remote ref", - "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"}, + "schema": {"$ref": "http://localhost:1234/draft6/subSchemas.json#/definitions/integer"}, "tests": [ { "description": "remote fragment valid", @@ -34,7 +34,7 @@ { "description": "ref within remote ref", "schema": { - "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger" + "$ref": "http://localhost:1234/draft6/subSchemas.json#/definitions/refToInteger" }, "tests": [ { @@ -139,7 +139,7 @@ "$id": "http://localhost:1234/object", "type": "object", "properties": { - "name": {"$ref": "name.json#/definitions/orNull"} + "name": {"$ref": "draft6/name.json#/definitions/orNull"} } }, "tests": [ @@ -173,7 +173,7 @@ "schema": { "$id": "http://localhost:1234/schema-remote-ref-ref-defs1.json", "allOf": [ - { "$ref": "ref-and-definitions.json" } + { "$ref": "draft6/ref-and-definitions.json" } ] }, "tests": [ @@ -196,7 +196,7 @@ { "description": "Location-independent identifier in remote ref", "schema": { - "$ref": "http://localhost:1234/locationIndependentIdentifierPre2019.json#/definitions/refToInteger" + "$ref": "http://localhost:1234/draft6/locationIndependentIdentifier.json#/definitions/refToInteger" }, "tests": [ { diff --git a/vendor/jsonschema-test-suite/tests/draft7/optional/format/hostname.json b/vendor/jsonschema-test-suite/tests/draft7/optional/format/hostname.json index a8ecd194..d7c72a7f 100644 --- a/vendor/jsonschema-test-suite/tests/draft7/optional/format/hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft7/optional/format/hostname.json @@ -112,6 +112,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft7/optional/format/idn-hostname.json b/vendor/jsonschema-test-suite/tests/draft7/optional/format/idn-hostname.json index 76b35619..068470ea 100644 --- a/vendor/jsonschema-test-suite/tests/draft7/optional/format/idn-hostname.json +++ b/vendor/jsonschema-test-suite/tests/draft7/optional/format/idn-hostname.json @@ -318,6 +318,11 @@ "description": "single label ending with digit", "data": "hostnam3", "valid": true + }, + { + "description": "empty string", + "data": "", + "valid": false } ] } diff --git a/vendor/jsonschema-test-suite/tests/draft7/refRemote.json b/vendor/jsonschema-test-suite/tests/draft7/refRemote.json index 22185d67..450787af 100644 --- a/vendor/jsonschema-test-suite/tests/draft7/refRemote.json +++ b/vendor/jsonschema-test-suite/tests/draft7/refRemote.json @@ -17,7 +17,7 @@ }, { "description": "fragment within remote ref", - "schema": {"$ref": "http://localhost:1234/subSchemas.json#/definitions/integer"}, + "schema": {"$ref": "http://localhost:1234/draft7/subSchemas.json#/definitions/integer"}, "tests": [ { "description": "remote fragment valid", @@ -34,7 +34,7 @@ { "description": "ref within remote ref", "schema": { - "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger" + "$ref": "http://localhost:1234/draft7/subSchemas.json#/definitions/refToInteger" }, "tests": [ { @@ -139,7 +139,7 @@ "$id": "http://localhost:1234/object", "type": "object", "properties": { - "name": {"$ref": "name.json#/definitions/orNull"} + "name": {"$ref": "draft7/name.json#/definitions/orNull"} } }, "tests": [ @@ -173,7 +173,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": [ @@ -196,7 +196,7 @@ { "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": [ {