Skip to content

error paths for additionalItems, additionalProperties and patternProperties #75

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion jsonschema.py
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ def validate_patternProperties(self, patternProperties, instance, schema):
for k, v in iteritems(instance):
if re.search(pattern, k):
for error in self.iter_errors(v, subschema):
error.path.appendleft(k)
yield error

def validate_additionalProperties(self, aP, instance, schema):
Expand All @@ -190,6 +191,7 @@ def validate_additionalProperties(self, aP, instance, schema):
if self.is_type(aP, "object"):
for extra in extras:
for error in self.iter_errors(instance[extra], aP):
error.path.appendleft(extra)
yield error
elif not aP and extras:
error = "Additional properties are not allowed (%s %s unexpected)"
Expand Down Expand Up @@ -218,8 +220,10 @@ def validate_additionalItems(self, aI, instance, schema):
return

if self.is_type(aI, "object"):
for item in instance[len(schema):]:
for index, item in enumerate(
instance[len(schema.get("items", [])):]):
for error in self.iter_errors(item, aI):
error.path.appendleft(index)
yield error
elif not aI and len(instance) > len(schema.get("items", [])):
error = "Additional items are not allowed (%s %s unexpected)"
Expand Down
49 changes: 49 additions & 0 deletions tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,55 @@ def test_multiple_nesting(self):
self.assertEqual(e5.validator, "minItems")
self.assertEqual(e6.validator, "enum")

def test_additionalProperties(self):
instance = {"bar": "bar", "foo": 2}
schema = {
"additionalProperties" : {"type": "integer", "minimum": 5}
}

errors = self.validator.iter_errors(instance, schema)
e1, e2 = sorted_errors(errors)

self.assertEqual(list(e1.path), ["bar"])
self.assertEqual(list(e2.path), ["foo"])

self.assertEqual(e1.validator, "type")
self.assertEqual(e2.validator, "minimum")

def test_patternProperties(self):
instance = {"bar": 1, "foo": 2}
schema = {
"patternProperties" : {
"bar": {"type": "string"},
"foo": {"minimum": 5}
}
}

errors = self.validator.iter_errors(instance, schema)
e1, e2 = sorted_errors(errors)

self.assertEqual(list(e1.path), ["bar"])
self.assertEqual(list(e2.path), ["foo"])

self.assertEqual(e1.validator, "type")
self.assertEqual(e2.validator, "minimum")

def test_additionalItems(self):
instance = ["foo", 1]
schema = {
"items": [],
"additionalItems" : {"type": "integer", "minimum": 5}
}

errors = self.validator.iter_errors(instance, schema)
e1, e2 = sorted_errors(errors)

self.assertEqual(list(e1.path), [0])
self.assertEqual(list(e2.path), [1])

self.assertEqual(e1.validator, "type")
self.assertEqual(e2.validator, "minimum")


class TestErrorTree(unittest.TestCase):
def setUp(self):
Expand Down