Updated conceptual mappings diff tests

Author: Kolea Plesco

ted_sws/mapping_suite_processor/entrypoints/cli/cmd_conceptual_mapping_differ.py

@@ -140,7 +140,9 @@ def run_cmd(self):
         else:
             error = Exception("Cannot do a diff with provided input!")
 
-        self._report(diff=diff, files=[filepath1, filepath2])
+        if not error:
+            self._report(diff=diff, files=[filepath1, filepath2])
+
         self.run_cmd_result(error)
 
 

tests/e2e/mapping_suite_processor/conceptual_mapping_differ/test_cmd_conceptual_mapping_differ.py

@@ -48,6 +48,7 @@ def test_cmd_conceptual_mapping_differ(caplog, cli_runner, fake_test_mapping_sui
         response = cli_runner.invoke(cli_main,
                                      ["--opt-mappings-folder", temp_mapping_suite_path,
                                       "--opt-output-folder", temp_folder])
+
         assert "FAILED" in response.output
         assert "Cannot do a diff" in response.output
 

tests/e2e/mapping_suite_processor/conceptual_mapping_differ/test_conceptual_mapping_differ.py

@@ -19,32 +19,37 @@ def test_mapping_suite_diff_conceptual_mappings():
 
     mapping2.metadata = metadata1
 
-    assert not mapping_suite_diff_conceptual_mappings([mapping1, mapping2])
+    assert not mapping_suite_diff_conceptual_mappings([mapping1, mapping2])['data']
 
 
 def test_mapping_suite_diff_file_conceptual_mappings(package_folder_path, package_F03_folder_path):
     """"""
     filepath1 = package_folder_path / MS_TRANSFORM_FOLDER_NAME / MS_CONCEPTUAL_MAPPING_FILE_NAME
     filepath2 = package_F03_folder_path / MS_TRANSFORM_FOLDER_NAME / MS_CONCEPTUAL_MAPPING_FILE_NAME
 
-    assert mapping_suite_diff_files_conceptual_mappings([filepath1, filepath2])
+    diff = mapping_suite_diff_files_conceptual_mappings([filepath1, filepath2])
+    assert diff['metadata']
+    assert diff['data']
 
 
 def test_mapping_suite_diff_repo_conceptual_mappings(github_mapping_suite_id, package_folder_path):
     """"""
 
-    assert not mapping_suite_diff_repo_conceptual_mappings(
+    diff = mapping_suite_diff_repo_conceptual_mappings(
         branch_or_tag_name=["main"],
         mapping_suite_id=[github_mapping_suite_id],
     )
+    assert not diff['data']
 
-    assert mapping_suite_diff_repo_conceptual_mappings(
+    diff = mapping_suite_diff_repo_conceptual_mappings(
         branch_or_tag_name=["main"],
         mapping_suite_id=[github_mapping_suite_id],
         filepath=package_folder_path / MS_TRANSFORM_FOLDER_NAME / MS_CONCEPTUAL_MAPPING_FILE_NAME
     )
+    assert diff['data']
 
-    assert mapping_suite_diff_repo_conceptual_mappings(
+    diff = mapping_suite_diff_repo_conceptual_mappings(
         branch_or_tag_name=["main"],
         mapping_suite_id=[github_mapping_suite_id, "package_F03_test"]
     )
+    assert diff['data']