Skip to content

feature: Use jsonschema to validate the schema itself before load #62

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

Merged
cwacek merged 2 commits into from
Nov 18, 2016
Merged

feature: Use jsonschema to validate the schema itself before load #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec6dc16
feature: Use jsonschema to validate the schema itself before load
cwacek Nov 18, 2016
d19a6ea
Fix an actual schema validation error in one of the tests
cwacek Nov 18, 2016
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
3 changes: 3 additions & 0 deletions python_jsonschema_objects/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,12 @@ def __init__(self, schema_uri, resolved={}):
}
)

meta_validator = Draft4Validator(Draft4Validator.META_SCHEMA)
meta_validator.validate(self.schema)
self.validator = Draft4Validator(self.schema,
resolver=self.resolver)


self._classes = None
self._resolved = None

Expand Down
21 changes: 19 additions & 2 deletions test/test_pytest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,38 @@

import json
import six
import pkg_resources
import jsonschema
import python_jsonschema_objects as pjs

import logging
logging.basicConfig(level=logging.DEBUG)


def test_schema_validation():
""" Test that the ObjectBuilder validates the schema itself.
"""
schema = {
"$schema": "http://json-schema.org/schema#",
"id": "test",
"type": "object",
"properties": {
"name": "string",
"email": {"oneOf": [{"type": "string"}, {"type": "integer"}]},
},
"required": ["email"]
}
with pytest.raises(jsonschema.ValidationError):
pjs.ObjectBuilder(schema)


def test_regression_9():
schema = {
"$schema": "http://json-schema.org/schema#",
"id": "test",
"type": "object",
"properties": {
"name": {"type": "string"},
"email": {"oneOf": ["string", "integer"]},
"email": {"oneOf": [{"type": "string"}, {"type": "integer"}]},
},
"required": ["email"]
}
Expand Down
1 change: 0 additions & 1 deletion test/test_regression_17.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ def test_class():
"id": "claimed",
"type": ["string", "integer", "null"],
"description": "Robots Only. The human agent that has claimed this robot.",
"required": False
},
}
}
Expand Down