diff --git a/src/string-format-check.cpp b/src/string-format-check.cpp index 28a818c..d48db19 100644 --- a/src/string-format-check.cpp +++ b/src/string-format-check.cpp @@ -61,9 +61,9 @@ void rfc3339_time_check(const std::string &value) throw std::invalid_argument(value + " is not a time string according to RFC 3339."); } - const auto hour = std::stoi(matches[1].str()); - const auto minute = std::stoi(matches[2].str()); - const auto second = std::stoi(matches[3].str()); + auto hour = std::stoi(matches[1].str()); + auto minute = std::stoi(matches[2].str()); + auto second = std::stoi(matches[3].str()); // const auto secfrac = std::stof( matches[4].str() ); range_check(hour, 0, 23); @@ -79,6 +79,8 @@ void rfc3339_time_check(const std::string &value) range_check(offsetHour, -23, 23); range_check(offsetMinute, 0, 59); + if (offsetHour < 0) + offsetMinute *= -1; } /** @@ -86,7 +88,14 @@ void rfc3339_time_check(const std::string &value) * correct maximum in {58,59,60}. This current solution might match some invalid dates * but it won't lead to false negatives. This only works if we know the full date, however */ - if (((hour - offsetHour) % 24) == 23 && ((minute - offsetMinute) % 60) == 59) + + auto day_minutes = hour * 60 + minute - (offsetHour * 60 + offsetMinute); + if (day_minutes < 0) + day_minutes += 60 * 24; + hour = day_minutes % 24; + minute = day_minutes / 24; + + if (hour == 23 && minute == 59) range_check(second, 0, 60); // possible leap-second else range_check(second, 0, 59); diff --git a/test/JSON-Schema-Test-Suite/CMakeLists.txt b/test/JSON-Schema-Test-Suite/CMakeLists.txt index d0d502a..237254e 100644 --- a/test/JSON-Schema-Test-Suite/CMakeLists.txt +++ b/test/JSON-Schema-Test-Suite/CMakeLists.txt @@ -50,7 +50,6 @@ if(JSON_SCHEMA_TEST_SUITE_PATH) # some optional tests will fail set_tests_properties( JSON-Suite::Optional::bignum - JSON-Suite::Optional::zeroTerminatedFloats JSON-Suite::Optional::non-bmp-regex JSON-Suite::Optional::float-overflow @@ -64,6 +63,7 @@ if(JSON_SCHEMA_TEST_SUITE_PATH) JSON-Suite::Optional::Format::uri-reference JSON-Suite::Optional::Format::uri-template JSON-Suite::Optional::Format::uri + JSON-Suite::Optional::unicode PROPERTIES WILL_FAIL ON) diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/contains.json b/test/JSON-Schema-Test-Suite/tests/draft7/contains.json index c5471cc..215da98 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/contains.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/contains.json @@ -125,5 +125,26 @@ "valid": false } ] + }, + { + "description": "contains with false if subschema", + "schema": { + "contains": { + "if": false, + "else": true + } + }, + "tests": [ + { + "description": "any non-empty array is valid", + "data": ["foo"], + "valid": true + }, + { + "description": "empty array is invalid", + "data": [], + "valid": false + } + ] } ] diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/format.json b/test/JSON-Schema-Test-Suite/tests/draft7/format.json index 93305f5..e2447d6 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/format.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/format.json @@ -1,611 +1,611 @@ [ { - "description": "validation of e-mail addresses", - "schema": {"format": "email"}, + "description": "email format", + "schema": { "format": "email" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of IDN e-mail addresses", - "schema": {"format": "idn-email"}, + "description": "idn-email format", + "schema": { "format": "idn-email" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of regexes", - "schema": {"format": "regex"}, + "description": "regex format", + "schema": { "format": "regex" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of IP addresses", - "schema": {"format": "ipv4"}, + "description": "ipv4 format", + "schema": { "format": "ipv4" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of IPv6 addresses", - "schema": {"format": "ipv6"}, + "description": "ipv6 format", + "schema": { "format": "ipv6" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of IDN hostnames", - "schema": {"format": "idn-hostname"}, + "description": "idn-hostname format", + "schema": { "format": "idn-hostname" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of hostnames", - "schema": {"format": "hostname"}, + "description": "hostname format", + "schema": { "format": "hostname" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of date strings", - "schema": {"format": "date"}, + "description": "date format", + "schema": { "format": "date" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of date-time strings", - "schema": {"format": "date-time"}, + "description": "date-time format", + "schema": { "format": "date-time" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of time strings", - "schema": {"format": "time"}, + "description": "time format", + "schema": { "format": "time" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of JSON pointers", - "schema": {"format": "json-pointer"}, + "description": "json-pointer format", + "schema": { "format": "json-pointer" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of relative JSON pointers", - "schema": {"format": "relative-json-pointer"}, + "description": "relative-json-pointer format", + "schema": { "format": "relative-json-pointer" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of IRIs", - "schema": {"format": "iri"}, + "description": "iri format", + "schema": { "format": "iri" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of IRI references", - "schema": {"format": "iri-reference"}, + "description": "iri-reference format", + "schema": { "format": "iri-reference" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of URIs", - "schema": {"format": "uri"}, + "description": "uri format", + "schema": { "format": "uri" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of URI references", - "schema": {"format": "uri-reference"}, + "description": "uri-reference format", + "schema": { "format": "uri-reference" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } ] }, { - "description": "validation of URI templates", - "schema": {"format": "uri-template"}, + "description": "uri-template format", + "schema": { "format": "uri-template" }, "tests": [ { - "description": "ignores integers", + "description": "all string formats ignore integers", "data": 12, "valid": true }, { - "description": "ignores floats", + "description": "all string formats ignore floats", "data": 13.7, "valid": true }, { - "description": "ignores objects", + "description": "all string formats ignore objects", "data": {}, "valid": true }, { - "description": "ignores arrays", + "description": "all string formats ignore arrays", "data": [], "valid": true }, { - "description": "ignores booleans", + "description": "all string formats ignore booleans", "data": false, "valid": true }, { - "description": "ignores null", + "description": "all string formats ignore nulls", "data": null, "valid": true } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/bignum.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/bignum.json index fac275e..3f49226 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/bignum.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/bignum.json @@ -1,30 +1,13 @@ [ { "description": "integer", - "schema": {"type": "integer"}, + "schema": { "type": "integer" }, "tests": [ { "description": "a bignum is an integer", "data": 12345678910111213141516171819202122232425262728293031, "valid": true - } - ] - }, - { - "description": "number", - "schema": {"type": "number"}, - "tests": [ - { - "description": "a bignum is a number", - "data": 98249283749234923498293171823948729348710298301928331, - "valid": true - } - ] - }, - { - "description": "integer", - "schema": {"type": "integer"}, - "tests": [ + }, { "description": "a negative bignum is an integer", "data": -12345678910111213141516171819202122232425262728293031, @@ -34,8 +17,13 @@ }, { "description": "number", - "schema": {"type": "number"}, + "schema": { "type": "number" }, "tests": [ + { + "description": "a bignum is a number", + "data": 98249283749234923498293171823948729348710298301928331, + "valid": true + }, { "description": "a negative bignum is a number", "data": -98249283749234923498293171823948729348710298301928331, @@ -45,7 +33,7 @@ }, { "description": "string", - "schema": {"type": "string"}, + "schema": { "type": "string" }, "tests": [ { "description": "a bignum is not a string", @@ -56,7 +44,7 @@ }, { "description": "integer comparison", - "schema": {"maximum": 18446744073709551615}, + "schema": { "maximum": 18446744073709551615 }, "tests": [ { "description": "comparison works for high numbers", @@ -80,7 +68,7 @@ }, { "description": "integer comparison", - "schema": {"minimum": -18446744073709551615}, + "schema": { "minimum": -18446744073709551615 }, "tests": [ { "description": "comparison works for very negative numbers", diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/ecmascript-regex.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/ecmascript-regex.json index 6ed6cbe..fb02e99 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/ecmascript-regex.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/ecmascript-regex.json @@ -8,7 +8,7 @@ "tests": [ { "description": "matches in Python, but should not in jsonschema", - "data": "abc\n", + "data": "abc\\n", "valid": false }, { diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date-time.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date-time.json index 900fcb7..5f911ef 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date-time.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date-time.json @@ -57,6 +57,16 @@ "description": "invalid non-padded day dates", "data": "1963-06-1T08:30:06.283185Z", "valid": false + }, + { + "description": "non-ascii digits should be rejected in the date portion", + "data": "1963-06-1৪T00:00:00Z", + "valid": false + }, + { + "description": "non-ascii digits should be rejected in the time portion", + "data": "1963-06-11T0৪:00:00Z", + "valid": false } ] } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date.json index 453b51d..6cc2feb 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/date.json @@ -9,7 +9,142 @@ "valid": true }, { - "description": "an invalid date-time string", + "description": "a valid date string with 31 days in January", + "data": "2020-01-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in January", + "data": "2020-01-32", + "valid": false + }, + { + "description": "a valid date string with 28 days in February (normal)", + "data": "2021-02-28", + "valid": true + }, + { + "description": "a invalid date string with 29 days in February (normal)", + "data": "2021-02-29", + "valid": false + }, + { + "description": "a valid date string with 29 days in February (leap)", + "data": "2020-02-29", + "valid": true + }, + { + "description": "a invalid date string with 30 days in February (leap)", + "data": "2020-02-30", + "valid": false + }, + { + "description": "a valid date string with 31 days in March", + "data": "2020-03-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in March", + "data": "2020-03-32", + "valid": false + }, + { + "description": "a valid date string with 30 days in April", + "data": "2020-04-30", + "valid": true + }, + { + "description": "a invalid date string with 31 days in April", + "data": "2020-04-31", + "valid": false + }, + { + "description": "a valid date string with 31 days in May", + "data": "2020-05-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in May", + "data": "2020-05-32", + "valid": false + }, + { + "description": "a valid date string with 30 days in June", + "data": "2020-06-30", + "valid": true + }, + { + "description": "a invalid date string with 31 days in June", + "data": "2020-06-31", + "valid": false + }, + { + "description": "a valid date string with 31 days in July", + "data": "2020-07-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in July", + "data": "2020-07-32", + "valid": false + }, + { + "description": "a valid date string with 31 days in August", + "data": "2020-08-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in August", + "data": "2020-08-32", + "valid": false + }, + { + "description": "a valid date string with 30 days in September", + "data": "2020-09-30", + "valid": true + }, + { + "description": "a invalid date string with 31 days in September", + "data": "2020-09-31", + "valid": false + }, + { + "description": "a valid date string with 31 days in October", + "data": "2020-10-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in October", + "data": "2020-10-32", + "valid": false + }, + { + "description": "a valid date string with 30 days in November", + "data": "2020-11-30", + "valid": true + }, + { + "description": "a invalid date string with 31 days in November", + "data": "2020-11-31", + "valid": false + }, + { + "description": "a valid date string with 31 days in December", + "data": "2020-12-31", + "valid": true + }, + { + "description": "a invalid date string with 32 days in December", + "data": "2020-12-32", + "valid": false + }, + { + "description": "a invalid date string with invalid month", + "data": "2020-13-01", + "valid": false + }, + { + "description": "an invalid date string", "data": "06/19/1963", "valid": false }, @@ -19,14 +154,39 @@ "valid": false }, { - "description": "invalidates non-padded month dates", + "description": "non-padded month dates are not valid", "data": "1998-1-20", "valid": false }, { - "description": "invalidates non-padded day dates", + "description": "non-padded day dates are not valid", "data": "1998-01-1", "valid": false + }, + { + "description": "invalid month", + "data": "1998-13-01", + "valid": false + }, + { + "description": "invalid month-day combination", + "data": "1998-04-31", + "valid": false + }, + { + "description": "2021 is not a leap year", + "data": "2021-02-29", + "valid": false + }, + { + "description": "2020 is a leap year", + "data": "2020-02-29", + "valid": true + }, + { + "description": "non-ascii digits should be rejected", + "data": "1963-06-1৪", + "valid": false } ] } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv4.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv4.json index e36a381..4d10927 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv4.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv4.json @@ -43,6 +43,11 @@ "description": "value without leading zero is valid", "data": "87.10.0.1", "valid": true + }, + { + "description": "non-ascii digits should be rejected", + "data": "1২7.0.0.1", + "valid": false } ] } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv6.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv6.json index 2a08cb4..cf629c6 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv6.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/ipv6.json @@ -147,6 +147,16 @@ "description": "a long invalid ipv6, below length limit, second", "data": "100:100:100:100:100:100:100:255.255.255.255", "valid": false + }, + { + "description": "non-ascii digits should be rejected", + "data": "1:2:3:4:5:6:7:৪", + "valid": false + }, + { + "description": "non-ascii digits should be rejected in the ipv4 portion also", + "data": "1:2::192.16৪.0.1", + "valid": false } ] } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/relative-json-pointer.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/relative-json-pointer.json index 17816c9..22fb14e 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/relative-json-pointer.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/relative-json-pointer.json @@ -32,6 +32,21 @@ "description": "negative prefix", "data": "-1/foo/bar", "valid": false + }, + { + "description": "## is not a valid json-pointer", + "data": "0##", + "valid": false + }, + { + "description": "zero cannot be followed by other digits, plus json-pointer", + "data": "01/a", + "valid": false + }, + { + "description": "zero cannot be followed by other digits, plus octothorpe", + "data": "01#", + "valid": false } ] } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/time.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/time.json index 74e8bf9..0a8da0e 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/time.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/format/time.json @@ -9,15 +9,75 @@ "valid": true }, { - "description": "a valid time string with leap second", + "description": "a valid time string with leap second, Zulu", "data": "23:59:60Z", "valid": true }, { - "description": "a valid time string with leap second with offset", + "description": "invalid leap second, Zulu (wrong hour)", + "data": "22:59:60Z", + "valid": false + }, + { + "description": "invalid leap second, Zulu (wrong minute)", + "data": "23:58:60Z", + "valid": false + }, + { + "description": "valid leap second, zero time-offset", + "data": "23:59:60+00:00", + "valid": true + }, + { + "description": "invalid leap second, zero time-offset (wrong hour)", + "data": "22:59:60+00:00", + "valid": false + }, + { + "description": "invalid leap second, zero time-offset (wrong minute)", + "data": "23:58:60+00:00", + "valid": false + }, + { + "description": "valid leap second, positive time-offset", + "data": "01:29:60+01:30", + "valid": true + }, + { + "description": "valid leap second, large positive time-offset", + "data": "23:29:60+23:30", + "valid": true + }, + { + "description": "invalid leap second, positive time-offset (wrong hour)", + "data": "23:59:60+01:00", + "valid": false + }, + { + "description": "invalid leap second, positive time-offset (wrong minute)", + "data": "23:59:60+00:30", + "valid": false + }, + { + "description": "valid leap second, negative time-offset", "data": "15:59:60-08:00", "valid": true }, + { + "description": "valid leap second, large negative time-offset", + "data": "00:29:60-23:30", + "valid": true + }, + { + "description": "invalid leap second, negative time-offset (wrong hour)", + "data": "23:59:60-01:00", + "valid": false + }, + { + "description": "invalid leap second, negative time-offset (wrong minute)", + "data": "23:59:60-00:30", + "valid": false + }, { "description": "a valid time string with second fraction", "data": "23:20:50.52Z", @@ -84,7 +144,7 @@ "valid": false }, { - "description": "an invalid time string", + "description": "an invalid offset indicator", "data": "08:30:06 PST", "valid": false }, @@ -92,6 +152,16 @@ "description": "only RFC3339 not all of ISO 8601 are valid", "data": "01:01:01,1111", "valid": false + }, + { + "description": "no time offset", + "data": "12:00:00", + "valid": false + }, + { + "description": "non-ascii digits should be rejected", + "data": "1২:00:00Z", + "valid": false } ] } diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/unicode.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/unicode.json new file mode 100644 index 0000000..1dc5940 --- /dev/null +++ b/test/JSON-Schema-Test-Suite/tests/draft7/optional/unicode.json @@ -0,0 +1,146 @@ +[ + { + "description": "unicode semantics should be used for all pattern matching", + "schema": { "pattern": "\\wcole" }, + "tests": [ + { + "description": "literal unicode character in json string", + "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", + "valid": true + }, + { + "description": "unicode character in hex format in string", + "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.", + "valid": true + }, + { + "description": "unicode matching is case-sensitive", + "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.", + "valid": false + } + ] + }, + { + "description": "unicode characters do not match ascii ranges", + "schema": { "pattern": "[a-z]cole" }, + "tests": [ + { + "description": "literal unicode character in json string", + "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", + "valid": false + }, + { + "description": "unicode character in hex format in string", + "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'\u00e9cole, l'église et la patinoire; mais la vraie vie était sur la patinoire.", + "valid": false + }, + { + "description": "ascii characters match", + "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.", + "valid": true + } + ] + }, + { + "description": "unicode digits are more than 0 through 9", + "schema": { "pattern": "^\\d+$" }, + "tests": [ + { + "description": "ascii digits", + "data": "42", + "valid": true + }, + { + "description": "ascii non-digits", + "data": "-%#", + "valid": false + }, + { + "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)", + "data": "৪২", + "valid": true + } + ] + }, + { + "description": "unicode semantics should be used for all patternProperties matching", + "schema": { + "type": "object", + "patternProperties": { + "\\wcole": true + }, + "additionalProperties": false + }, + "tests": [ + { + "description": "literal unicode character in json string", + "data": { "l'école": "pas de vraie vie" }, + "valid": true + }, + { + "description": "unicode character in hex format in string", + "data": { "l'\u00e9cole": "pas de vraie vie" }, + "valid": true + }, + { + "description": "unicode matching is case-sensitive", + "data": { "L'ÉCOLE": "PAS DE VRAIE VIE" }, + "valid": false + } + ] + }, + { + "description": "unicode characters do not match ascii ranges", + "schema": { + "type": "object", + "patternProperties": { + "[a-z]cole": true + }, + "additionalProperties": false + }, + "tests": [ + { + "description": "literal unicode character in json string", + "data": { "l'école": "pas de vraie vie" }, + "valid": false + }, + { + "description": "unicode character in hex format in string", + "data": { "l'\u00e9cole": "pas de vraie vie" }, + "valid": false + }, + { + "description": "ascii characters match", + "data": { "l'ecole": "pas de vraie vie" }, + "valid": true + } + ] + }, + { + "description": "unicode digits are more than 0 through 9", + "schema": { + "type": "object", + "patternProperties": { + "^\\d+$": true + }, + "additionalProperties": false + }, + "tests": [ + { + "description": "ascii digits", + "data": { "42": "life, the universe, and everything" }, + "valid": true + }, + { + "description": "ascii non-digits", + "data": { "-%#": "spending the year dead for tax reasons" }, + "valid": false + }, + { + "description": "non-ascii digits (BENGALI DIGIT FOUR, BENGALI DIGIT TWO)", + "data": { "৪২": "khajit has wares if you have coin" }, + "valid": true + } + ] + } +] diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/optional/zeroTerminatedFloats.json b/test/JSON-Schema-Test-Suite/tests/draft7/optional/zeroTerminatedFloats.json deleted file mode 100644 index 1bcdf96..0000000 --- a/test/JSON-Schema-Test-Suite/tests/draft7/optional/zeroTerminatedFloats.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "description": "some languages do not distinguish between different types of numeric value", - "schema": { - "type": "integer" - }, - "tests": [ - { - "description": "a float without fractional part is an integer", - "data": 1.0, - "valid": true - } - ] - } -] diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/propertyNames.json b/test/JSON-Schema-Test-Suite/tests/draft7/propertyNames.json index 8423690..f0788e6 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/propertyNames.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/propertyNames.json @@ -43,6 +43,35 @@ } ] }, + { + "description": "propertyNames validation with pattern", + "schema": { + "propertyNames": { "pattern": "^a+$" } + }, + "tests": [ + { + "description": "matching property names valid", + "data": { + "a": {}, + "aa": {}, + "aaa": {} + }, + "valid": true + }, + { + "description": "non-matching property name is invalid", + "data": { + "aaA": {} + }, + "valid": false + }, + { + "description": "object without properties is valid", + "data": {}, + "valid": true + } + ] + }, { "description": "propertyNames with boolean schema true", "schema": {"propertyNames": true}, diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/ref.json b/test/JSON-Schema-Test-Suite/tests/draft7/ref.json index 406ae16..ff98d79 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/ref.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/ref.json @@ -175,6 +175,42 @@ } ] }, + { + "description": "$ref prevents a sibling $id from changing the base uri", + "schema": { + "$id": "http://localhost:1234/sibling_id/base/", + "definitions": { + "foo": { + "$id": "http://localhost:1234/sibling_id/foo.json", + "minimum": 2 + }, + "base_foo": { + "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json", + "$id": "foo.json", + "minimum": 5 + } + }, + "allOf": [ + { + "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not ttp://localhost:1234/sibling_id/foo.json", + "$id": "http://localhost:1234/sibling_id/", + "$ref": "foo.json" + } + ] + }, + "tests": [ + { + "description": "$ref resolves to /definitions/foo, data validates", + "data": 10, + "valid": true + }, + { + "description": "$ref resolves to /definitions/foo, data does not validate", + "data": 1, + "valid": false + } + ] + }, { "description": "remote ref, containing refs itself", "schema": {"$ref": "http://json-schema.org/draft-07/schema#"}, diff --git a/test/JSON-Schema-Test-Suite/tests/draft7/refRemote.json b/test/JSON-Schema-Test-Suite/tests/draft7/refRemote.json index 9d8057b..a2221b2 100644 --- a/test/JSON-Schema-Test-Suite/tests/draft7/refRemote.json +++ b/test/JSON-Schema-Test-Suite/tests/draft7/refRemote.json @@ -172,7 +172,9 @@ "description": "remote ref with ref to definitions", "schema": { "$id": "http://localhost:1234/schema-remote-ref-ref-defs1.json", - "$ref": "ref-and-definitions.json" + "allOf": [ + { "$ref": "ref-and-definitions.json" } + ] }, "tests": [ {