From 6a7d58f58d1587460084aa7e46c764d6430be707 Mon Sep 17 00:00:00 2001 From: Julian Berman Date: Mon, 3 Sep 2018 10:28:57 +0100 Subject: Call spades spades. --- jsonschema/tests/_suite.py | 14 +++++++------- jsonschema/tests/test_jsonschema_test_suite.py | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jsonschema/tests/_suite.py b/jsonschema/tests/_suite.py index 1e25ad1..b9ff2e7 100644 --- a/jsonschema/tests/_suite.py +++ b/jsonschema/tests/_suite.py @@ -53,10 +53,10 @@ class Suite(object): def benchmark(self, runner): for name in validators: - self.collection(name=name).benchmark(runner=runner) + self.version(name=name).benchmark(runner=runner) - def collection(self, name): - return Collection( + def version(self, name): + return Version( name=name, path=self._root.descendant(["tests", name]), remotes=self._remotes(), @@ -64,7 +64,7 @@ class Suite(object): @attr.s(hash=True) -class Collection(object): +class Version(object): _path = attr.ib() _remotes = attr.ib() @@ -125,7 +125,7 @@ class Collection(object): for each in json.loads(path.getContent().decode("utf-8")): yield ( _Test( - collection=self, + version=self, subject=subject, case_description=each["description"], schema=each["schema"], @@ -138,7 +138,7 @@ class Collection(object): @attr.s(hash=True, repr=False) class _Test(object): - collection = attr.ib() + version = attr.ib() subject = attr.ib() case_description = attr.ib() @@ -158,7 +158,7 @@ class _Test(object): def fully_qualified_name(self): # pragma: no cover return " > ".join( [ - self.collection.name, + self.version.name, self.subject, self.case_description, self.description, diff --git a/jsonschema/tests/test_jsonschema_test_suite.py b/jsonschema/tests/test_jsonschema_test_suite.py index 703e4c5..57b420f 100644 --- a/jsonschema/tests/test_jsonschema_test_suite.py +++ b/jsonschema/tests/test_jsonschema_test_suite.py @@ -21,9 +21,9 @@ from jsonschema.validators import _DEPRECATED_DEFAULT_TYPES, create SUITE = Suite() -DRAFT3 = SUITE.collection(name="draft3") -DRAFT4 = SUITE.collection(name="draft4") -DRAFT6 = SUITE.collection(name="draft6") +DRAFT3 = SUITE.version(name="draft3") +DRAFT4 = SUITE.version(name="draft4") +DRAFT6 = SUITE.version(name="draft6") def skip_tests_containing_descriptions(**kwargs): -- cgit v1.2.1