Fixed unit test cases

Author: sujata-m

src/validation.py

@@ -9,6 +9,7 @@
 from python_osw_validation import OSWValidation
 from .models.queue_message_content import ValidationResult
 import uuid
+import json
 
 ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
 # Path used for download file generation.
@@ -55,8 +56,8 @@ def is_osw_valid(self, max_errors) -> ValidationResult:
                 validation_result = validator.validate(max_errors)
                 result.is_valid = validation_result.is_valid
                 if not result.is_valid:
-                    result.validation_message = validation_result.issues
-                    logger.error(f' Error While Validating File: {str(validation_result.issues)}')
+                    result.validation_message = json.dumps(validation_result.issues)
+                    logger.error(f' Error While Validating File: {json.dumps(validation_result.issues)}')
                 Validation.clean_up(downloaded_file_path)
             else:
                 result.validation_message = 'Failed to validate because unknown file format'

tests/unit_tests/test_config.py

@@ -38,7 +38,7 @@ def test_settings_with_invalid_auth_simulate(self):
     def test_default_settings(self):
         settings = Settings()
         self.assertEqual(settings.app_name, 'python-osw-validation')
-        self.assertEqual(settings.event_bus.container_name, 'osw')
+        self.assertEqual(settings.event_bus.container_name, 'tdei-storage-test')
         self.assertIsNone(settings.auth_permission_url)
         self.assertEqual(settings.max_concurrent_messages, 2)
 

tests/unit_tests/test_validation.py

@@ -1,4 +1,5 @@
 import os
+import json
 import unittest
 from pathlib import Path
 from src.validation import Validation
@@ -75,12 +76,36 @@ def test_validate_invalid_file(self, mock_download_file, mock_clean_up):
 
         # Assert that validation is marked as valid
         self.assertFalse(result.is_valid)
-        self.assertIn('Validation error', ' '.join(result.validation_message))
+        errors = json.loads(result.validation_message)
+        self.assertNotEqual(len(errors), 0)
 
 
         # Ensure clean_up is called twice (once for the file, once for the folder)
         self.assertEqual(mock_clean_up.call_count, 2)
 
+    @patch('src.validation.Validation.clean_up')
+    @patch('src.validation.Validation.download_single_file')
+    def test_validate_invalid_file_with_errors(self, mock_download_file, mock_clean_up):
+        """Test the validate method for a invalid file."""
+        mock_download_file.return_value = f'{SAVED_FILE_PATH}/{FAILURE_FILE_NAME}'
+        error_in_file = 'wa.microsoft.graph.edges.OSW.geojson'
+        feature_indexes = [3, 6, 8, 25]
+        error_message = "Additional properties are not allowed ('crossing' was unexpected)"
+        # Act
+        result = self.validation.validate(max_errors=10)
+
+        # Assert that validation is marked as valid
+        self.assertFalse(result.is_valid)
+        errors = json.loads(result.validation_message)
+        count = 0
+        for error in errors:
+            self.assertEqual(error['filename'], error_in_file)
+            self.assertEqual(error['error_message'][0], error_message)
+            self.assertEqual(error['feature_index'], feature_indexes[count])
+            count += 1
+        # Ensure clean_up is called twice (once for the file, once for the folder)
+        self.assertEqual(mock_clean_up.call_count, 2)
+
     @patch('src.validation.OSWValidation')
     @patch('src.validation.Validation.clean_up')
     def test_validate_invalid_zip(self, mock_clean_up, mock_osw_validation):