tests should use testing_folder

alexlib · alexlib · commit 0eb6af809572 · 2026-03-20T21:29:25.000+02:00
diff --git a/tests/pyptv/conftest.py b/tests/pyptv/conftest.py
@@ -31,6 +31,22 @@ def clean_test_environment(test_data_dir):
             shutil.rmtree(results_dir)
 
 
+@pytest.fixture
+def copy_test_case(test_data_dir, tmp_path):
+    """Copy one named test case from the shared fixture tree into a temp directory."""
+
+    def _copy(case_name: str):
+        source = test_data_dir / case_name
+        if not source.exists():
+            pytest.skip(f"Test case directory {source} not found")
+
+        destination = tmp_path / case_name
+        shutil.copytree(source, destination, dirs_exist_ok=True)
+        return destination
+
+    return _copy
+
+
 def pytest_runtest_setup(item):
     if 'qt' in item.keywords:
         try:
diff --git a/tests/pyptv/test_apply_optimizations.py b/tests/pyptv/test_apply_optimizations.py
@@ -11,10 +11,10 @@
 from pathlib import Path
 
 
-def apply_optimized_parameters():
+def apply_optimized_parameters(copy_test_case):
     """Apply the optimized tracking parameters found through testing"""
     
-    test_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_path = copy_test_case("test_splitter")
     yaml_file = test_path / "parameters_Run1.yaml"
     
     if not yaml_file.exists():
@@ -54,12 +54,12 @@ def apply_optimized_parameters():
     return True
 
 
-def test_optimized_performance():
+def test_optimized_performance(copy_test_case):
     """Test tracking performance with optimized parameters"""
     
     import subprocess
     
-    test_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_path = copy_test_case("test_splitter")
     yaml_file = test_path / "parameters_Run1.yaml"
     script_path = Path(__file__).parent.parent / "pyptv" / "pyptv_batch_plugins.py"
     cmd = [
diff --git a/tests/pyptv/test_cal_ori_roundtrip.py b/tests/pyptv/test_cal_ori_roundtrip.py
@@ -5,8 +5,8 @@
 from pyptv.parameter_manager import ParameterManager
 
 @pytest.mark.parametrize("src_dir", [
-    "tests/working_folder/test_cavity/parameters",
-    "tests/working_folder/test_splitter/parameters",
+    "tests/testing_folder/test_cavity/parameters",
+    "tests/testing_folder/test_splitter/parameters (copy)",
 ])
 def test_cal_ori_roundtrip(src_dir, tmp_path):
     work_dir = tmp_path / "par_files"
diff --git a/tests/pyptv/test_cavity_comprehensive.py b/tests/pyptv/test_cavity_comprehensive.py
@@ -3,6 +3,7 @@
 import pytest
 from pathlib import Path
 import numpy as np
+import shutil
 
 from pyptv.parameter_manager import ParameterManager
 
@@ -17,10 +18,10 @@
 
 
 @pytest.fixture
-def test_cavity_setup():
+def test_cavity_setup(copy_test_case):
     """Setup fixture for test_cavity experiment"""
     software_path = Path(__file__).parent.parent
-    test_cavity_path = software_path / "working_folder" / "test_cavity"
+    test_cavity_path = copy_test_case("test_cavity")
     
     if not test_cavity_path.exists():
         pytest.skip(f"Test cavity directory does not exist: {test_cavity_path}")
@@ -51,10 +52,9 @@ def test_cavity_setup():
     os.chdir(original_cwd)
 
 
-def test_cavity_directory_structure():
+def test_cavity_directory_structure(copy_test_case):
     """Test that test_cavity directory has expected structure"""
-    software_path = Path(__file__).parent.parent
-    test_cavity_path = software_path / "working_folder" / "test_cavity"
+    test_cavity_path = copy_test_case("test_cavity")
     
     assert test_cavity_path.exists(), f"Test cavity directory does not exist: {test_cavity_path}"
     
diff --git a/tests/pyptv/test_core_functionality.py b/tests/pyptv/test_core_functionality.py
@@ -9,7 +9,7 @@
 @pytest.fixture
 def test_cavity_dir():
     # Fixture to provide the test_cavity directory path
-    return os.path.join(os.path.dirname(__file__), "..", "working_folder", "test_cavity")
+    return os.path.join(os.path.dirname(__file__), "..", "testing_folder", "test_cavity")
 
 def test_core_functionality(test_cavity_dir, capsys):
     """Test core functionality of pyptv and optv"""
diff --git a/tests/pyptv/test_detection_bug.py b/tests/pyptv/test_detection_bug.py
@@ -20,7 +20,7 @@ def test_detection_parameters_bug():
     """Test that reproduces the detection parameters bug."""
     
     # Load test parameters
-    test_dir = Path("tests/working_folder/test_cavity")
+    test_dir = Path("tests/testing_folder/test_cavity")
     yaml_file = test_dir / "parameters_Run1.yaml"
     
     experiment = Experiment()
diff --git a/tests/pyptv/test_detection_consistency.py b/tests/pyptv/test_detection_consistency.py
@@ -20,7 +20,7 @@ class TestDetectionConsistency:
     def experiment(self):
         """Create an experiment with test cavity parameters."""
         experiment = Experiment()
-        test_dir = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+        test_dir = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
         experiment.populate_runs(test_dir)
         experiment.set_active(0)  # Use first parameter set
         return experiment
@@ -118,7 +118,7 @@ def test_parameter_sections_exist(self, experiment):
     
     from pyptv.experiment import Experiment
     experiment = Experiment()
-    test_dir = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    test_dir = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     experiment.populate_runs(test_dir)
     experiment.set_active(0)
     
diff --git a/tests/pyptv/test_experiment_par_to_yaml.py b/tests/pyptv/test_experiment_par_to_yaml.py
@@ -3,7 +3,7 @@
 from pyptv.parameter_manager import ParameterManager
 import yaml
 
-TRACK_DIR = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+TRACK_DIR = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
 
 @pytest.mark.parametrize("param_dir,param_yaml", [
     ("parameters", "parameters_Run1.yaml"),
diff --git a/tests/pyptv/test_ext_sequence_splitter.py b/tests/pyptv/test_ext_sequence_splitter.py
@@ -9,7 +9,7 @@ def test_ext_sequence_splitter():
     """Test the ext_sequence_splitter plugin using batch command (proven working approach)"""
     
     # Path to the test data (in tests/ directory)
-    test_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_path = copy_test_case("test_splitter")
     
     if not test_path.exists():
         print(f"❌ Test data not found: {test_path}")
@@ -89,7 +89,7 @@ def test_batch_command():
     
     # Fix paths for running from tests/ directory
     script_path = Path(__file__).parent.parent / "pyptv" / "pyptv_batch_plugins.py"
-    test_exp_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_exp_path = copy_test_case("test_splitter")
     
     if not script_path.exists():
         print(f"❌ Batch script not found: {script_path}")
diff --git a/tests/pyptv/test_ext_sequence_splitter_pytest.py b/tests/pyptv/test_ext_sequence_splitter_pytest.py
@@ -6,9 +6,9 @@
 from pyptv.pyptv_batch_plugins import run_batch
 
 @pytest.mark.integration
-def test_ext_sequence_splitter_plugin():
+def test_ext_sequence_splitter_plugin(copy_test_case):
     """Test that ext_sequence_splitter plugin runs without errors using direct call."""
-    test_exp_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_exp_path = copy_test_case("test_splitter")
     yaml_file = test_exp_path / "parameters_Run1.yaml"
     assert yaml_file.exists(), f"YAML file not found: {yaml_file}"
 
diff --git a/tests/pyptv/test_extended_parameters.py b/tests/pyptv/test_extended_parameters.py
@@ -7,10 +7,10 @@
 import pytest
 
 
-def test_extended_acceleration_range():
+def test_extended_acceleration_range(copy_test_case):
     """Smoke test a bounded acceleration sweep."""
     
-    test_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_path = copy_test_case("test_splitter")
     
     print("🔍 Testing extended acceleration constraint range...")
     print("="*60)
@@ -52,10 +52,10 @@ def test_extended_acceleration_range():
     assert all(isinstance(ratio, float) and ratio >= 0.0 for ratio in results.values())
 
 
-def test_velocity_parameter_interaction():
+def test_velocity_parameter_interaction(copy_test_case):
     """Smoke test one bounded velocity and acceleration interaction set."""
     
-    test_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_path = copy_test_case("test_splitter")
     
     print("🔍 Testing velocity-acceleration parameter interactions...")
     print("="*60)
diff --git a/tests/pyptv/test_image_path_resolution_fixed.py b/tests/pyptv/test_image_path_resolution_fixed.py
@@ -197,7 +197,7 @@ def test_absolute_vs_relative_paths(test_data_dir):
 
 if __name__ == "__main__":
     # Run tests manually if called directly
-    test_cavity_dir = str(Path(__file__).resolve().parents[1] / "working_folder" / "test_cavity")
+    test_cavity_dir = str(Path(__file__).resolve().parents[1] / "testing_folder" / "test_cavity")
     
     print("=" * 60)
     print("TESTING IMAGE PATH RESOLUTION")
diff --git a/tests/pyptv/test_legacy_parameters_roundtrip.py b/tests/pyptv/test_legacy_parameters_roundtrip.py
@@ -5,7 +5,7 @@
 
 def test_legacy_parameters_roundtrip(tmp_path):
     # Source directory with original parameter files
-    src_dir = Path(__file__).parent.parent / "working_folder" / "test_cavity" / "parameters"
+    src_dir = Path(__file__).parent.parent / "testing_folder" / "test_cavity" / "parameters"
     assert src_dir.exists(), f"Source directory {src_dir} does not exist!"
 
     # Destination directory for roundtrip
diff --git a/tests/pyptv/test_parameter_manager_prints.py b/tests/pyptv/test_parameter_manager_prints.py
@@ -4,13 +4,13 @@
 
 def test_print_cavity_yaml():
     pm = ParameterManager()
-    pm.from_directory(str(Path(__file__).parent.parent / 'working_folder' / 'test_cavity' / 'parameters'))
+    pm.from_directory(str(Path(__file__).parent.parent / 'testing_folder' / 'test_cavity' / 'parameters'))
     print('\n--- YAML for test_cavity ---')
     print(yaml.dump(pm.parameters, sort_keys=False, default_flow_style=False))
 
 
 def test_print_splitter_yaml():
     pm = ParameterManager()
-    pm.from_directory(str(Path(__file__).parent.parent / 'working_folder' / 'test_splitter' / 'parameters'))
+    pm.from_directory(str(Path(__file__).parent.parent / 'testing_folder' / 'test_splitter' / 'parameters'))
     print('\n--- YAML for test_splitter ---')
     print(yaml.dump(pm.parameters, sort_keys=False, default_flow_style=False))
diff --git a/tests/pyptv/test_parameter_manager_structure.py b/tests/pyptv/test_parameter_manager_structure.py
@@ -16,7 +16,7 @@
 def test_parameter_manager_new_structure():
     """Test the new ParameterManager with global num_cams"""
     
-    test_cavity_path = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    test_cavity_path = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     
     if not test_cavity_path.exists():
         print(f"Test cavity path not found: {test_cavity_path}")
diff --git a/tests/pyptv/test_parameter_performance.py b/tests/pyptv/test_parameter_performance.py
@@ -18,7 +18,7 @@ def test_parameter_access_performance():
     """Test different parameter access patterns for performance"""
     
     # Setup experiment with test_cavity data
-    test_cavity_path = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    test_cavity_path = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     if not test_cavity_path.exists():
         print("Test cavity not found, skipping performance test")
         return
@@ -114,7 +114,7 @@ def test_parameter_access_performance():
 def test_parameter_change_scenarios():
     """Test different scenarios for parameter changes"""
     
-    test_cavity_path = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    test_cavity_path = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     if not test_cavity_path.exists():
         print("Test cavity not found, skipping change scenarios test")
         return
diff --git a/tests/pyptv/test_parameter_util.py b/tests/pyptv/test_parameter_util.py
@@ -142,7 +142,7 @@ def test_yaml_to_legacy_minimal(tmp_path):
 def test_legacy_to_yaml_and_back(tmp_path):
     """Test round-trip conversion with real test_cavity data."""
     # Use the existing test_cavity/parameters directory as legacy input
-    legacy_dir = Path("tests/working_folder/test_cavity/parameters")
+    legacy_dir = Path("tests/testing_folder/test_cavity/parameters")
     if not legacy_dir.exists():
         pytest.skip("test_cavity/parameters directory not found")
     
diff --git a/tests/pyptv/test_populate_cython_parameters.py b/tests/pyptv/test_populate_cython_parameters.py
@@ -12,7 +12,7 @@ def test_parameter_translation_pipeline():
     
     # Step 1: Load experiment and get raw parameters
     print("1. Loading experiment and raw parameters...")
-    test_dir = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    test_dir = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     experiment = Experiment()
     experiment.populate_runs(test_dir)
     
diff --git a/tests/pyptv/test_populate_parameters.py b/tests/pyptv/test_populate_parameters.py
@@ -607,7 +607,7 @@ def test_cal_dir(self):
         base_dir = Path(__file__).parent.parent
         candidates = [
             base_dir / "testing_folder" / "test_cavity" / "cal",
-            base_dir / "working_folder" / "test_cavity" / "cal",
+            base_dir / "testing_folder" / "test_cavity" / "cal",
         ]
 
         for candidate in candidates:
diff --git a/tests/pyptv/test_ptv_utilities.py b/tests/pyptv/test_ptv_utilities.py
@@ -19,7 +19,7 @@
 @pytest.fixture
 def test_cavity_exp():
     """Load test_cavity experiment for real testing"""
-    test_cavity_path = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    test_cavity_path = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     if not test_cavity_path.exists():
         pytest.skip("test_cavity directory not found")
     
@@ -42,7 +42,7 @@ def test_cavity_exp():
 @pytest.fixture
 def test_splitter_exp():
     """Load test_splitter experiment for real testing"""
-    test_splitter_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_splitter_path = Path(__file__).parent.parent / "testing_folder" / "test_splitter"
     if not test_splitter_path.exists():
         pytest.skip("test_splitter directory not found")
     
diff --git a/tests/pyptv/test_pyptv_batch_plugins.py b/tests/pyptv/test_pyptv_batch_plugins.py
@@ -5,12 +5,12 @@
 from pathlib import Path
 
 
-def test_batch_plugins_runs():
+def test_batch_plugins_runs(copy_test_case):
     """Test that pyptv_batch_plugins runs without errors"""
     
     # Path to the script
     script_path = Path(__file__).parent.parent / "pyptv" / "pyptv_batch_plugins.py"
-    test_exp_path = Path(__file__).parent.parent / "working_folder" / "test_splitter"
+    test_exp_path = copy_test_case("test_splitter")
     yaml_file = test_exp_path / "parameters_Run1.yaml"
     
     # Check if test experiment exists
diff --git a/tests/pyptv/test_standalone_calibration_cycle.py b/tests/pyptv/test_standalone_calibration_cycle.py
@@ -22,7 +22,7 @@ def _copy_tree(src: Path, dst: Path) -> None:
 def test_standalone_calibration_full_cycle(tmp_path: Path):
     """GT -> synthetic 2D -> full_calibration -> reprojection error ~= 0."""
 
-    src = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    src = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     work = tmp_path / "cavity"
     _copy_tree(src, work)
 
diff --git a/tests/pyptv/test_standalone_dumbbell_calibration_cycle.py b/tests/pyptv/test_standalone_dumbbell_calibration_cycle.py
@@ -20,7 +20,7 @@ def _copy_tree(src: Path, dst: Path) -> None:
 def test_standalone_dumbbell_calibration_cycle(tmp_path: Path):
     """GT calib -> synthetic dumbbell target files -> standalone script -> recover extrinsics."""
 
-    src = Path(__file__).parent.parent / "working_folder" / "test_cavity"
+    src = Path(__file__).parent.parent / "testing_folder" / "test_cavity"
     work = tmp_path / "cavity"
     _copy_tree(src, work)
 
diff --git a/tests/pyptv/test_track_parameters.py b/tests/pyptv/test_track_parameters.py
@@ -23,7 +23,7 @@ def get_track_params_from_dir(par_dir):
 ]
 
 @pytest.mark.parametrize("yaml_path", [
-    HERE / 'working_folder' / 'test_cavity' / 'parameters_Run1.yaml',
+    HERE / 'testing_folder' / 'test_cavity' / 'parameters_Run1.yaml',
     # Add more YAML files as needed
 ])
 def test_track_params_in_yaml(yaml_path):
@@ -34,7 +34,7 @@ def test_track_params_in_yaml(yaml_path):
         assert track[key] is not None, f"'{key}' is None in 'track' section of {yaml_path}"
 
 @pytest.mark.parametrize("par_dir", [
-    HERE / 'working_folder' / 'test_cavity' / 'parameters',
+    HERE / 'testing_folder' / 'test_cavity' / 'parameters',
     # Add more parameter directories as needed
 ])
 def test_track_params_in_par_dir(par_dir):
diff --git a/tests/pyptv/test_tracking_analysis.py b/tests/pyptv/test_tracking_analysis.py
diff --git a/tests/pyptv/test_tracking_parameter_bug.py b/tests/pyptv/test_tracking_parameter_bug.py
diff --git a/tests/pyptv/test_tracking_parameter_optimization.py b/tests/pyptv/test_tracking_parameter_optimization.py
diff --git a/tests/pyptv/test_tracking_parameters.py b/tests/pyptv/test_tracking_parameters.py
