Skip to content

Commit f21470e

Browse files
committed
Rebasing
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent bb3f9a2 commit f21470e

3 files changed

Lines changed: 24 additions & 120 deletions

File tree

test/evaluator/evaluator_2020_12.json

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1675,11 +1675,7 @@
16751675
"description": "items_integer_bounded_1",
16761676
"schema": {
16771677
"$schema": "https://json-schema.org/draft/2020-12/schema",
1678-
"items": {
1679-
"type": "number",
1680-
"minimum": 0,
1681-
"maximum": 100
1682-
}
1678+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
16831679
},
16841680
"instance": [ 10, 50, 99 ],
16851681
"valid": true,
@@ -1743,11 +1739,7 @@
17431739
"description": "items_integer_bounded_2",
17441740
"schema": {
17451741
"$schema": "https://json-schema.org/draft/2020-12/schema",
1746-
"items": {
1747-
"type": "number",
1748-
"minimum": 0,
1749-
"maximum": 100
1750-
}
1742+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
17511743
},
17521744
"instance": [ 10, 200, 50 ],
17531745
"valid": false,
@@ -1793,11 +1785,7 @@
17931785
"description": "items_integer_bounded_3",
17941786
"schema": {
17951787
"$schema": "https://json-schema.org/draft/2020-12/schema",
1796-
"items": {
1797-
"type": "number",
1798-
"minimum": 0,
1799-
"maximum": 100
1800-
}
1788+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
18011789
},
18021790
"instance": [ "foo" ],
18031791
"valid": false,
@@ -1831,11 +1819,7 @@
18311819
"description": "items_integer_bounded_4",
18321820
"schema": {
18331821
"$schema": "https://json-schema.org/draft/2020-12/schema",
1834-
"items": {
1835-
"type": "number",
1836-
"minimum": 0,
1837-
"maximum": 100
1838-
}
1822+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
18391823
},
18401824
"instance": "not an array",
18411825
"valid": true,
@@ -1846,11 +1830,7 @@
18461830
"description": "items_integer_bounded_5",
18471831
"schema": {
18481832
"$schema": "https://json-schema.org/draft/2020-12/schema",
1849-
"items": {
1850-
"type": "number",
1851-
"minimum": 0,
1852-
"maximum": 100
1853-
}
1833+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
18541834
},
18551835
"instance": [],
18561836
"valid": true,
@@ -1861,11 +1841,7 @@
18611841
"description": "items_integer_bounded_6",
18621842
"schema": {
18631843
"$schema": "https://json-schema.org/draft/2020-12/schema",
1864-
"items": {
1865-
"type": "number",
1866-
"minimum": 0,
1867-
"maximum": 100
1868-
}
1844+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
18691845
},
18701846
"instance": [ 10.5, 99.9 ],
18711847
"valid": true,
@@ -1920,11 +1896,7 @@
19201896
"description": "items_integer_bounded_7_real_bounds",
19211897
"schema": {
19221898
"$schema": "https://json-schema.org/draft/2020-12/schema",
1923-
"items": {
1924-
"type": "number",
1925-
"minimum": 0.5,
1926-
"maximum": 100
1927-
}
1899+
"items": { "type": "number", "minimum": 0.5, "maximum": 100 }
19281900
},
19291901
"instance": [ 1, 50 ],
19301902
"valid": true,
@@ -1997,11 +1969,7 @@
19971969
"description": "items_integer_bounded_8_boundary_values",
19981970
"schema": {
19991971
"$schema": "https://json-schema.org/draft/2020-12/schema",
2000-
"items": {
2001-
"type": "number",
2002-
"minimum": 0,
2003-
"maximum": 100
2004-
}
1972+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
20051973
},
20061974
"instance": [ 0, 100 ],
20071975
"valid": true,

test/evaluator/evaluator_draft4.json

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9827,11 +9827,7 @@
98279827
"description": "items_integer_bounded_1",
98289828
"schema": {
98299829
"$schema": "http://json-schema.org/draft-04/schema#",
9830-
"items": {
9831-
"type": "number",
9832-
"minimum": 0,
9833-
"maximum": 100
9834-
}
9830+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
98359831
},
98369832
"instance": [ 10, 50, 99 ],
98379833
"valid": true,
@@ -9889,11 +9885,7 @@
98899885
"description": "items_integer_bounded_2",
98909886
"schema": {
98919887
"$schema": "http://json-schema.org/draft-04/schema#",
9892-
"items": {
9893-
"type": "number",
9894-
"minimum": 0,
9895-
"maximum": 100
9896-
}
9888+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
98979889
},
98989890
"instance": [ 10, 200, 50 ],
98999891
"valid": false,
@@ -9936,11 +9928,7 @@
99369928
"description": "items_integer_bounded_3",
99379929
"schema": {
99389930
"$schema": "http://json-schema.org/draft-04/schema#",
9939-
"items": {
9940-
"type": "number",
9941-
"minimum": 0,
9942-
"maximum": 100
9943-
}
9931+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
99449932
},
99459933
"instance": [ "foo" ],
99469934
"valid": false,
@@ -9974,11 +9962,7 @@
99749962
"description": "items_integer_bounded_4",
99759963
"schema": {
99769964
"$schema": "http://json-schema.org/draft-04/schema#",
9977-
"items": {
9978-
"type": "number",
9979-
"minimum": 0,
9980-
"maximum": 100
9981-
}
9965+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
99829966
},
99839967
"instance": "not an array",
99849968
"valid": true,
@@ -9989,11 +9973,7 @@
99899973
"description": "items_integer_bounded_5",
99909974
"schema": {
99919975
"$schema": "http://json-schema.org/draft-04/schema#",
9992-
"items": {
9993-
"type": "number",
9994-
"minimum": 0,
9995-
"maximum": 100
9996-
}
9976+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
99979977
},
99989978
"instance": [],
99999979
"valid": true,
@@ -10014,11 +9994,7 @@
100149994
"description": "items_integer_bounded_6",
100159995
"schema": {
100169996
"$schema": "http://json-schema.org/draft-04/schema#",
10017-
"items": {
10018-
"type": "number",
10019-
"minimum": 0,
10020-
"maximum": 100
10021-
}
9997+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
100229998
},
100239999
"instance": [ 10.5, 99.9 ],
1002410000
"valid": true,
@@ -10067,11 +10043,7 @@
1006710043
"description": "items_integer_bounded_7_real_bounds",
1006810044
"schema": {
1006910045
"$schema": "http://json-schema.org/draft-04/schema#",
10070-
"items": {
10071-
"type": "number",
10072-
"minimum": 0.5,
10073-
"maximum": 100
10074-
}
10046+
"items": { "type": "number", "minimum": 0.5, "maximum": 100 }
1007510047
},
1007610048
"instance": [ 1, 50 ],
1007710049
"valid": true,
@@ -10138,11 +10110,7 @@
1013810110
"description": "items_integer_bounded_8_boundary_values",
1013910111
"schema": {
1014010112
"$schema": "http://json-schema.org/draft-04/schema#",
10141-
"items": {
10142-
"type": "number",
10143-
"minimum": 0,
10144-
"maximum": 100
10145-
}
10113+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
1014610114
},
1014710115
"instance": [ 0, 100 ],
1014810116
"valid": true,

test/evaluator/evaluator_draft6.json

Lines changed: 8 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -3265,11 +3265,7 @@
32653265
"description": "items_integer_bounded_1",
32663266
"schema": {
32673267
"$schema": "http://json-schema.org/draft-06/schema#",
3268-
"items": {
3269-
"type": "number",
3270-
"minimum": 0,
3271-
"maximum": 100
3272-
}
3268+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
32733269
},
32743270
"instance": [ 10, 50, 99 ],
32753271
"valid": true,
@@ -3327,11 +3323,7 @@
33273323
"description": "items_integer_bounded_2",
33283324
"schema": {
33293325
"$schema": "http://json-schema.org/draft-06/schema#",
3330-
"items": {
3331-
"type": "number",
3332-
"minimum": 0,
3333-
"maximum": 100
3334-
}
3326+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
33353327
},
33363328
"instance": [ 10, 200, 50 ],
33373329
"valid": false,
@@ -3374,11 +3366,7 @@
33743366
"description": "items_integer_bounded_3",
33753367
"schema": {
33763368
"$schema": "http://json-schema.org/draft-06/schema#",
3377-
"items": {
3378-
"type": "number",
3379-
"minimum": 0,
3380-
"maximum": 100
3381-
}
3369+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
33823370
},
33833371
"instance": [ "foo" ],
33843372
"valid": false,
@@ -3412,11 +3400,7 @@
34123400
"description": "items_integer_bounded_4",
34133401
"schema": {
34143402
"$schema": "http://json-schema.org/draft-06/schema#",
3415-
"items": {
3416-
"type": "number",
3417-
"minimum": 0,
3418-
"maximum": 100
3419-
}
3403+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
34203404
},
34213405
"instance": "not an array",
34223406
"valid": true,
@@ -3427,11 +3411,7 @@
34273411
"description": "items_integer_bounded_5",
34283412
"schema": {
34293413
"$schema": "http://json-schema.org/draft-06/schema#",
3430-
"items": {
3431-
"type": "number",
3432-
"minimum": 0,
3433-
"maximum": 100
3434-
}
3414+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
34353415
},
34363416
"instance": [],
34373417
"valid": true,
@@ -3452,11 +3432,7 @@
34523432
"description": "items_integer_bounded_6",
34533433
"schema": {
34543434
"$schema": "http://json-schema.org/draft-06/schema#",
3455-
"items": {
3456-
"type": "number",
3457-
"minimum": 0,
3458-
"maximum": 100
3459-
}
3435+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
34603436
},
34613437
"instance": [ 10.5, 99.9 ],
34623438
"valid": true,
@@ -3505,11 +3481,7 @@
35053481
"description": "items_integer_bounded_7_real_bounds",
35063482
"schema": {
35073483
"$schema": "http://json-schema.org/draft-06/schema#",
3508-
"items": {
3509-
"type": "number",
3510-
"minimum": 0.5,
3511-
"maximum": 100
3512-
}
3484+
"items": { "type": "number", "minimum": 0.5, "maximum": 100 }
35133485
},
35143486
"instance": [ 1, 50 ],
35153487
"valid": true,
@@ -3576,11 +3548,7 @@
35763548
"description": "items_integer_bounded_8_boundary_values",
35773549
"schema": {
35783550
"$schema": "http://json-schema.org/draft-06/schema#",
3579-
"items": {
3580-
"type": "number",
3581-
"minimum": 0,
3582-
"maximum": 100
3583-
}
3551+
"items": { "type": "number", "minimum": 0, "maximum": 100 }
35843552
},
35853553
"instance": [ 0, 100 ],
35863554
"valid": true,

0 commit comments

Comments
 (0)