summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2018-09-03 10:28:57 +0100
committerJulian Berman <Julian@GrayVines.com>2018-09-03 10:28:57 +0100
commit6a7d58f58d1587460084aa7e46c764d6430be707 (patch)
treed7c11de2183b47c709147dd7235a50c7f05d2e00
parent0d16e04735912244e857971ff5bdd264cb2a1b39 (diff)
downloadjsonschema-6a7d58f58d1587460084aa7e46c764d6430be707.tar.gz
Call spades spades.
-rw-r--r--jsonschema/tests/_suite.py14
-rw-r--r--jsonschema/tests/test_jsonschema_test_suite.py6
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):