Skip to content

Commit 5e32051

Browse files
harrel56harrel56
authored
Merge branch 'master' into dependabot/gradle/all-0329eb2104
2 parents e45498b + 6f9105f commit 5e32051

14 files changed

Lines changed: 196 additions & 11 deletions

File tree

‎lib/src/testFixtures/resources/suite-yaml/tests/draft2019-09/optional/format/date-time.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@
5757
- description: an invalid closing Z after time-zone offset
5858
data: 1963-06-19T08:30:06.28123+01:00Z
5959
valid: false
60+
- description: an invalid hour in date-time string
61+
data: 1990-12-31T24:00:00Z
62+
valid: false
63+
- description: an invalid minute in date-time string
64+
data: 1990-12-31T15:60:00Z
65+
valid: false
66+
- description: an invalid offset minute in date-time string
67+
data: "1990-12-31T10:00:00+10:60"
68+
valid: false
6069
- description: an invalid date-time string
6170
data: 06/19/1963 08:30:06 PST
6271
valid: false

‎lib/src/testFixtures/resources/suite-yaml/tests/draft2019-09/unevaluatedProperties.yml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
foo: foo
8080
bar: bar
8181
valid: false
82-
- description: unevaluatedProperties with adjacent additionalProperties
82+
- description: unevaluatedProperties with adjacent bool additionalProperties
8383
schema:
8484
$schema: https://json-schema.org/draft/2019-09/schema
8585
type: object
@@ -98,6 +98,26 @@
9898
foo: foo
9999
bar: bar
100100
valid: true
101+
- description: unevaluatedProperties with adjacent non-bool additionalProperties
102+
schema:
103+
$schema: https://json-schema.org/draft/2019-09/schema
104+
type: object
105+
properties:
106+
foo:
107+
type: string
108+
additionalProperties:
109+
type: string
110+
unevaluatedProperties: false
111+
tests:
112+
- description: with no additional properties
113+
data:
114+
foo: foo
115+
valid: true
116+
- description: with additional properties
117+
data:
118+
foo: foo
119+
bar: bar
120+
valid: true
101121
- description: unevaluatedProperties with nested properties
102122
schema:
103123
$schema: https://json-schema.org/draft/2019-09/schema

‎lib/src/testFixtures/resources/suite-yaml/tests/draft2020-12/optional/format/date-time.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@
5757
- description: an invalid closing Z after time-zone offset
5858
data: 1963-06-19T08:30:06.28123+01:00Z
5959
valid: false
60+
- description: an invalid hour in date-time string
61+
data: 1990-12-31T24:00:00Z
62+
valid: false
63+
- description: an invalid minute in date-time string
64+
data: 1990-12-31T15:60:00Z
65+
valid: false
66+
- description: an invalid offset minute in date-time string
67+
data: "1990-12-31T10:00:00+10:60"
68+
valid: false
6069
- description: an invalid date-time string
6170
data: 06/19/1963 08:30:06 PST
6271
valid: false

‎lib/src/testFixtures/resources/suite-yaml/tests/draft2020-12/unevaluatedProperties.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,10 @@
7777
- description: unevaluatedProperties with adjacent bool additionalProperties
7878
schema:
7979
$schema: https://json-schema.org/draft/2020-12/schema
80+
type: object
81+
properties:
82+
foo:
83+
type: string
8084
additionalProperties: true
8185
unevaluatedProperties: false
8286
tests:
@@ -92,19 +96,23 @@
9296
- description: unevaluatedProperties with adjacent non-bool additionalProperties
9397
schema:
9498
$schema: https://json-schema.org/draft/2020-12/schema
99+
type: object
100+
properties:
101+
foo:
102+
type: string
95103
additionalProperties:
96104
type: string
97105
unevaluatedProperties: false
98106
tests:
99-
- description: with only valid additional properties
107+
- description: with no additional properties
100108
data:
101109
foo: foo
102110
valid: true
103-
- description: with invalid additional properties
111+
- description: with additional properties
104112
data:
105113
foo: foo
106-
bar: 1
107-
valid: false
114+
bar: bar
115+
valid: true
108116
- description: unevaluatedProperties with nested properties
109117
schema:
110118
$schema: https://json-schema.org/draft/2020-12/schema

‎lib/src/testFixtures/resources/suite-yaml/tests/draft4/optional/format/date-time.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@
4747
- description: an invalid date-time with leap second on a wrong hour, UTC
4848
data: 1998-12-31T22:59:60Z
4949
valid: false
50+
- description: an invalid hour in date-time string
51+
data: 1990-12-31T24:00:00Z
52+
valid: false
53+
- description: an invalid minute in date-time string
54+
data: 1990-12-31T15:60:00Z
55+
valid: false
56+
- description: an invalid offset minute in date-time string
57+
data: "1990-12-31T10:00:00+10:60"
58+
valid: false
5059
- description: an invalid day in date-time string
5160
data: 1990-02-31T15:59:59.123-08:00
5261
valid: false

‎lib/src/testFixtures/resources/suite-yaml/tests/draft6/optional/format/date-time.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@
4747
- description: an invalid date-time with leap second on a wrong hour, UTC
4848
data: 1998-12-31T22:59:60Z
4949
valid: false
50+
- description: an invalid hour in date-time string
51+
data: 1990-12-31T24:00:00Z
52+
valid: false
53+
- description: an invalid minute in date-time string
54+
data: 1990-12-31T15:60:00Z
55+
valid: false
56+
- description: an invalid offset minute in date-time string
57+
data: "1990-12-31T10:00:00+10:60"
58+
valid: false
5059
- description: an invalid day in date-time string
5160
data: 1990-02-31T15:59:59.123-08:00
5261
valid: false

‎lib/src/testFixtures/resources/suite-yaml/tests/draft7/optional/format/date-time.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,15 @@
4747
- description: an invalid date-time with leap second on a wrong hour, UTC
4848
data: 1998-12-31T22:59:60Z
4949
valid: false
50+
- description: an invalid hour in date-time string
51+
data: 1990-12-31T24:00:00Z
52+
valid: false
53+
- description: an invalid minute in date-time string
54+
data: 1990-12-31T15:60:00Z
55+
valid: false
56+
- description: an invalid offset minute in date-time string
57+
data: "1990-12-31T10:00:00+10:60"
58+
valid: false
5059
- description: an invalid day in date-time string
5160
data: 1990-02-31T15:59:59.123-08:00
5261
valid: false

‎lib/src/testFixtures/resources/suite/tests/draft2019-09/optional/format/date-time.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,21 @@
9696
"data": "1963-06-19T08:30:06.28123+01:00Z",
9797
"valid": false
9898
},
99+
{
100+
"description": "an invalid hour in date-time string",
101+
"data": "1990-12-31T24:00:00Z",
102+
"valid": false
103+
},
104+
{
105+
"description": "an invalid minute in date-time string",
106+
"data": "1990-12-31T15:60:00Z",
107+
"valid": false
108+
},
109+
{
110+
"description": "an invalid offset minute in date-time string",
111+
"data": "1990-12-31T10:00:00+10:60",
112+
"valid": false
113+
},
99114
{
100115
"description": "an invalid date-time string",
101116
"data": "06/19/1963 08:30:06 PST",

‎lib/src/testFixtures/resources/suite/tests/draft2019-09/unevaluatedProperties.json‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
]
133133
},
134134
{
135-
"description": "unevaluatedProperties with adjacent additionalProperties",
135+
"description": "unevaluatedProperties with adjacent bool additionalProperties",
136136
"schema": {
137137
"$schema": "https://json-schema.org/draft/2019-09/schema",
138138
"type": "object",
@@ -160,6 +160,35 @@
160160
}
161161
]
162162
},
163+
{
164+
"description": "unevaluatedProperties with adjacent non-bool additionalProperties",
165+
"schema": {
166+
"$schema": "https://json-schema.org/draft/2019-09/schema",
167+
"type": "object",
168+
"properties": {
169+
"foo": { "type": "string" }
170+
},
171+
"additionalProperties": {"type": "string"},
172+
"unevaluatedProperties": false
173+
},
174+
"tests": [
175+
{
176+
"description": "with no additional properties",
177+
"data": {
178+
"foo": "foo"
179+
},
180+
"valid": true
181+
},
182+
{
183+
"description": "with additional properties",
184+
"data": {
185+
"foo": "foo",
186+
"bar": "bar"
187+
},
188+
"valid": true
189+
}
190+
]
191+
},
163192
{
164193
"description": "unevaluatedProperties with nested properties",
165194
"schema": {

‎lib/src/testFixtures/resources/suite/tests/draft2020-12/optional/format/date-time.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,21 @@
9696
"data": "1963-06-19T08:30:06.28123+01:00Z",
9797
"valid": false
9898
},
99+
{
100+
"description": "an invalid hour in date-time string",
101+
"data": "1990-12-31T24:00:00Z",
102+
"valid": false
103+
},
104+
{
105+
"description": "an invalid minute in date-time string",
106+
"data": "1990-12-31T15:60:00Z",
107+
"valid": false
108+
},
109+
{
110+
"description": "an invalid offset minute in date-time string",
111+
"data": "1990-12-31T10:00:00+10:60",
112+
"valid": false
113+
},
99114
{
100115
"description": "an invalid date-time string",
101116
"data": "06/19/1963 08:30:06 PST",

0 commit comments

Comments
 (0)