fix all tests

Author: CaptainOfHacks

ted_sws/data_manager/adapters/notice_repository.py

@@ -76,11 +76,17 @@ def write_large_field(large_field: Manifestation):
         write_large_field(notice.distilled_rdf_manifestation)
         write_large_field(notice.preprocessed_xml_manifestation)
         if notice.rdf_manifestation:
-            for validation_report in notice.rdf_manifestation.validation:
+            for validation_report in notice.rdf_manifestation.shacl_validations:
+                write_large_field(validation_report)
+
+            for validation_report in notice.rdf_manifestation.sparql_validations:
                 write_large_field(validation_report)
 
         if notice.distilled_rdf_manifestation:
-            for validation_report in notice.distilled_rdf_manifestation.validation:
+            for validation_report in notice.distilled_rdf_manifestation.shacl_validations:
+                write_large_field(validation_report)
+
+            for validation_report in notice.distilled_rdf_manifestation.sparql_validations:
                 write_large_field(validation_report)
 
         return notice
@@ -102,10 +108,16 @@ def load_large_field(large_field: Manifestation):
         load_large_field(large_field=notice.distilled_rdf_manifestation)
         load_large_field(large_field=notice.preprocessed_xml_manifestation)
         if notice.rdf_manifestation:
-            for validation_report in notice.rdf_manifestation.validation:
+            for validation_report in notice.rdf_manifestation.shacl_validations:
                 load_large_field(validation_report)
+            for validation_report in notice.rdf_manifestation.sparql_validations:
+                load_large_field(validation_report)
+
         if notice.distilled_rdf_manifestation:
-            for validation_report in notice.distilled_rdf_manifestation.validation:
+            for validation_report in notice.distilled_rdf_manifestation.shacl_validations:
+                load_large_field(validation_report)
+
+            for validation_report in notice.distilled_rdf_manifestation.sparql_validations:
                 load_large_field(validation_report)
 
         return notice

ted_sws/notice_validator/entrypoints/cli/cmd_shacl_runner.py

@@ -5,11 +5,10 @@
 import click
 
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH, DEFAULT_OUTPUT_PATH
-from ted_sws.core.model.manifestation import RDFManifestation
+from ted_sws.core.model.manifestation import RDFManifestation, SHACLTestSuiteValidationReport
 from ted_sws.data_manager.adapters.mapping_suite_repository import MappingSuiteRepositoryInFileSystem
 from ted_sws.event_manager.adapters.logger import LOG_INFO_TEXT
-from ted_sws.notice_validator.model.shacl_test_suite import SHACLSuiteValidationReport
-from ted_sws.notice_validator.services.shacl_test_suite_runner import SHACLTestSuiteRunner, SHACLReportBuilder
+from ted_sws.notice_validator.services.shacl_test_suite_runner import SHACLTestSuiteRunner, generate_shacl_report
 
 DEFAULT_RDF_FOLDER = '{mappings_path}/{mapping_suite_id}/' + DEFAULT_OUTPUT_PATH
 DEFAULT_TEST_SUITE_REPORT_FOLDER = "test_suite_report"
@@ -57,8 +56,7 @@ def validate(self, rdf_file, base_report_path):
                                                         shacl_test_suite=shacl_test_suite,
                                                         mapping_suite=self.mapping_suite).execute_test_suite()
 
-            report_builder = SHACLReportBuilder(shacl_test_suite_execution=test_suite_execution)
-            report: SHACLSuiteValidationReport = report_builder.generate_report()
+            report: SHACLTestSuiteValidationReport = generate_shacl_report(shacl_test_suite_execution=test_suite_execution)
 
             suite_id = shacl_test_suite.identifier
             data = report.object_data

ted_sws/notice_validator/entrypoints/cli/cmd_sparql_runner.py

@@ -6,7 +6,7 @@
 import click
 
 from ted_sws.core.adapters.cmd_runner import CmdRunner as BaseCmdRunner, DEFAULT_MAPPINGS_PATH, DEFAULT_OUTPUT_PATH
-from ted_sws.core.model.manifestation import RDFManifestation, RDFValidationManifestation
+from ted_sws.core.model.manifestation import RDFManifestation
 from ted_sws.data_manager.adapters.mapping_suite_repository import MappingSuiteRepositoryInFileSystem
 from ted_sws.event_manager.adapters.logger import LOG_INFO_TEXT
 from ted_sws.notice_validator.services.sparql_test_suite_runner import SPARQLTestSuiteRunner, SPARQLReportBuilder

tests/e2e/data_manager/test_notice_repository.py

@@ -51,10 +51,10 @@ def test_notice_repository_store_validation_reports_in_grid_fs(notice_with_disti
     validate_notice_with_shacl_suite(notice=notice, mapping_suite_package=dummy_mapping_suite)
     notice_repository.add(notice)
     result_notice = notice_repository.get(reference=notice.ted_id)
-    for validation_report, result_validation_report in zip(notice.rdf_manifestation.validation, result_notice.rdf_manifestation.validation):
+    for validation_report, result_validation_report in zip(notice.rdf_manifestation.shacl_validations, result_notice.rdf_manifestation.shacl_validations):
         assert validation_report.object_data == result_validation_report.object_data
 
-    for validation_report, result_validation_report in zip(notice.distilled_rdf_manifestation.validation,
-                                                           result_notice.distilled_rdf_manifestation.validation):
+    for validation_report, result_validation_report in zip(notice.distilled_rdf_manifestation.shacl_validations,
+                                                           result_notice.distilled_rdf_manifestation.shacl_validations):
         assert validation_report.object_data == result_validation_report.object_data
 

tests/features/model/conftest.py

@@ -10,7 +10,7 @@
 import pytest
 
 from ted_sws.core.model.manifestation import XMLManifestation, RDFManifestation, METSManifestation, \
-    RDFValidationManifestation
+    SPARQLTestSuiteValidationReport, SHACLTestSuiteValidationReport
 from ted_sws.core.model.metadata import TEDMetadata, NormalisedMetadata
 from ted_sws.core.model.notice import Notice, NoticeStatus
 
@@ -26,13 +26,26 @@ def fetched_notice_data():
 @pytest.fixture(scope="function")
 def publicly_available_notice(fetched_notice_data, normalised_metadata_dict) -> Notice:
     ted_id, original_metadata, xml_manifestation = fetched_notice_data
-    validation = RDFValidationManifestation(object_data="this is a validation report")
+    sparql_validation = SPARQLTestSuiteValidationReport(object_data="This is validation report!",
+                                                        test_suite_identifier="sparql_test_id",
+                                                        mapping_suite_identifier="mapping_suite_id",
+                                                        validation_results=[])
+    shacl_validation = SHACLTestSuiteValidationReport(object_data="This is validation report!",
+                                                      test_suite_identifier="shacl_test_id",
+                                                      mapping_suite_identifier="mapping_suite_id",
+                                                      validation_results=[])
     notice = Notice(ted_id=ted_id, original_metadata=original_metadata,
                     xml_manifestation=xml_manifestation)
-    notice._rdf_manifestation = RDFManifestation(object_data="RDF manifestation content", validation=[validation])
+    notice._rdf_manifestation = RDFManifestation(object_data="RDF manifestation content",
+                                                 shacl_validations=[shacl_validation],
+                                                 sparql_validations=[sparql_validation]
+                                                 )
+    notice._distilled_rdf_manifestation = RDFManifestation(object_data="RDF manifestation content",
+                                                           shacl_validations=[shacl_validation],
+                                                           sparql_validations=[sparql_validation]
+                                                           )
     notice._mets_manifestation = METSManifestation(object_data="METS manifestation content")
     notice._normalised_metadata = NormalisedMetadata(**normalised_metadata_dict)
-    notice._distilled_rdf_manifestation = RDFManifestation(object_data="RDF manifestation content", validation=[validation])
     notice._preprocessed_xml_manifestation = xml_manifestation
     notice._status = NoticeStatus.PUBLICLY_AVAILABLE
     return notice

tests/features/model/test_notice_operations.py

@@ -117,7 +117,7 @@ def step_impl(raw_notice):
 
 
 @given("the notice already contains normalised metadata")
-def step_impl(raw_notice,normalised_metadata_dict):
+def step_impl(raw_notice, normalised_metadata_dict):
     raw_notice.set_normalised_metadata(NormalisedMetadata(**normalised_metadata_dict))
     assert raw_notice.normalised_metadata is not None
 
@@ -145,14 +145,16 @@ def step_impl(raw_notice):
 @then("notice contains no RDF validation")
 def step_impl(transformation_eligible_notice):
     assert transformation_eligible_notice
-    print(f"transformation_eligible_notice.get_rdf_validation() = {transformation_eligible_notice.get_rdf_validation()}")
+    print(
+        f"transformation_eligible_notice.get_rdf_validation() = {transformation_eligible_notice.get_rdf_validation()}")
     assert transformation_eligible_notice.get_rdf_validation() == []
 
 
 @then("notice not contains RDF validation")
 def step_impl(transformation_eligible_notice):
     assert transformation_eligible_notice
-    print(f"transformation_eligible_notice.get_rdf_validation() = {transformation_eligible_notice.get_rdf_validation()}")
+    print(
+        f"transformation_eligible_notice.get_rdf_validation() = {transformation_eligible_notice.get_rdf_validation()}")
     assert transformation_eligible_notice.get_rdf_validation() is None
 
 
@@ -202,7 +204,10 @@ def step_impl(transformation_eligible_notice, old_rdf_manifestation, rdf_manifes
 
 @given("RDF validation report", target_fixture="rdf_validation")
 def step_impl():
-    return RDFValidationManifestation(object_data="this is another validation report")
+    return RDFValidationManifestation(object_data="this is another validation report",
+                                      test_suite_identifier="test_suite_id",
+                                      mapping_suite_identifier="mapping_suite_id"
+                                      )
 
 
 @given("the notice contains an RDF manifestation")
@@ -224,7 +229,7 @@ def step_impl(transformation_eligible_notice):
 
 @then("the notice status is VALIDATED")
 def step_impl(transformation_eligible_notice):
-    #TODO: Change feature text and tests, once the SPARQL test suite was refactor
+    # TODO: Change feature text and tests, once the SPARQL test suite was refactor
     # assert transformation_eligible_notice.status is NoticeStatus.VALIDATED
     assert transformation_eligible_notice.status is NoticeStatus.DISTILLED
     transformation_eligible_notice.update_status_to(new_status=NoticeStatus.VALIDATED)

tests/unit/core/model/conftest.py

@@ -10,7 +10,7 @@
 import pytest
 
 from ted_sws.core.model.manifestation import XMLManifestation, RDFManifestation, METSManifestation, \
-    RDFValidationManifestation
+    RDFValidationManifestation, SHACLTestSuiteValidationReport, SPARQLTestSuiteValidationReport
 from ted_sws.core.model.metadata import TEDMetadata, NormalisedMetadata
 from ted_sws.core.model.notice import Notice, NoticeStatus
 
@@ -26,13 +26,26 @@ def fetched_notice_data():
 @pytest.fixture(scope="function")
 def publicly_available_notice(fetched_notice_data, normalised_metadata_dict) -> Notice:
     ted_id, original_metadata, xml_manifestation = fetched_notice_data
-    validation = RDFValidationManifestation(object_data="this is a validation report")
+    sparql_validation = SPARQLTestSuiteValidationReport(object_data="This is validation report!",
+                                                        test_suite_identifier="sparql_test_id",
+                                                        mapping_suite_identifier="mapping_suite_id",
+                                                        validation_results=[])
+    shacl_validation = SHACLTestSuiteValidationReport(object_data="This is validation report!",
+                                                      test_suite_identifier="shacl_test_id",
+                                                      mapping_suite_identifier="mapping_suite_id",
+                                                      validation_results=[])
     notice = Notice(ted_id=ted_id, original_metadata=original_metadata,
                     xml_manifestation=xml_manifestation)
-    notice._rdf_manifestation = RDFManifestation(object_data="RDF manifestation content", validation=[validation])
+    notice._rdf_manifestation = RDFManifestation(object_data="RDF manifestation content",
+                                                 shacl_validations=[shacl_validation],
+                                                 sparql_validations=[sparql_validation]
+                                                 )
+    notice._distilled_rdf_manifestation = RDFManifestation(object_data="RDF manifestation content",
+                                                           shacl_validations=[shacl_validation],
+                                                           sparql_validations=[sparql_validation]
+                                                           )
     notice._mets_manifestation = METSManifestation(object_data="METS manifestation content")
     notice._normalised_metadata = NormalisedMetadata(**normalised_metadata_dict)
-    notice._distilled_rdf_manifestation = RDFManifestation(object_data="RDF manifestation content", validation=[validation])
     notice._preprocessed_xml_manifestation = xml_manifestation
     notice._status = NoticeStatus.PUBLICLY_AVAILABLE
     return notice

tests/unit/core/model/test_notice_rdf_validation.py

@@ -14,7 +14,6 @@
 
 
 def test_set_notice_rdf_validation(publicly_available_notice, raw_notice):
-    validation = RDFValidationManifestation(object_data="this is a new validation report")
     shacl_validation = SHACLTestSuiteValidationReport(object_data="this is a shacl validation report",
                                                   test_suite_identifier="shacl_test_suite_id",
                                                   mapping_suite_identifier="mapping_suite_id",
@@ -30,11 +29,10 @@ def test_set_notice_rdf_validation(publicly_available_notice, raw_notice):
     assert raw_notice.get_distilled_rdf_validation() is None
     assert raw_notice.get_rdf_validation() is None
     with pytest.raises(ValueError):
-        raw_notice.set_rdf_validation(validation)
+        raw_notice.set_rdf_validation(shacl_validation)
 
 
 def test_set_notice_distilled_rdf_validation(publicly_available_notice, raw_notice):
-    validation = RDFValidationManifestation(object_data="this is a new validation report")
     shacl_validation = SHACLTestSuiteValidationReport(object_data="this is a shacl validation report",
                                                   test_suite_identifier="shacl_test_suite_id",
                                                   mapping_suite_identifier="mapping_suite_id",
@@ -47,4 +45,4 @@ def test_set_notice_distilled_rdf_validation(publicly_available_notice, raw_noti
     assert publicly_available_notice.mets_manifestation is None
 
     with pytest.raises(ValueError):
-        raw_notice.set_distilled_rdf_validation(validation)
+        raw_notice.set_distilled_rdf_validation(shacl_validation)

tests/unit/notice_validator/test_model.py

@@ -1,4 +1,4 @@
-from ted_sws.notice_validator.model.sparql_test_suite import SPARQLQuery, SPARQLQueryResult, SPARQLTestSuiteExecution
+from ted_sws.core.model.manifestation import SPARQLQuery, SPARQLQueryResult, SPARQLTestSuiteValidationReport
 
 
 def test_sparql_query(query_content):
@@ -9,7 +9,7 @@ def test_sparql_query(query_content):
 
 def test_sparql_query_result(query_content):
     sparql_query = SPARQLQuery(query=query_content)
-    sparql_query_result = SPARQLQueryResult(query=sparql_query,result="pass")
+    sparql_query_result = SPARQLQueryResult(query=sparql_query, result="pass")
     assert "pass" == sparql_query_result.result
     assert isinstance(sparql_query_result, SPARQLQueryResult)
     assert "ASK" in sparql_query_result.query.query
@@ -20,10 +20,11 @@ def test_sparql_test_suite_execution(query_content):
     sparql_query_result_one = SPARQLQueryResult(query=sparql_query, result="pass")
     sparql_query_result_two = SPARQLQueryResult(query=sparql_query, result="fail")
     execution_results = [sparql_query_result_one, sparql_query_result_two]
-    test_suite_execution = SPARQLTestSuiteExecution(sparql_test_suite_identifier="cool",
-                                                    mapping_suite_identifier="awesome",
-                                                    object_data="RDFValidationManifestation here")
-    test_suite_execution.execution_results = execution_results
+    test_suite_execution = SPARQLTestSuiteValidationReport(test_suite_identifier="cool",
+                                                           mapping_suite_identifier="awesome",
+                                                           object_data="RDFValidationManifestation here",
+                                                           validation_results=execution_results
+                                                           )
     assert test_suite_execution.created
-    assert isinstance(test_suite_execution, SPARQLTestSuiteExecution)
-    assert len(test_suite_execution.execution_results) == 2
+    assert isinstance(test_suite_execution, SPARQLTestSuiteValidationReport)
+    assert len(test_suite_execution.validation_results) == 2