Updated validator package to 0.2.0

README.md

@@ -116,7 +116,7 @@ Make sure you have set up the project properly before running the tests, see abo
    1. `python test_report.py`
    2. Above command will run all test cases and generate the html report, in `reports` folder at the root level.
 3. To run the coverage
-   1. `coverage run --source=src -m unittest discover -s tests/unit_tests`
+   1. `python -m coverage run --source=src -m unittest discover -s tests/unit_tests`
    2. Above command will run all the unit test cases.
    3. To generate the coverage report in console
       1. `coverage report`

requirements.txt

@@ -7,4 +7,4 @@ uvicorn==0.20.0
 coverage==7.2.7
 html_testRunner==1.2.1
 httpx==0.24.1
-python-osw-validation==0.0.5
+python-osw-validation==0.2.0

test_report.py

@@ -3,7 +3,7 @@
 
 # Define your test cases
 from tests.unit_tests.test_queue_message_content import TestUpload, TestUploadData, TestToJson, TestValidationResult
-from tests.unit_tests.test_validation import TestSuccessValidation, TestFailureValidation
+from tests.unit_tests.test_validation import TestOtherValidation, TestValidation
 from tests.unit_tests.test_osw_validator import TestOSWValidator
 from tests.unit_tests.test_main import TestApp
 
@@ -15,8 +15,8 @@
     test_suite.addTest(unittest.makeSuite(TestUploadData))
     test_suite.addTest(unittest.makeSuite(TestToJson))
     test_suite.addTest(unittest.makeSuite(TestValidationResult))
-    test_suite.addTest(unittest.makeSuite(TestSuccessValidation))
-    test_suite.addTest(unittest.makeSuite(TestFailureValidation))
+    test_suite.addTest(unittest.makeSuite(TestOtherValidation))
+    test_suite.addTest(unittest.makeSuite(TestValidation))
     test_suite.addTest(unittest.makeSuite(TestOSWValidator))
     test_suite.addTest(unittest.makeSuite(TestApp))
 

tests/unit_tests/test_validation.py

@@ -21,7 +21,7 @@
 WRONG_DATATYPE_FILE_NAME = 'wrong_datatype.zip'
 
 
-class TestSuccessValidation(unittest.TestCase):
+class TestOtherValidation(unittest.TestCase):
 
     @patch.object(Validation, 'download_single_file')
     def setUp(self, mock_download_single_file):
@@ -44,33 +44,6 @@ def setUp(self, mock_download_single_file):
     def tearDown(self):
         pass
 
-    def test_validate_with_valid_file(self):
-        # Arrange
-        file_path = f'{DOWNLOAD_FILE_PATH}/{SUCCESS_FILE_NAME}'
-        expected_downloaded_file_path = file_path
-        self.validator.download_single_file = MagicMock(return_value=expected_downloaded_file_path)
-        Validation.clean_up = MagicMock()
-
-        # Act
-        result = self.validator.validate()
-
-        # Assert
-        self.assertTrue(result.is_valid)
-
-    def test_is_osw_valid_with_valid_file(self):
-        # Arrange
-        file_path = f'{DOWNLOAD_FILE_PATH}/{SUCCESS_FILE_NAME}'
-        expected_downloaded_file_path = file_path
-        self.validator.download_single_file = MagicMock(return_value=expected_downloaded_file_path)
-        Validation.clean_up = MagicMock()
-
-        # Act
-        result = self.validator.validate()
-
-        # Assert
-        self.assertTrue(result.is_valid)
-        Validation.clean_up.assert_called_once_with(file_path)
-
     def test_download_single_file(self):
         # Arrange
         file_upload_path = DOWNLOAD_FILE_PATH
@@ -121,7 +94,7 @@ def test_clean_up_folder(self):
         # self.assertFalse(os.path.exists(directory_name))
 
 
-class TestFailureValidation(unittest.TestCase):
+class TestValidation(unittest.TestCase):
 
     @patch.object(Validation, 'download_single_file')
     def setUp(self, mock_download_single_file):
@@ -175,7 +148,7 @@ def test_is_osw_valid_with_invalid_zip_file(self):
 
     def test_is_osw_valid_with_invalid_format_file(self):
         # Arrange
-        file_path = f'{SAVED_FILE_PATH}/${FAILURE_FILE_NAME}'
+        file_path = f'{SAVED_FILE_PATH}/{FAILURE_FILE_NAME}'
         expected_downloaded_file_path = file_path
         self.validator.download_single_file = MagicMock(return_value=expected_downloaded_file_path)
         Validation.clean_up = MagicMock()