Refactor test helper schema merging

ucldc · Dec 18, 2023 · 9c67522 · 9c67522
1 parent 1463db7
commit 9c67522
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 16 deletions.
diff --git a/metadata_mapper/test/helpers/base_helper.py b/metadata_mapper/test/helpers/base_helper.py
@@ -20,11 +20,7 @@ class BaseTestHelper:
     that you want to generate the value for.
     """
 
-    # Default schema
-    # Define DEFAULT_SCHEMA to modify this in a sublcass
-    DEFAULT_SCHEMA = {}
-
-    # SCHEMA will be merged into DEFAULT_SCHEMA in order to generate
+    # SCHEMAs will be merged together in order to generate
     # the final fixture schema.
     SCHEMA = {}
 
@@ -91,7 +87,18 @@ def generate_fixture(self, schema_index: int = 0) -> dict[str, Any]:
         """
         Generates a test data fixture.
         """
-        schema = {**self.DEFAULT_SCHEMA, **self.SCHEMA}
+        schema = self.SCHEMA or {}
+
+        superschemas = [
+            super(c, self).SCHEMA
+            for c in list(reversed(type(self).__mro__))
+            if hasattr(super(c, self), "SCHEMA")
+        ]
+
+
+
+        for superschema in superschemas:
+            schema = {**superschema, **schema}
 
         return {
             key: self.generate_value_for(key, type) for (key, type) in schema.items()

diff --git a/...elpers/oai/content_dm/cca_vault_helper.py → ...pper/test/helpers/oai/cca_vault_helper.py b/...elpers/oai/content_dm/cca_vault_helper.py → ...pper/test/helpers/oai/cca_vault_helper.py
@@ -1,4 +1,4 @@
-from ..oai_helper import OaiTestHelper
+from .oai_helper import OaiTestHelper
 
 class CcaVaultTestHelper(OaiTestHelper):
 

diff --git a/metadata_mapper/test/helpers/oai/content_dm/csudh_helper.py b/metadata_mapper/test/helpers/oai/content_dm/csudh_helper.py
@@ -7,14 +7,6 @@
 
 class CsudhTestHelper(ContentdmTestHelper):
     SCHEMA = {
-        "contributor": "list_of_splittable_strings",
-        "coverage": "splittable_string",
-        "creator": "list_of_splittable_strings",
-        "identifier": "contentdm_identifier",
-        "language": "list_of_splittable_strings",
-        "spatial": "splittable_string",
-        "subject": "list_of_splittable_strings",
-        "type": "list_of_splittable_strings",
         "bibliographicCitation": str,
         "title": "csudh_title",
     }

diff --git a/metadata_mapper/test/helpers/oai/oai_helper.py b/metadata_mapper/test/helpers/oai/oai_helper.py
@@ -5,7 +5,7 @@
 
 class OaiTestHelper(BaseTestHelper):
 
-  DEFAULT_SCHEMA = {
+  SCHEMA = {
     "contributor": str,
     "creator": str,
     "date": [datetime] * randint(1, 9),