Skip to content

Commit d1a643b

Browse files
committed
Squashed 'json/' changes from 2576db4df..71f55b36b
71f55b36b 1.0 being an integer is not optional behavior. 240fbf6db Add a description to "schema" explaining it should be valid 8f8e90651 Update test schema to Draft 6 from Draft 4 git-subtree-dir: json git-subtree-split: 71f55b36be0d404804023b433f745e46af07b1ae
1 parent ef1a078 commit d1a643b

File tree

7 files changed

+19
-47
lines changed

7 files changed

+19
-47
lines changed

test-schema.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "http://json-schema.org/draft-04/schema#",
2+
"$schema": "http://json-schema.org/draft-06/schema#",
33
"description": "Schema for tests",
44
"type": "array",
55
"items": {
@@ -12,7 +12,9 @@
1212
"format": "uri"
1313
},
1414
"description": { "type": "string" },
15-
"schema": {},
15+
"schema": {
16+
"description": "This should be a valid schema. This should be a ref to a meta-schema if schema keywords need testing."
17+
},
1618
"tests": {
1719
"description": "A set of related tests all using the same schema",
1820
"type": "array",

tests/draft2019-09/optional/zeroTerminatedFloats.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/draft2019-09/type.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"data": 1,
99
"valid": true
1010
},
11+
{
12+
"description": "a float with zero fractional part is an integer",
13+
"data": 1.0,
14+
"valid": true
15+
},
1116
{
1217
"description": "a float is not an integer",
1318
"data": 1.1,

tests/draft6/optional/zeroTerminatedFloats.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/draft6/type.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"data": 1,
99
"valid": true
1010
},
11+
{
12+
"description": "a float with zero fractional part is an integer",
13+
"data": 1.0,
14+
"valid": true
15+
},
1116
{
1217
"description": "a float is not an integer",
1318
"data": 1.1,

tests/draft7/optional/zeroTerminatedFloats.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/draft7/type.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
"data": 1,
99
"valid": true
1010
},
11+
{
12+
"description": "a float with zero fractional part is an integer",
13+
"data": 1.0,
14+
"valid": true
15+
},
1116
{
1217
"description": "a float is not an integer",
1318
"data": 1.1,

0 commit comments

Comments
 (0)