Skip to content

Commit 5e16d74

Browse files
JulianJulian
committed
Squashed 'json/' changes from f57d3e0cc..19947eaa1
19947eaa1 test: unevaluatedProperties not affected by propertyNames 829270631 Check that large integers are multiples of small multipleOf b59543f6e Merge pull request #647 from santhosh-tekuri/ref-start-slash 6e5d45d71 Merge pull request #646 from santhosh-tekuri/vocab-optional 0311dfda0 Merge pull request #651 from santhosh-tekuri/dynamicref-without-anchor 4503eeaf4 test: A $dynamicRef without anchor in fragment behaves identical to $ref 39af4c1ba test: $ref with absolute-path-reference 880c9933b test/vocabulary: ignore unrecognized optional vocabulary fd80307ff Merge pull request #642 from santhosh-tekuri/time-2digit a76ae650d Merge pull request #645 from json-schema-org/gregsdennis/add-vocab-tests-link 0e2b4eefd Merge pull request #643 from 0xSudarshan/main 2b78ccfc4 slight tweaking to wording 8716c4054 add link for vocab test suite to readme c49ba5445 Fix an incorrect $schema identifier. f0e5ce71e Added test for schema-items alongside "ignored" additionalItems 76dae88ab Merge pull request #640 from santhosh-tekuri/refRemote-anchor cb82e237c Merge pull request #641 from json-schema-org/gregsdennis/unevaluated-not-draft-next e4afd233a test/format: hour, min, sec must be two digits 7efd51313 fix unevaluatedProperties/not tests for draft-next e39c6ea6a test/refRemote: anchor within remote ref bf51b32fb Merge pull request #639 from json-schema-org/additionalItems-unevaluatedItems 52160b368 Add a test for 2019's interaction between additional/unevaluatedItems 69a09a339 Fixed tests for annotation collection inside not. e4e1a220b Draft7 if/then/else ref tests need to be wrapped in an allOf. f5bd2f6c3 Merge pull request #632 from json-schema-org/ether/annotations-inside-not 626b433e5 test that annations are collected inside a "not" git-subtree-dir: json git-subtree-split: 19947eaa1289168a49edd21bb7a8aa2098069ae0
1 parent dae554c commit 5e16d74

38 files changed

+833
-26
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Drafts 04 and 03 are considered "frozen" in that less effort is put in to backpo
2020
Additional coverage is always welcome, particularly for bugs encountered in real-world implementations.
2121
If you see anything missing or incorrect, please feel free to [file an issue](https://github.com/json-schema-org/JSON-Schema-Test-Suite/issues) or [submit a PR](https://github.com/json-schema-org/JSON-Schema-Test-Suite).
2222

23+
@gregsdennis has also started a separate [test suite](https://github.com/gregsdennis/json-schema-vocab-test-suites) that is modelled after this suite to cover third-party vocabularies.
24+
2325
## Introduction to the Test Suite Structure
2426

2527
The tests in this suite are contained in the `tests` directory at the root of this repository.

‎remotes/draft-next/metaschema-optional-vocabulary.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
3+
"$id": "http://localhost:1234/draft-next/metaschema-optional-vocabulary.json",
4+
"$vocabulary": {
5+
"https://json-schema.org/draft/next/vocab/validation": true,
6+
"https://json-schema.org/draft/next/vocab/core": true,
7+
"http://localhost:1234/draft/next/vocab/custom": false
8+
},
9+
"allOf": [
10+
{ "$ref": "https://json-schema.org/draft/next/meta/validation" },
11+
{ "$ref": "https://json-schema.org/draft/next/meta/core" }
12+
]
13+
}

‎remotes/draft2019-09/metaschema-optional-vocabulary.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/2019-09/schema",
3+
"$id": "http://localhost:1234/draft2019-09/metaschema-optional-vocabulary.json",
4+
"$vocabulary": {
5+
"https://json-schema.org/draft/2019-09/vocab/validation": true,
6+
"https://json-schema.org/draft/2019-09/vocab/core": true,
7+
"http://localhost:1234/draft/2019-09/vocab/custom": false
8+
},
9+
"allOf": [
10+
{ "$ref": "https://json-schema.org/draft/2019-09/meta/validation" },
11+
{ "$ref": "https://json-schema.org/draft/2019-09/meta/core" }
12+
]
13+
}

‎remotes/draft2020-12/metaschema-optional-vocabulary.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/2020-12/schema",
3+
"$id": "http://localhost:1234/draft2020-12/metaschema-optional-vocabulary.json",
4+
"$vocabulary": {
5+
"https://json-schema.org/draft/2020-12/vocab/validation": true,
6+
"https://json-schema.org/draft/2020-12/vocab/core": true,
7+
"http://localhost:1234/draft/2020-12/vocab/custom": false
8+
},
9+
"allOf": [
10+
{ "$ref": "https://json-schema.org/draft/2020-12/meta/validation" },
11+
{ "$ref": "https://json-schema.org/draft/2020-12/meta/core" }
12+
]
13+
}

‎tests/draft-next/multipleOf.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,19 @@
8080
"valid": false
8181
}
8282
]
83+
},
84+
{
85+
"description": "small multiple of large integer",
86+
"schema": {
87+
"$schema": "https://json-schema.org/draft/next/schema",
88+
"type": "integer", "multipleOf": 1e-8
89+
},
90+
"tests": [
91+
{
92+
"description": "any integer is a multiple of 1e-8",
93+
"data": 12391239123,
94+
"valid": true
95+
}
96+
]
8397
}
8498
]

‎tests/draft-next/not.json‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,31 @@
123123
"valid": true
124124
}
125125
]
126-
}
126+
},
127+
{
128+
"description": "collect annotations inside a 'not', even if collection is disabled",
129+
"schema": {
130+
"$schema": "https://json-schema.org/draft/next/schema",
131+
"not": {
132+
"$comment": "this subschema must still produce annotations internally, even though the 'not' will ultimately discard them",
133+
"anyOf": [
134+
true,
135+
{ "properties": { "foo": true } }
136+
],
137+
"unevaluatedProperties": false
138+
}
139+
},
140+
"tests": [
141+
{
142+
"description": "unevaluated property",
143+
"data": { "bar": 1 },
144+
"valid": true
145+
},
146+
{
147+
"description": "annotations are still collected inside a 'not'",
148+
"data": { "foo": 1 },
149+
"valid": false
150+
}
151+
]
152+
}
127153
]

‎tests/draft-next/optional/format/time.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,21 @@
4141
"data": "08:30:06Z",
4242
"valid": true
4343
},
44+
{
45+
"description": "invalid time string with extra leading zeros",
46+
"data": "008:030:006Z",
47+
"valid": false
48+
},
49+
{
50+
"description": "invalid time string with no leading zero for single digit",
51+
"data": "8:3:6Z",
52+
"valid": false
53+
},
54+
{
55+
"description": "hour, minute, second must be two digits",
56+
"data": "8:0030:6Z",
57+
"valid": false
58+
},
4459
{
4560
"description": "a valid time string with leap second, Zulu",
4661
"data": "23:59:60Z",
@@ -131,6 +146,11 @@
131146
"data": "08:30:06-08:00",
132147
"valid": true
133148
},
149+
{
150+
"description": "hour, minute in time-offset must be two digits",
151+
"data": "08:30:06-8:000",
152+
"valid": false
153+
},
134154
{
135155
"description": "a valid time string with case-insensitive Z",
136156
"data": "08:30:06z",

‎tests/draft-next/ref.json‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -949,5 +949,34 @@
949949
"valid": true
950950
}
951951
]
952-
}
952+
},
953+
{
954+
"description": "ref with absolute-path-reference",
955+
"schema": {
956+
"$id": "http://example.com/ref/absref.json",
957+
"$defs": {
958+
"a": {
959+
"$id": "http://example.com/ref/absref/foobar.json",
960+
"type": "number"
961+
},
962+
"b": {
963+
"$id": "http://example.com/absref/foobar.json",
964+
"type": "string"
965+
}
966+
},
967+
"$ref": "/absref/foobar.json"
968+
},
969+
"tests": [
970+
{
971+
"description": "a string is valid",
972+
"data": "foo",
973+
"valid": true
974+
},
975+
{
976+
"description": "an integer is invalid",
977+
"data": 12,
978+
"valid": false
979+
}
980+
]
981+
}
953982
]

‎tests/draft-next/refRemote.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,25 @@
3737
}
3838
]
3939
},
40+
{
41+
"description": "anchor within remote ref",
42+
"schema": {
43+
"$schema": "https://json-schema.org/draft/next/schema",
44+
"$ref": "http://localhost:1234/draft-next/locationIndependentIdentifier.json#foo"
45+
},
46+
"tests": [
47+
{
48+
"description": "remote anchor valid",
49+
"data": 1,
50+
"valid": true
51+
},
52+
{
53+
"description": "remote anchor invalid",
54+
"data": "a",
55+
"valid": false
56+
}
57+
]
58+
},
4059
{
4160
"description": "ref within remote ref",
4261
"schema": {

‎tests/draft-next/unevaluatedItems.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
]
100100
},
101101
{
102-
"description": "unevaluatedItems with items",
102+
"description": "unevaluatedItems with items and prefixItems",
103103
"schema": {
104104
"$schema": "https://json-schema.org/draft/next/schema",
105105
"prefixItems": [
@@ -116,6 +116,27 @@
116116
}
117117
]
118118
},
119+
{
120+
"description": "unevaluatedItems with items",
121+
"schema": {
122+
"$schema": "https://json-schema.org/draft/next/schema",
123+
"items": {"type": "number"},
124+
"unevaluatedItems": {"type": "string"}
125+
},
126+
"tests": [
127+
{
128+
"description": "valid under items",
129+
"comment": "no elements are considered by unevaluatedItems",
130+
"data": [5, 6, 7, 8],
131+
"valid": true
132+
},
133+
{
134+
"description": "invalid under items",
135+
"data": ["foo", "bar", "baz"],
136+
"valid": false
137+
}
138+
]
139+
},
119140
{
120141
"description": "unevaluatedItems with nested tuple",
121142
"schema": {

0 commit comments

Comments
 (0)