Skip to content

Commit be1792d

Browse files
pboettchpboettch
committed
update JSON-Schema-Test-Suite to 2.0.0-175-g7ba95f3
1 parent 8125a3e commit be1792d

22 files changed

+1383
-37
lines changed

‎test/JSON-Schema-Test-Suite/remotes/folder/folderInteger.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"type": "integer"
3-
}
3+
}

‎test/JSON-Schema-Test-Suite/remotes/integer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"type": "integer"
3-
}
3+
}

‎test/JSON-Schema-Test-Suite/remotes/name-defs.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"$defs": {
3+
"orNull": {
4+
"anyOf": [
5+
{
6+
"type": "null"
7+
},
8+
{
9+
"$ref": "#"
10+
}
11+
]
12+
}
13+
},
14+
"type": "string"
15+
}

‎test/JSON-Schema-Test-Suite/remotes/name.json

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
"definitions": {
33
"orNull": {
44
"anyOf": [
5-
{"type": "null"},
6-
{"$ref": "#"}
5+
{
6+
"type": "null"
7+
},
8+
{
9+
"$ref": "#"
10+
}
711
]
812
}
913
},

‎test/JSON-Schema-Test-Suite/remotes/subSchemas-defs.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"$defs": {
3+
"integer": {
4+
"type": "integer"
5+
},
6+
"refToInteger": {
7+
"$ref": "#/$defs/integer"
8+
}
9+
}
10+
}

‎test/JSON-Schema-Test-Suite/remotes/subSchemas.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"integer": {
33
"type": "integer"
4-
},
4+
},
55
"refToInteger": {
66
"$ref": "#/integer"
77
}
8-
}
8+
}

‎test/JSON-Schema-Test-Suite/tests/draft7/allOf.json

+26
Original file line numberDiff line numberDiff line change
@@ -214,5 +214,31 @@
214214
"valid": false
215215
}
216216
]
217+
},
218+
{
219+
"description": "nested allOf, to check validation semantics",
220+
"schema": {
221+
"allOf": [
222+
{
223+
"allOf": [
224+
{
225+
"type": "null"
226+
}
227+
]
228+
}
229+
]
230+
},
231+
"tests": [
232+
{
233+
"description": "null is valid",
234+
"data": null,
235+
"valid": true
236+
},
237+
{
238+
"description": "anything non-null is invalid",
239+
"data": 123,
240+
"valid": false
241+
}
242+
]
217243
}
218244
]

‎test/JSON-Schema-Test-Suite/tests/draft7/anyOf.json

+26
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,32 @@
160160
}
161161
]
162162
},
163+
{
164+
"description": "nested anyOf, to check validation semantics",
165+
"schema": {
166+
"anyOf": [
167+
{
168+
"anyOf": [
169+
{
170+
"type": "null"
171+
}
172+
]
173+
}
174+
]
175+
},
176+
"tests": [
177+
{
178+
"description": "null is valid",
179+
"data": null,
180+
"valid": true
181+
},
182+
{
183+
"description": "anything non-null is invalid",
184+
"data": 123,
185+
"valid": false
186+
}
187+
]
188+
},
163189
{
164190
"description": "nested anyOf, to check validation semantics",
165191
"schema": {

‎test/JSON-Schema-Test-Suite/tests/draft7/const.json

+73-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
]
127127
},
128128
{
129-
"description": "const with 0 does not match false",
129+
"description": "const with 0 does not match other zero-like types",
130130
"schema": {"const": 0},
131131
"tests": [
132132
{
@@ -143,6 +143,21 @@
143143
"description": "float zero is valid",
144144
"data": 0.0,
145145
"valid": true
146+
},
147+
{
148+
"description": "empty object is invalid",
149+
"data": {},
150+
"valid": false
151+
},
152+
{
153+
"description": "empty array is invalid",
154+
"data": [],
155+
"valid": false
156+
},
157+
{
158+
"description": "empty string is invalid",
159+
"data": "",
160+
"valid": false
146161
}
147162
]
148163
},
@@ -166,5 +181,62 @@
166181
"valid": true
167182
}
168183
]
184+
},
185+
{
186+
"description": "const with -2.0 matches integer and float types",
187+
"schema": {"const": -2.0},
188+
"tests": [
189+
{
190+
"description": "integer -2 is valid",
191+
"data": -2,
192+
"valid": true
193+
},
194+
{
195+
"description": "integer 2 is invalid",
196+
"data": 2,
197+
"valid": false
198+
},
199+
{
200+
"description": "float -2.0 is valid",
201+
"data": -2.0,
202+
"valid": true
203+
},
204+
{
205+
"description": "float 2.0 is invalid",
206+
"data": 2.0,
207+
"valid": false
208+
},
209+
{
210+
"description": "float -2.00001 is invalid",
211+
"data": -2.00001,
212+
"valid": false
213+
}
214+
]
215+
},
216+
{
217+
"description": "float and integers are equal up to 64-bit representation limits",
218+
"schema": {"const": 9007199254740992},
219+
"tests": [
220+
{
221+
"description": "integer is valid",
222+
"data": 9007199254740992,
223+
"valid": true
224+
},
225+
{
226+
"description": "integer minus one is invalid",
227+
"data": 9007199254740991,
228+
"valid": false
229+
},
230+
{
231+
"description": "float is valid",
232+
"data": 9007199254740992.0,
233+
"valid": true
234+
},
235+
{
236+
"description": "float minus one is invalid",
237+
"data": 9007199254740991.0,
238+
"valid": false
239+
}
240+
]
169241
}
170242
]

‎test/JSON-Schema-Test-Suite/tests/draft7/dependencies.json

+5-25
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,11 @@
5757
"description": "object with one property",
5858
"data": {"bar": 2},
5959
"valid": true
60+
},
61+
{
62+
"description": "non-object is valid",
63+
"data": 1,
64+
"valid": true
6065
}
6166
]
6267
},
@@ -169,31 +174,6 @@
169174
}
170175
]
171176
},
172-
{
173-
"description": "empty array of dependencies",
174-
"schema": {
175-
"dependencies": {
176-
"foo": []
177-
}
178-
},
179-
"tests": [
180-
{
181-
"description": "object with property is valid",
182-
"data": { "foo": 1 },
183-
"valid": true
184-
},
185-
{
186-
"description": "empty object is valid",
187-
"data": {},
188-
"valid": true
189-
},
190-
{
191-
"description": "non-object is valid",
192-
"data": 1,
193-
"valid": true
194-
}
195-
]
196-
},
197177
{
198178
"description": "dependencies with escaped characters",
199179
"schema": {

‎test/JSON-Schema-Test-Suite/tests/draft7/enum.json

+31
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,27 @@
3636
}
3737
]
3838
},
39+
{
40+
"description": "heterogeneous enum-with-null validation",
41+
"schema": { "enum": [6, null] },
42+
"tests": [
43+
{
44+
"description": "null is valid",
45+
"data": null,
46+
"valid": true
47+
},
48+
{
49+
"description": "number is valid",
50+
"data": 6,
51+
"valid": true
52+
},
53+
{
54+
"description": "something else is invalid",
55+
"data": "test",
56+
"valid": false
57+
}
58+
]
59+
},
3960
{
4061
"description": "enums in properties",
4162
"schema": {
@@ -52,6 +73,16 @@
5273
"data": {"foo":"foo", "bar":"bar"},
5374
"valid": true
5475
},
76+
{
77+
"description": "wrong foo value",
78+
"data": {"foo":"foot", "bar":"bar"},
79+
"valid": false
80+
},
81+
{
82+
"description": "wrong bar value",
83+
"data": {"foo":"foo", "bar":"bart"},
84+
"valid": false
85+
},
5586
{
5687
"description": "missing optional property is valid",
5788
"data": {"bar":"bar"},

0 commit comments

Comments
 (0)