Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

contains no longer applies to objects #705

Merged
merged 2 commits into from
Nov 21, 2023
Merged

contains no longer applies to objects #705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec553d7
contains no longer applies to objects
gregsdennis Nov 18, 2023
1d3aa49
remove more maxContains
gregsdennis Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 17 additions & 87 deletions tests/draft-next/contains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,31 +31,6 @@
"data": [],
"valid": false
},
{
"description": "object with property matching schema (5) is valid",
"data": { "a": 3, "b": 4, "c": 5 },
"valid": true
},
{
"description": "object with property matching schema (6) is valid",
"data": { "a": 3, "b": 4, "c": 6 },
"valid": true
},
{
"description": "object with two properties matching schema (5, 6) is valid",
"data": { "a": 3, "b": 4, "c": 5, "d": 6 },
"valid": true
},
{
"description": "object without properties matching schema is invalid",
"data": { "a": 2, "b": 3, "c": 4 },
"valid": false
},
{
"description": "empty object is invalid",
"data": {},
"valid": false
},
Comment on lines -34 to -58
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to re-add the test for an object being true.

Copy link
Member Author

@gregsdennis gregsdennis Nov 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does line 107 not satisfy that?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose it does.

{
"description": "not array or object is valid",
"data": 42,
Expand Down Expand Up @@ -84,21 +59,6 @@
"description": "array without item 5 is invalid",
"data": [1, 2, 3, 4],
"valid": false
},
{
"description": "object with property 5 is valid",
"data": { "a": 3, "b": 4, "c": 5 },
"valid": true
},
{
"description": "object with two properties 5 is valid",
"data": { "a": 3, "b": 4, "c": 5, "d": 5 },
"valid": true
},
{
"description": "object without property 5 is invalid",
"data": { "a": 1, "b": 2, "c": 3, "d": 4 },
"valid": false
}
]
},
Expand All @@ -118,16 +78,6 @@
"description": "empty array is invalid",
"data": [],
"valid": false
},
{
"description": "any non-empty object is valid",
"data": { "a": "foo" },
"valid": true
},
{
"description": "empty object is invalid",
"data": {},
"valid": false
}
]
},
Expand All @@ -149,18 +99,28 @@
"valid": false
},
{
"description": "any non-empty object is invalid",
"data": ["foo"],
"valid": false
"description": "non-arrays are valid - string",
"data": "contains does not apply to strings",
"valid": true
},
{
"description": "empty object is invalid",
"description": "non-arrays are valid - object",
"data": {},
"valid": false
"valid": true
},
{
"description": "non-arrays/objects are valid",
"data": "contains does not apply to strings",
"description": "non-arrays are valid - number",
"data": 42,
"valid": true
},
{
"description": "non-arrays are valid - boolean",
"data": false,
"valid": true
},
{
"description": "non-arrays are valid - null",
"data": null,
"valid": true
}
]
Expand Down Expand Up @@ -193,26 +153,6 @@
"description": "matches neither items nor contains",
"data": [1, 5],
"valid": false
},
{
"description": "matches additionalProperties, does not match contains",
"data": { "a": 2, "b": 4, "c": 8 },
"valid": false
},
{
"description": "does not match additionalProperties, matches contains",
"data": { "a": 3, "b": 6, "c": 9 },
"valid": false
},
{
"description": "matches both additionalProperties and contains",
"data": { "a": 6, "b": 12 },
"valid": true
},
{
"description": "matches neither additionalProperties nor contains",
"data": { "a": 1, "b": 5 },
"valid": false
}
]
},
Expand All @@ -235,16 +175,6 @@
"description": "empty array is invalid",
"data": [],
"valid": false
},
{
"description": "any non-empty object is valid",
"data": { "a": "foo" },
"valid": true
},
{
"description": "empty object is invalid",
"data": {},
"valid": false
}
]
},
Expand Down
40 changes: 0 additions & 40 deletions tests/draft-next/maxContains.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,31 +60,6 @@
"description": "some elements match, invalid maxContains",
"data": [1, 2, 1],
"valid": false
},
{
"description": "empty object",
"data": {},
"valid": false
},
{
"description": "all properties match, valid maxContains",
"data": { "a": 1 },
"valid": true
},
{
"description": "all properties match, invalid maxContains",
"data": { "a": 1, "b": 1 },
"valid": false
},
{
"description": "some properties match, valid maxContains",
"data": { "a": 1, "b": 2 },
"valid": true
},
{
"description": "some properties match, invalid maxContains",
"data": { "a": 1, "b": 2, "c": 1 },
"valid": false
}
]
},
Expand Down Expand Up @@ -131,21 +106,6 @@
"description": "array with minContains < maxContains < actual",
"data": [1, 1, 1, 1],
"valid": false
},
{
"description": "object with actual < minContains < maxContains",
"data": {},
"valid": false
},
{
"description": "object with minContains < actual < maxContains",
"data": { "a": 1, "b": 1 },
"valid": true
},
{
"description": "object with minContains < maxContains < actual",
"data": { "a": 1, "b": 1, "c": 1, "d": 1 },
"valid": false
}
]
}
Expand Down
51 changes: 0 additions & 51 deletions tests/draft-next/unevaluatedProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1365,57 +1365,6 @@
}
]
},
{
"description": "unevaluatedProperties depends on adjacent contains",
"schema": {
"$schema": "https://json-schema.org/draft/next/schema",
"properties": {
"foo": { "type": "number" }
},
"contains": { "type": "string" },
"unevaluatedProperties": false
},
"tests": [
{
"description": "bar is evaluated by contains",
"data": { "foo": 1, "bar": "foo" },
"valid": true
},
{
"description": "contains fails, bar is not evaluated",
"data": { "foo": 1, "bar": 2 },
"valid": false
},
{
"description": "contains passes, bar is not evaluated",
"data": { "foo": 1, "bar": 2, "baz": "foo" },
"valid": false
}
]
},
{
"description": "unevaluatedProperties depends on multiple nested contains",
"schema": {
"$schema": "https://json-schema.org/draft/next/schema",
"allOf": [
{ "contains": { "multipleOf": 2 } },
{ "contains": { "multipleOf": 3 } }
],
"unevaluatedProperties": { "multipleOf": 5 }
},
"tests": [
{
"description": "5 not evaluated, passes unevaluatedItems",
"data": { "a": 2, "b": 3, "c": 4, "d": 5, "e": 6 },
"valid": true
},
{
"description": "7 not evaluated, fails unevaluatedItems",
"data": { "a": 2, "b": 3, "c": 4, "d": 7, "e": 8 },
"valid": false
}
]
},
{
"description": "non-object instances are valid",
"schema": {
Expand Down