Refactor tests

Author: jochenklar

tests/__init__.py

@@ -0,0 +1,16 @@
+import yaml
+
+
+def read_file(file_path):
+    return yaml.safe_load(file_path.read_text(encoding='utf-8'))
+
+
+def read_instance(file_path):
+    if file_path.is_dir():
+        instance = []
+        for group_path in file_path.iterdir():
+            if group_path.suffix == '.yaml':
+                instance += read_file(group_path)
+        return instance
+    elif file_path.suffix == '.yaml':
+        return read_file(file_path)

tests/helpers.py

@@ -1,26 +1,14 @@
 from pathlib import Path
 
 import jsonschema
-import yaml
 
+from .helpers import read_file, read_instance
 
-def read_file(file_path):
-    return yaml.safe_load(file_path.read_text(encoding='utf-8'))
-
-
-def read_instance(file_path):
-    if file_path.is_dir():
-        instance = []
-        for group_path in file_path.iterdir():
-            if group_path.suffix == '.yaml':
-                instance += read_file(group_path)
-        return instance
-    elif file_path.suffix == '.yaml':
-        return read_file(file_path)
+meta_path = Path(__file__).parent.joinpath('meta.yaml')
 
 
 def test_definitions():
-    schema = read_file(Path(__file__).parent.joinpath('meta.yaml'))
+    schema = read_file(meta_path)
 
     for file_path in Path('definitions').iterdir():
         # read the instance

tests/test_definitions.py

@@ -1,21 +1,21 @@
-import json
-import os
 import re
+from pathlib import Path
 
 import pytest
 
+from .helpers import read_file
 
-def test_patterns():
-    for root, _, files in os.walk('pattern'):
-        for file_name in files:
-            if file_name.endswith('.json'):
-                file_path = os.path.join(root, file_name)
+pattern_keys = ['path', 'dataset', 'file']
+pattern_paths = list(Path('pattern').rglob('*.yaml'))
 
-                with open(file_path) as f:
-                    pattern_json = json.loads(f.read())
-                    pattern = os.linesep.join(pattern_json)
+@pytest.mark.parametrize('pattern_key', pattern_keys)
+@pytest.mark.parametrize('pattern_path', pattern_paths, ids=lambda x: str(x))
+def test_pattern(pattern_key, pattern_path):
+    pattern = read_file(pattern_path).get(pattern_key)
+    if pattern:
+        pattern = re.sub(r'\s+', '', pattern)
 
-                    try:
-                        re.compile(pattern)
-                    except re.error:
-                        pytest.fail(file_path)
+        try:
+            re.compile(pattern)
+        except re.error as e:
+            pytest.fail(f'Error with "{pattern_key}" in {pattern_path}: {e}')

tests/test_pattern.py

@@ -1,16 +1,22 @@
-import json
-import os
+from pathlib import Path
 
+import pytest
 from jsonschema import Draft7Validator
 
+from .helpers import read_file
 
-def test_patterns():
-    for root, _, files in os.walk('schema'):
-        for file_name in files:
-            if file_name.endswith('.json'):
-                file_path = os.path.join(root, file_name)
+schema_paths = sorted(Path('schema').rglob('*.yaml'))
 
-                with open(file_path) as f:
-                    schema = json.loads(f.read())
+@pytest.mark.parametrize('schema_path', schema_paths, ids=lambda x: str(x))
+def test_schema(schema_path):
+    schema = read_file(schema_path)
 
-                assert Draft7Validator.check_schema(schema) is None
+    assert Draft7Validator.check_schema(schema) is None
+
+    assert schema['type'] == 'object'
+    assert 'specifiers' in schema['required']
+    assert 'specifiers' in schema['properties']
+
+    assert schema['properties']['specifiers']['type'] == 'object'
+    assert 'required' in schema['properties']['specifiers']
+    assert 'properties' in schema['properties']['specifiers']

tests/test_schema.py

@@ -0,0 +1,16 @@
+from pathlib import Path
+
+import pytest
+
+from .helpers import read_file
+
+tree_paths = list(Path('tree').rglob('*.yaml'))
+
+@pytest.mark.parametrize('tree_path', tree_paths, ids=lambda x: str(x))
+def test_tree(tree_path):
+    tree = read_file(tree_path)
+
+    assert isinstance(tree, list)
+    assert tree[0] == 'simulation_round'
+    assert tree[1] == 'product'
+    assert tree[2] in ['category', 'sector', 'publication']