diff --git a/README.md b/README.md index 28fa389..a62dfdb 100644 --- a/README.md +++ b/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` diff --git a/requirements.txt b/requirements.txt index 1b4e1ff..cb61bf7 100644 --- a/requirements.txt +++ b/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 \ No newline at end of file +python-osw-validation==0.2.0 \ No newline at end of file diff --git a/test_report.py b/test_report.py index 1364dcd..bd27d0e 100644 --- a/test_report.py +++ b/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)) diff --git a/tests/unit_tests/test_files/_id_missing.zip b/tests/unit_tests/test_files/_id_missing.zip index 2bf1c08..c81a7a2 100644 Binary files a/tests/unit_tests/test_files/_id_missing.zip and b/tests/unit_tests/test_files/_id_missing.zip differ diff --git a/tests/unit_tests/test_files/edges_invalid.zip b/tests/unit_tests/test_files/edges_invalid.zip index dd0ba63..0aff185 100644 Binary files a/tests/unit_tests/test_files/edges_invalid.zip and b/tests/unit_tests/test_files/edges_invalid.zip differ diff --git a/tests/unit_tests/test_files/invalid.zip b/tests/unit_tests/test_files/invalid.zip index 2e5626d..518a29f 100644 Binary files a/tests/unit_tests/test_files/invalid.zip and b/tests/unit_tests/test_files/invalid.zip differ diff --git a/tests/unit_tests/test_files/invalid_geometry.zip b/tests/unit_tests/test_files/invalid_geometry.zip index 9fa176e..e008aed 100644 Binary files a/tests/unit_tests/test_files/invalid_geometry.zip and b/tests/unit_tests/test_files/invalid_geometry.zip differ diff --git a/tests/unit_tests/test_files/missing_identifier.zip b/tests/unit_tests/test_files/missing_identifier.zip index 2bf1c08..d1580b3 100644 Binary files a/tests/unit_tests/test_files/missing_identifier.zip and b/tests/unit_tests/test_files/missing_identifier.zip differ diff --git a/tests/unit_tests/test_files/no_entity.zip b/tests/unit_tests/test_files/no_entity.zip index 1874e7a..4ec6252 100644 Binary files a/tests/unit_tests/test_files/no_entity.zip and b/tests/unit_tests/test_files/no_entity.zip differ diff --git a/tests/unit_tests/test_files/nodes_invalid.zip b/tests/unit_tests/test_files/nodes_invalid.zip index 2046a39..fcfb41f 100644 Binary files a/tests/unit_tests/test_files/nodes_invalid.zip and b/tests/unit_tests/test_files/nodes_invalid.zip differ diff --git a/tests/unit_tests/test_files/points_invalid.zip b/tests/unit_tests/test_files/points_invalid.zip index 66fd24b..5514f7d 100644 Binary files a/tests/unit_tests/test_files/points_invalid.zip and b/tests/unit_tests/test_files/points_invalid.zip differ diff --git a/tests/unit_tests/test_files/valid.zip b/tests/unit_tests/test_files/valid.zip index 06eb9d2..cce4828 100644 Binary files a/tests/unit_tests/test_files/valid.zip and b/tests/unit_tests/test_files/valid.zip differ diff --git a/tests/unit_tests/test_files/wrong_datatype.zip b/tests/unit_tests/test_files/wrong_datatype.zip index 173887e..c1868f5 100644 Binary files a/tests/unit_tests/test_files/wrong_datatype.zip and b/tests/unit_tests/test_files/wrong_datatype.zip differ diff --git a/tests/unit_tests/test_validation.py b/tests/unit_tests/test_validation.py index f8b3b60..b469969 100644 --- a/tests/unit_tests/test_validation.py +++ b/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()