Refactored and Organized Test Modules

- Moved test modules and data from the package directory to the root-level tests directory. - Updated directory structure to ensure clear separation of source code and tests. - Updated import statements in test modules to reflect new paths. - Restructured the tests module: - Renamed original automatic tests to `e2e` as they primarily test the main CLI scripts. - Added `unit` directory for unit tests. - Created `data` directory for shared test data files. This comprehensive refactoring improves project organization by clearly separating test code from application code. It facilitates easier test discovery and enhances maintainability by following common best practices.
GEUS-Glaciology-and-Climate · Jun 28, 2024 · 792d121 · 792d121
1 parent 7e04574
commit 792d121
Show file tree

Hide file tree

Showing 25 changed files with 32,211 additions and 32,209 deletions.
diff --git a/.github/workflows/unit_test.yml b/.github/workflows/unit_test.yml
@@ -30,4 +30,4 @@ jobs:
       - name: Run unit tests
         shell: bash
         run: |
-          python3 -m unittest discover pypromice
+          python3 -m unittest discover tests
diff --git a/src/pypromice/test/bufr_export/__init__.py → tests/__init__.py b/src/pypromice/test/bufr_export/__init__.py → tests/__init__.py
diff --git a/src/pypromice/test/test_config1.toml → tests/data/test_config1.toml b/src/pypromice/test/test_config1.toml → tests/data/test_config1.toml
diff --git a/src/pypromice/test/test_config2.toml → tests/data/test_config2.toml b/src/pypromice/test/test_config2.toml → tests/data/test_config2.toml
diff --git a/src/pypromice/test/test_email → tests/data/test_email b/src/pypromice/test/test_email → tests/data/test_email
diff --git a/src/pypromice/test/test_payload_formats.csv → tests/data/test_payload_formats.csv b/src/pypromice/test/test_payload_formats.csv → tests/data/test_payload_formats.csv
diff --git a/src/pypromice/test/test_payload_types.csv → tests/data/test_payload_types.csv b/src/pypromice/test/test_payload_types.csv → tests/data/test_payload_types.csv
diff --git a/src/pypromice/test/test_raw1.txt → tests/data/test_raw1.txt b/src/pypromice/test/test_raw1.txt → tests/data/test_raw1.txt
diff --git a/src/pypromice/test/test_raw_DataTable2.txt → tests/data/test_raw_DataTable2.txt b/src/pypromice/test/test_raw_DataTable2.txt → tests/data/test_raw_DataTable2.txt
diff --git a/...pypromice/test/test_raw_SlimTableMem1.txt → tests/data/test_raw_SlimTableMem1.txt b/...pypromice/test/test_raw_SlimTableMem1.txt → tests/data/test_raw_SlimTableMem1.txt
diff --git a/src/pypromice/test/test_raw_transmitted1.txt → tests/data/test_raw_transmitted1.txt b/src/pypromice/test/test_raw_transmitted1.txt → tests/data/test_raw_transmitted1.txt
diff --git a/src/pypromice/test/test_raw_transmitted2.txt → tests/data/test_raw_transmitted2.txt b/src/pypromice/test/test_raw_transmitted2.txt → tests/data/test_raw_transmitted2.txt
diff --git a/tests/e2e/__init__.py b/tests/e2e/__init__.py
diff --git a/src/pypromice/process/test.py → tests/e2e/test_process.py b/src/pypromice/process/test.py → tests/e2e/test_process.py
@@ -3,6 +3,8 @@
 """
 Processing test module
 """
+from pathlib import Path
+
 from pypromice.process.aws import AWS
 from pypromice.process.load import getVars, getMeta
 from pypromice.process.write import addVars, addMeta
@@ -11,6 +13,11 @@
 import unittest, datetime, os
 from datetime import timedelta
 
+TEST_ROOT = Path(__file__).parent.parent
+TEST_DATA_ROOT_PATH = TEST_ROOT / "data"
+TEST_CONFIG_PATH = TEST_DATA_ROOT_PATH / "test_config1.toml"
+
+
 class TestProcess(unittest.TestCase):
 
     def testgetVars(self):
@@ -48,12 +55,7 @@ def testAddAll(self):
 
     def testL0toL3(self):
         '''Test L0 to L3 processing'''
-        try:
-            import pypromice
-            pAWS = AWS(os.path.join(os.path.dirname(pypromice.__file__),'test/test_config1.toml'),
-                       os.path.join(os.path.dirname(pypromice.__file__),'test'))
-        except:
-            pAWS = AWS('../test/test_config1.toml', '../test/')
+        pAWS = AWS(TEST_CONFIG_PATH.as_posix(), TEST_DATA_ROOT_PATH.as_posix())
         pAWS.process()
         self.assertIsInstance(pAWS.L2, xr.Dataset)
         self.assertTrue(pAWS.L2.attrs['station_id']=='TEST1')

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
diff --git a/src/pypromice/test/bufr_export/DY2.bufr → tests/unit/bufr_export/DY2.bufr b/src/pypromice/test/bufr_export/DY2.bufr → tests/unit/bufr_export/DY2.bufr
diff --git a/src/pypromice/test/bufr_export/WEG_B.bufr → tests/unit/bufr_export/WEG_B.bufr b/src/pypromice/test/bufr_export/WEG_B.bufr → tests/unit/bufr_export/WEG_B.bufr
diff --git a/tests/unit/bufr_export/__init__.py b/tests/unit/bufr_export/__init__.py
diff --git a/.../test/bufr_export/test_bufr_utilitites.py → .../unit/bufr_export/test_bufr_utilitites.py b/.../test/bufr_export/test_bufr_utilitites.py → .../unit/bufr_export/test_bufr_utilitites.py
diff --git a/...est/bufr_export/test_create_bufr_files.py → ...nit/bufr_export/test_create_bufr_files.py b/...est/bufr_export/test_create_bufr_files.py → ...nit/bufr_export/test_create_bufr_files.py
diff --git a/...promice/test/bufr_export/test_get_bufr.py → tests/unit/bufr_export/test_get_bufr.py b/...promice/test/bufr_export/test_get_bufr.py → tests/unit/bufr_export/test_get_bufr.py
@@ -21,7 +21,7 @@
     write_station_configuration_mapping,
     load_station_configuration_mapping,
 )
-from pypromice.test.bufr_export.test_get_bufr_integration import (
+from tests.unit.bufr_export.test_get_bufr_integration import (
     DATA_DIR,
     run_get_bufr,
 )

diff --git a/.../bufr_export/test_get_bufr_integration.py → .../bufr_export/test_get_bufr_integration.py b/.../bufr_export/test_get_bufr_integration.py → .../bufr_export/test_get_bufr_integration.py
diff --git a/...t/bufr_export/test_realtime_utilitites.py → ...t/bufr_export/test_realtime_utilitites.py b/...t/bufr_export/test_realtime_utilitites.py → ...t/bufr_export/test_realtime_utilitites.py
diff --git a/...ypromice/test/bufr_export/tx_l3_test1.csv → tests/unit/bufr_export/tx_l3_test1.csv b/...ypromice/test/bufr_export/tx_l3_test1.csv → tests/unit/bufr_export/tx_l3_test1.csv
diff --git a/src/pypromice/test/test_percentile.py → tests/unit/test_percentile.py b/src/pypromice/test/test_percentile.py → tests/unit/test_percentile.py