Merge pull request #529 from OP-TED/feature/TED4-139

tests fix
OP-TED · Mar 27, 2024 · 6a848b4 · 6a848b4
2 parents d1108d2 + d9b084c
commit 6a848b4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ted_sws/data_manager/adapters/mapping_suite_repository.py b/ted_sws/data_manager/adapters/mapping_suite_repository.py
@@ -374,7 +374,7 @@ def _read_mapping_suite_package(self, mapping_suite_identifier: str) -> Optional
                                          shacl_test_suites=self._read_shacl_test_suites(package_path),
                                          sparql_test_suites=self._read_sparql_test_suites(package_path),
                                          transformation_test_data=self._read_test_data_package(package_path),
-                                         conceptual_mapping=self._read_conceptual_mapping(package_path) if not MS_MAPPING_TYPE_KEY in package_metadata else []) #TODO remove conceptual_mapping value assignment when conceptual mapping reader is removed
+                                         conceptual_mapping=self._read_conceptual_mapping(package_path)) #TODO remove conceptual_mapping value assignment when conceptual mapping reader is removed
             return mapping_suite
         return None
 

diff --git a/tests/e2e/notice_metadata_processor/conftest.py b/tests/e2e/notice_metadata_processor/conftest.py
@@ -3,7 +3,7 @@
 from ted_sws.core.model.manifestation import RDFManifestation
 from ted_sws.core.model.notice import NoticeStatus
 from ted_sws.core.model.transform import FileResource, SPARQLTestSuite, MetadataConstraints, TransformationRuleSet, \
-    SHACLTestSuite, TransformationTestData, MappingSuite
+    SHACLTestSuite, TransformationTestData, MappingSuite, MetadataConstraintsStandardForm
 from tests import TEST_DATA_PATH
 
 
@@ -189,7 +189,7 @@ def sparql_test_suite_with_invalid_query(invalid_sparql_file):
 
 @pytest.fixture
 def dummy_mapping_suite(sparql_test_suite, shacl_test_suite):
-    metadata_constrains = MetadataConstraints(constraints=dict())
+    metadata_constrains = MetadataConstraints(constraints=MetadataConstraintsStandardForm(eforms_subtype=[29],min_xsd_version=["R2.0.9.S01.E01"]))
     file_name = "fake_title.txt"
     empty_file_resource = FileResource(file_name=file_name, file_content="no content here", original_name=file_name)
     transformation_rule_set = TransformationRuleSet(resources=[empty_file_resource],

diff --git a/tests/features/notice_validator/conftest.py b/tests/features/notice_validator/conftest.py
@@ -3,7 +3,7 @@
 from ted_sws.core.model.manifestation import RDFManifestation
 from ted_sws.core.model.notice import NoticeStatus
 from ted_sws.core.model.transform import FileResource, SPARQLTestSuite, MetadataConstraints, TransformationRuleSet, \
-    SHACLTestSuite, TransformationTestData, MappingSuite
+    SHACLTestSuite, TransformationTestData, MappingSuite, MetadataConstraintsStandardForm
 from tests import TEST_DATA_PATH