Update test_shacl_test_suite_runner.py

Author: CaptainOfHacks

tests/unit/notice_validator/test_shacl_test_suite_runner.py

@@ -1,11 +1,11 @@
 import pytest
 
-from ted_sws.core.model.manifestation import RDFManifestation, RDFValidationManifestation
+from ted_sws.core.model.manifestation import RDFManifestation, RDFValidationManifestation, \
+    SHACLTestSuiteValidationReport
 from ted_sws.core.model.notice import NoticeStatus
 from ted_sws.data_manager.adapters.mapping_suite_repository import MappingSuiteRepositoryInFileSystem
-from ted_sws.notice_validator.model.shacl_test_suite import SHACLSuiteValidationReport
-from ted_sws.notice_validator.services.shacl_test_suite_runner import SHACLTestSuiteRunner, SHACLReportBuilder, \
-    validate_notice_with_shacl_suite, validate_notice_by_id_with_shacl_suite
+from ted_sws.notice_validator.services.shacl_test_suite_runner import SHACLTestSuiteRunner, \
+    validate_notice_with_shacl_suite, validate_notice_by_id_with_shacl_suite, generate_shacl_report
 
 
 def test_sparql_query_test_suite_runner(rdf_file_content, shacl_test_suite, dummy_mapping_suite):
@@ -14,8 +14,8 @@ def test_sparql_query_test_suite_runner(rdf_file_content, shacl_test_suite, dumm
                                          mapping_suite=dummy_mapping_suite)
 
     test_suite_execution = sparql_runner.execute_test_suite()
-    assert isinstance(test_suite_execution, SHACLSuiteValidationReport)
-    assert isinstance(test_suite_execution.validation_result.results_dict, dict)
+    assert isinstance(test_suite_execution, SHACLTestSuiteValidationReport)
+    assert isinstance(test_suite_execution.validation_results.results_dict, dict)
 
 
 def test_sparql_query_test_suite_runner_error(rdf_file_content, dummy_mapping_suite, bad_shacl_test_suite):
@@ -25,21 +25,19 @@ def test_sparql_query_test_suite_runner_error(rdf_file_content, dummy_mapping_su
                                          mapping_suite=dummy_mapping_suite)
 
     test_suite_execution = sparql_runner.execute_test_suite()
-    assert isinstance(test_suite_execution, SHACLSuiteValidationReport)
-    assert test_suite_execution.validation_result.error
+    assert isinstance(test_suite_execution, SHACLTestSuiteValidationReport)
+    assert test_suite_execution.validation_results.error
 
 
 def test_shacl_report_builder(rdf_file_content, shacl_test_suite, dummy_mapping_suite):
     rdf_manifestation = RDFManifestation(object_data=rdf_file_content)
     sparql_runner = SHACLTestSuiteRunner(rdf_manifestation=rdf_manifestation, shacl_test_suite=shacl_test_suite,
                                          mapping_suite=dummy_mapping_suite)
-    report_builder = SHACLReportBuilder(shacl_test_suite_execution=sparql_runner.execute_test_suite())
-
-    reports = report_builder.generate_report()
-    assert isinstance(reports, RDFValidationManifestation)
-    assert reports.object_data
-    assert "shacl_test_package" in reports.object_data
-    assert reports.shacl_test_suite_identifier == "shacl_test_package"
+    report = generate_shacl_report(shacl_test_suite_execution=sparql_runner.execute_test_suite())
+    assert isinstance(report, RDFValidationManifestation)
+    assert report.object_data
+    assert "shacl_test_package" in report.object_data
+    assert report.test_suite_identifier == "shacl_test_package"
 
 
 def test_validate_notice_with_shacl_suite(notice_with_distilled_status, dummy_mapping_suite, rdf_file_content):
@@ -54,12 +52,12 @@ def test_validate_notice_with_shacl_suite(notice_with_distilled_status, dummy_ma
     assert len(rdf_validation) == 1
     assert isinstance(rdf_validation[0], RDFValidationManifestation)
     assert rdf_validation[0].object_data
-    assert rdf_validation[0].validation_result
+    assert rdf_validation[0].validation_results
     assert isinstance(distilled_rdf_validation, list)
     assert len(distilled_rdf_validation) == 1
     assert isinstance(distilled_rdf_validation[0], RDFValidationManifestation)
     assert distilled_rdf_validation[0].object_data
-    assert distilled_rdf_validation[0].validation_result
+    assert distilled_rdf_validation[0].validation_results
 
 
 def test_validate_notice_by_id_with_shacl_suite(notice_with_distilled_status, rdf_file_content, notice_repository,