Changing test data

Author: birkholz-cubert

cuvis/FileWriteSettings.py

@@ -396,7 +396,7 @@ def _from_internal(cls, pa: cuvis_il.cuvis_proc_args_t):
 
 @dataclass
 class WorkerSettings(object):
-    input_queue_size: int = 0
+    input_queue_size: int = 10
     mandatory_queue_size: int = 4
     supplementary_queue_size: int = 4
     output_queue_size: int = 10

tests/conftest.py

@@ -48,13 +48,13 @@ def rgb_userplugin_path(test_data_dir):
 
 
 @pytest.fixture(scope="session")
-def aquarium_session_file(test_data_dir, sdk_initialized):
+def test_session_file(test_data_dir, sdk_initialized):
     """
-    Load Aquarium.cu3s SessionFile once per session.
+    Load test SessionFile once per session.
 
     Skips tests if the file is not found.
     """
-    session_path = test_data_dir / "Aquarium.cu3s"
+    session_path = test_data_dir / "test_mesu.cu3s"
     if not session_path.exists():
         pytest.skip(f"Test data not found: {session_path}")
     session = cuvis.SessionFile(str(session_path))
@@ -64,23 +64,23 @@ def aquarium_session_file(test_data_dir, sdk_initialized):
 
 
 @pytest.fixture
-def aquarium_measurement(aquarium_session_file):
+def test_measurement(test_session_file):
     """
-    Get first measurement from Aquarium session.
+    Get first measurement from Test session.
 
     Function-scoped to ensure each test gets a fresh measurement reference.
     """
-    return aquarium_session_file.get_measurement(0)
+    return test_session_file.get_measurement(0)
 
 
 @pytest.fixture
-def processing_context_from_session(aquarium_session_file):
+def processing_context_from_session(test_session_file):
     """
     Create ProcessingContext from SessionFile.
 
     Function-scoped to ensure each test gets a fresh context.
     """
-    return cuvis.ProcessingContext(aquarium_session_file)
+    return cuvis.ProcessingContext(test_session_file)
 
 
 @pytest.fixture
@@ -96,13 +96,13 @@ def temp_output_dir():
 
 
 @pytest.fixture(scope="session")
-def simulated_acquisition_context(aquarium_session_file, sdk_initialized):
+def simulated_acquisition_context(test_session_file, sdk_initialized):
     """
     Create simulated AcquisitionContext from SessionFile.
 
     Session-scoped since acquisition context initialization can be slow.
     """
-    acq = cuvis.AcquisitionContext(aquarium_session_file, simulate=True)
+    acq = cuvis.AcquisitionContext(test_session_file, simulate=True)
     yield acq
     del acq
     gc.collect()

tests/test_data/Aquarium.cu3s

@@ -17,18 +17,18 @@ def test_cube_exporter_creation(temp_output_dir):
 
 
 def test_cube_export_workflow(
-    processing_context_from_session, aquarium_measurement, temp_output_dir
+    processing_context_from_session, test_measurement, temp_output_dir
 ):
     """Test export measurement as SessionFile (.cu3s)."""
     # Process measurement first
     pc = processing_context_from_session
     pc.processing_mode = cuvis.ProcessingMode.Raw
-    pc.apply(aquarium_measurement)
+    pc.apply(test_measurement)
 
     # Export as SessionFile
     save_args = cuvis.SaveArgs(export_dir=str(temp_output_dir))
     exporter = cuvis.CubeExporter(save_args)
-    exporter.apply(aquarium_measurement)
+    exporter.apply(test_measurement)
     exporter.flush()
 
     # Verify output file was created
@@ -44,20 +44,20 @@ def test_tiff_exporter_creation(temp_output_dir):
 
 
 def test_tiff_export_workflow(
-    processing_context_from_session, aquarium_measurement, temp_output_dir
+    processing_context_from_session, test_measurement, temp_output_dir
 ):
     """Test export measurement as TIFF."""
     # Process measurement first
     pc = processing_context_from_session
     pc.processing_mode = cuvis.ProcessingMode.Raw
-    pc.apply(aquarium_measurement)
+    pc.apply(test_measurement)
 
     # Export as TIFF
     settings = cuvis.TiffExportSettings(
         export_dir=str(temp_output_dir), format=cuvis.TiffFormat.MultiChannel
     )
     exporter = cuvis.TiffExporter(settings)
-    exporter.apply(aquarium_measurement)
+    exporter.apply(test_measurement)
     exporter.flush()
 
     # Verify output file was created
@@ -66,12 +66,12 @@ def test_tiff_export_workflow(
 
 
 def test_tiff_export_different_formats(
-    processing_context_from_session, aquarium_measurement, temp_output_dir
+    processing_context_from_session, test_measurement, temp_output_dir
 ):
     """Test TIFF export with different format modes."""
     pc = processing_context_from_session
     pc.processing_mode = cuvis.ProcessingMode.Raw
-    pc.apply(aquarium_measurement)
+    pc.apply(test_measurement)
 
     # Test MultiPage format
     multipage_dir = temp_output_dir / "multipage"
@@ -80,7 +80,7 @@ def test_tiff_export_different_formats(
         export_dir=str(multipage_dir), format=cuvis.TiffFormat.MultiPage
     )
     exporter = cuvis.TiffExporter(settings)
-    exporter.apply(aquarium_measurement)
+    exporter.apply(test_measurement)
     exporter.flush()
     assert len(list(multipage_dir.glob("*.tif*"))) > 0
 
@@ -93,18 +93,18 @@ def test_envi_exporter_creation(temp_output_dir):
 
 
 def test_envi_export_workflow(
-    processing_context_from_session, aquarium_measurement, temp_output_dir
+    processing_context_from_session, test_measurement, temp_output_dir
 ):
     """Test export measurement as ENVI format (.hdr + .bin)."""
     # Process measurement first
     pc = processing_context_from_session
     pc.processing_mode = cuvis.ProcessingMode.Raw
-    pc.apply(aquarium_measurement)
+    pc.apply(test_measurement)
 
     # Export as ENVI
     settings = cuvis.EnviExportSettings(export_dir=str(temp_output_dir))
     exporter = cuvis.EnviExporter(settings)
-    exporter.apply(aquarium_measurement)
+    exporter.apply(test_measurement)
     exporter.flush()
 
     # Verify output files were created (.hdr and/or .bin)
@@ -129,22 +129,22 @@ def test_view_exporter_creation(temp_output_dir, rgb_userplugin_path):
 
 def test_view_export_workflow(
     processing_context_from_session,
-    aquarium_measurement,
+    test_measurement,
     temp_output_dir,
     rgb_userplugin_path,
 ):
     """Test export measurement as View (RGB visualization)."""
     # Process measurement first
     pc = processing_context_from_session
     pc.processing_mode = cuvis.ProcessingMode.Raw
-    pc.apply(aquarium_measurement)
+    pc.apply(test_measurement)
 
     # Export as View
     settings = cuvis.ViewExportSettings(
         export_dir=str(temp_output_dir), userplugin=rgb_userplugin_path
     )
     exporter = cuvis.ViewExporter(settings)
-    exporter.apply(aquarium_measurement)
+    exporter.apply(test_measurement)
     exporter.flush()
 
     # Verify output was created

tests/test_data/test_mesu.cu3s

@@ -15,7 +15,7 @@
 
 
 @pytest.mark.integration
-def test_load_and_extract(aquarium_session_file, processing_context_from_session):
+def test_load_and_extract(test_session_file, processing_context_from_session):
     """
     Load Measurement workflow.
 
@@ -26,10 +26,10 @@ def test_load_and_extract(aquarium_session_file, processing_context_from_session
     4. Extract spectral data
     """
     # Step 1: Load session (already loaded via fixture)
-    assert len(aquarium_session_file) >= 1
+    assert len(test_session_file) >= 1
 
     # Step 2: Get measurement and access metadata
-    mesu = aquarium_session_file[0]
+    mesu = test_session_file[0]
     assert mesu.capture_time is not None
     assert mesu.integration_time > 0
     assert mesu.serial_number is not None
@@ -51,7 +51,7 @@ def test_load_and_extract(aquarium_session_file, processing_context_from_session
 
 @pytest.mark.integration
 @pytest.mark.slow
-def test_reprocessing_modes(aquarium_session_file, processing_context_from_session):
+def test_reprocessing_modes(test_session_file, processing_context_from_session):
     """
     Reprocess workflow.
 
@@ -62,7 +62,7 @@ def test_reprocessing_modes(aquarium_session_file, processing_context_from_sessi
     4. Process with Reflectance mode
     5. Process with SpectralRadiance mode
     """
-    mesu = aquarium_session_file[0]
+    mesu = test_session_file[0]
     pc = processing_context_from_session
 
     # Raw mode
@@ -78,10 +78,10 @@ def test_reprocessing_modes(aquarium_session_file, processing_context_from_sessi
     assert dark_cube is not None
 
     # Reflectance mode
-    # pc.processing_mode = cuvis.ProcessingMode.Reflectance
-    # pc.apply(mesu)
-    # refl_cube = mesu.data["cube"]
-    # assert refl_cube is not None
+    pc.processing_mode = cuvis.ProcessingMode.Reflectance
+    pc.apply(mesu)
+    refl_cube = mesu.data["cube"]
+    assert refl_cube is not None
 
     # SpectralRadiance mode
     pc.processing_mode = cuvis.ProcessingMode.SpectralRadiance
@@ -90,13 +90,13 @@ def test_reprocessing_modes(aquarium_session_file, processing_context_from_sessi
     assert radiance_cube is not None
 
     # Verify all cubes were generated
-    assert all([raw_cube, dark_cube, radiance_cube])
+    assert all([raw_cube, dark_cube, refl_cube, radiance_cube])
 
 
 @pytest.mark.integration
 @pytest.mark.slow
 def test_export_formats(
-    aquarium_session_file, processing_context_from_session, temp_output_dir
+    test_session_file, processing_context_from_session, temp_output_dir
 ):
     """
     Exporters workflow.
@@ -107,7 +107,7 @@ def test_export_formats(
     3. Export as TIFF
     4. Export as ENVI
     """
-    mesu = aquarium_session_file[0]
+    mesu = test_session_file[0]
     pc = processing_context_from_session
     pc.processing_mode = cuvis.ProcessingMode.Raw
     pc.apply(mesu)
@@ -192,7 +192,9 @@ def test_simulated_acquisition_snapshot(
 
     # Step 6: Save to file
     save_args = cuvis.SaveArgs(export_dir=str(temp_output_dir))
-    mesu.save(save_args)
+    # mesu.save(save_args)
+    export = cuvis.CubeExporter(save_args)
+    export.apply(mesu)
 
     # Verify file was saved
     output_files = list(temp_output_dir.glob("*.cu3s"))
@@ -202,7 +204,7 @@ def test_simulated_acquisition_snapshot(
 @pytest.mark.integration
 @pytest.mark.slow
 def test_complete_pipeline(
-    aquarium_session_file, processing_context_from_session, temp_output_dir
+    test_session_file, processing_context_from_session, temp_output_dir
 ):
     """
     Complete end-to-end pipeline test.
@@ -214,11 +216,12 @@ def test_complete_pipeline(
     - Verify outputs
     """
     # Load measurement
-    mesu = aquarium_session_file[0]
+    mesu = test_session_file[0]
 
-    # Process with Reflectance mode (most common)
+    # TODO Add Testdata with White Reference
+    # Process with DarkSubtract mode
     pc = processing_context_from_session
-    pc.processing_mode = cuvis.ProcessingMode.Reflectance
+    pc.processing_mode = cuvis.ProcessingMode.DarkSubtract
     pc.apply(mesu)
 
     # Verify cube was generated