split dummy schema from code

Author: chbrandt

check.py

@@ -1,30 +1,6 @@
 import gpt
 
 
-planmap = {
-    'layers': {
-        'geologic_units': {
-            'columns': ['name','rgb','geo_type','geo_code'],
-            'geometry': 'Polygon'
-        },
-        'geologic_contacts': {
-            'columns': ['geo_type'],
-            'geometry': 'Linestring'
-        },
-        'surface_features': {
-            'columns': ['geo_type'],
-            'geometry': 'Polygon'
-        },
-        'linear_features': {
-            'columns': ['geo_type'],
-            'geometry': 'Linestring'
-        },
-        'layer_styles': {
-            'columns': ['styleQML','styleSLD']
-        }
-    }
-}
-
 def check_layer_names(pkg, layers):
     """
     Return True/False if all 'layers' were found/not
@@ -140,7 +116,7 @@ def check_crs(pkg):
     return len(CRSs) == 1
 
 
-def geopackage(gpkg):
+def geopackage(gpkg, schema_name='planmap'):
     """
     Checks to be done:
     - check layer names
@@ -150,13 +126,12 @@ def geopackage(gpkg):
     - check if there are multiple "shape" and "id" columns
     """
     pkg = gpt.read_file(gpkg)
-    # # make it "case insensitive" (lower the keys)
-    # for lname in list(pkg.keys()):
-    #     pkg[lname.lower()] = pkg[lname]
-    #     del pkg[lname]
+
+    import schema
+    gpkg_schema = getattr(schema,schema_name)
 
     # Check layer names
-    layers_defs = planmap['layers']
+    layers_defs = gpkg_schema['layers']
     layer_columns = {l:defs['columns'] for l,defs in layers_defs.items()}
 
     ok = check_layer_names(pkg, layers_defs.keys())

conftest.py

@@ -1,2 +1,3 @@
 def pytest_addoption(parser):
     parser.addoption("--pkgpath", action="store", default="path/to/PMID")
+    parser.addoption("--schema", action="store", default="planmap")

schema.py

@@ -0,0 +1,23 @@
+planmap = {
+    'layers': {
+        'geologic_units': {
+            'columns': ['name','rgb','geo_type','geo_code'],
+            'geometry': 'Polygon'
+        },
+        'geologic_contacts': {
+            'columns': ['geo_type'],
+            'geometry': 'Linestring'
+        },
+        'surface_features': {
+            'columns': ['geo_type'],
+            'geometry': 'Polygon'
+        },
+        'linear_features': {
+            'columns': ['geo_type'],
+            'geometry': 'Linestring'
+        },
+        'layer_styles': {
+            'columns': ['styleQML','styleSLD']
+        }
+    }
+}

test_geopackage.py

@@ -14,10 +14,10 @@
 
 
 _data = {
-    'gpkg': None
+    'gpkg': None,
+    'schema': None
 }
 
-
 # def find_gpkg(pkg_path):
 #     pkg_name = os.path.basename(os.path.abspath(pkg_path))
 #     pkg_specs = parse_package_name(pkg_name)
@@ -28,44 +28,54 @@
 def geopkg_path(pytestconfig):
     return pytestconfig.getoption('pkgpath')
 
+@pytest.fixture()
+def schema_name(pytestconfig):
+    return pytestconfig.getoption('schema')
+
 @pytest.fixture()
 def gpkg():
     return _data['gpkg']
 
-def test_00(geopkg_path):
+@pytest.fixture()
+def schema():
+    return _data['schema']
+
+@pytest.fixture()
+def layer_names():
+    layers_defs = _data['schema']['layers']
+    return layers_defs.keys()
+
+@pytest.fixture()
+def layers_columns():
+    layers_defs = _data['schema']['layers']
+    return {l:defs['columns'] for l,defs in layers_defs.items()}
+
+
+def test_00(geopkg_path, schema_name):
     assert os.path.exists(geopkg_path), "Geopackage file/path NOT found."
     gpkg = gpt.read_file(geopkg_path)
     assert gpkg, "Geopackage is apparently empty/null."
     _data['gpkg'] = gpkg
     print("\nGeopackage loaded ({})".format(geopkg_path))
+    import schema
+    gpkg_schema = getattr(schema,schema_name)
+    _data['schema'] = gpkg_schema
 
-# def test_geopackage():
-#     out = check.geopackage(_data['gpkg'])
 
-def test_layer_names(gpkg):
+def test_layer_names(gpkg, layer_names):
     print("\n* Layer names")
-    res = check.check_layer_names(gpkg)
-    if res:
-        print("\n".join(res))
-    assert len(res) == 0
+    res = check.check_layer_names(gpkg, layer_names)
+    assert res is True
 
-def test_field_names(gpkg):
+def test_field_names(gpkg, layers_columns):
     print("\n* Field names")
-    res = check.check_field_names(gpkg)
-    if res:
-        print("\n".join(res))
-    assert len(res) == 0
+    res = check.check_field_names(gpkg, layers_columns)
+    assert res is True
 
 def test_geometry(gpkg):
     res = check.check_geometry(gpkg)
-    if res:
-        print("\n* Geometry")
-        print("\n".join(res))
-    assert len(res) == 0
+    assert res is True
 
 def test_crs(gpkg):
     res = check.check_crs(gpkg)
-    if res:
-        print("\n* CRS")
-        print("\n".join(res))
-    assert len(res) == 0
+    assert res is True