Skip to content

Commit 03ec4a1

Browse files
JulianJulian
committed
Merge commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02'
* commit '02434de22eb0fb4eb60744c5f38c4895b5d4dd02': Squashed 'json/' changes from 1326f36e..17fa9589
2 parents 0287da9 + 02434de commit 03ec4a1

File tree

6 files changed

+90
-10
lines changed

6 files changed

+90
-10
lines changed

‎json/tests/draft2019-09/optional/format/duration.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,26 @@
8787
"description": "weeks cannot be combined with other units",
8888
"data": "P1Y2W",
8989
"valid": false
90+
},
91+
{
92+
"description": "null value should be ignored",
93+
"data": null,
94+
"valid": true
95+
},
96+
{
97+
"description": "number value should be ignored",
98+
"data": 1,
99+
"valid": true
100+
},
101+
{
102+
"description": "list value should be ignored",
103+
"data": [],
104+
"valid": true
105+
},
106+
{
107+
"description": "object value should be ignored",
108+
"data": {},
109+
"valid": true
90110
}
91111
]
92112
}

‎json/tests/draft2019-09/optional/format/uuid.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,26 @@
6464
"description": "hypothetical version 15",
6565
"data": "99c17cbb-656f-f64a-940f-1a4568f03487",
6666
"valid": true
67+
},
68+
{
69+
"description": "null value should be ignored",
70+
"data": null,
71+
"valid": true
72+
},
73+
{
74+
"description": "number value should be ignored",
75+
"data": 1,
76+
"valid": true
77+
},
78+
{
79+
"description": "list value should be ignored",
80+
"data": [],
81+
"valid": true
82+
},
83+
{
84+
"description": "object value should be ignored",
85+
"data": {},
86+
"valid": true
6787
}
6888
]
6989
}

‎json/tests/draft2020-12/optional/format/duration.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,26 @@
8787
"description": "weeks cannot be combined with other units",
8888
"data": "P1Y2W",
8989
"valid": false
90+
},
91+
{
92+
"description": "null value should be ignored",
93+
"data": null,
94+
"valid": true
95+
},
96+
{
97+
"description": "number value should be ignored",
98+
"data": 1,
99+
"valid": true
100+
},
101+
{
102+
"description": "list value should be ignored",
103+
"data": [],
104+
"valid": true
105+
},
106+
{
107+
"description": "object value should be ignored",
108+
"data": {},
109+
"valid": true
90110
}
91111
]
92112
}

‎json/tests/draft2020-12/optional/format/uuid.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,26 @@
6464
"description": "hypothetical version 15",
6565
"data": "99c17cbb-656f-f64a-940f-1a4568f03487",
6666
"valid": true
67+
},
68+
{
69+
"description": "null value should be ignored",
70+
"data": null,
71+
"valid": true
72+
},
73+
{
74+
"description": "number value should be ignored",
75+
"data": 1,
76+
"valid": true
77+
},
78+
{
79+
"description": "list value should be ignored",
80+
"data": [],
81+
"valid": true
82+
},
83+
{
84+
"description": "object value should be ignored",
85+
"data": {},
86+
"valid": true
6787
}
6888
]
6989
}

‎json/tests/draft3/ref.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,24 +201,24 @@
201201
]
202202
},
203203
{
204-
"description": "$ref prevents a sibling $id from changing the base uri",
204+
"description": "$ref prevents a sibling id from changing the base uri",
205205
"schema": {
206-
"$id": "http://localhost:1234/sibling_id/base/",
206+
"id": "http://localhost:1234/sibling_id/base/",
207207
"definitions": {
208208
"foo": {
209-
"$id": "http://localhost:1234/sibling_id/foo.json",
209+
"id": "http://localhost:1234/sibling_id/foo.json",
210210
"minimum": 2
211211
},
212212
"base_foo": {
213213
"$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
214-
"$id": "foo.json",
214+
"id": "foo.json",
215215
"minimum": 5
216216
}
217217
},
218218
"allOf": [
219219
{
220220
"$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not ttp://localhost:1234/sibling_id/foo.json",
221-
"$id": "http://localhost:1234/sibling_id/",
221+
"id": "http://localhost:1234/sibling_id/",
222222
"$ref": "foo.json"
223223
}
224224
]

‎json/tests/draft4/ref.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,24 +176,24 @@
176176
]
177177
},
178178
{
179-
"description": "$ref prevents a sibling $id from changing the base uri",
179+
"description": "$ref prevents a sibling id from changing the base uri",
180180
"schema": {
181-
"$id": "http://localhost:1234/sibling_id/base/",
181+
"id": "http://localhost:1234/sibling_id/base/",
182182
"definitions": {
183183
"foo": {
184-
"$id": "http://localhost:1234/sibling_id/foo.json",
184+
"id": "http://localhost:1234/sibling_id/foo.json",
185185
"minimum": 2
186186
},
187187
"base_foo": {
188188
"$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
189-
"$id": "foo.json",
189+
"id": "foo.json",
190190
"minimum": 5
191191
}
192192
},
193193
"allOf": [
194194
{
195195
"$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not ttp://localhost:1234/sibling_id/foo.json",
196-
"$id": "http://localhost:1234/sibling_id/",
196+
"id": "http://localhost:1234/sibling_id/",
197197
"$ref": "foo.json"
198198
}
199199
]

0 commit comments

Comments
 (0)