test: add missing error messages for valid_range asserts

Author: BitForge95

tests/test_experiment.py

@@ -92,15 +92,18 @@ def test_experiment_initialization_and_device_loading(tmp_path, mock_interpolato
         "eye_tracker": {"interpolation": mock_interpolator},
     }
     exp = Experiment(root_folder=str(tmp_path), modality_config=config)
-    assert "screen" in exp.devices, "Expected 'screen' in experiment devices"
-    assert "eye_tracker" in exp.devices, "Expected 'eye_tracker' in experiment devices"
-    assert (
-        "ignored_device" not in exp.devices
-    ), "Expected 'ignored_device' to be excluded"
-    assert set(exp.device_names) == {
-        "screen",
-        "eye_tracker",
-    }, f"Expected {{'screen', 'eye_tracker'}}, got {set(exp.device_names)}"
+    assert "screen" in exp.devices, (
+        f"Expected 'screen' in experiment devices but exp.devices = {exp.devices}"
+    )
+    assert "eye_tracker" in exp.devices, (
+        f"Expected 'eye_tracker' in experiment devices but exp.devices = {exp.devices}"
+    )
+    assert "ignored_device" not in exp.devices, (
+        f"Expected 'ignored_device' to be excluded from experiment devices but exp.devices = {exp.devices}"
+    )
+    assert set(exp.device_names) == {"screen", "eye_tracker"}, (
+        f"Expected {{'screen', 'eye_tracker'}}, got {set(exp.device_names)}"
+    )
 
 
 def test_experiment_interpolate_routing(tmp_path, mock_interpolator):
@@ -116,16 +119,16 @@ def test_experiment_interpolate_routing(tmp_path, mock_interpolator):
     np.testing.assert_array_equal(
         res,
         np.array([1, 2, 3]),
-        err_msg="Interpolated result does not match mock output",
+        err_msg=f"Interpolated result does not match mock output. Got {res}",
     )
     res_dict = exp.interpolate(test_times, device=None)
-    assert isinstance(
-        res_dict, dict
-    ), f"Expected dict return for device=None, got {type(res_dict)}"
+    assert isinstance(res_dict, dict), (
+        f"Expected dict return for device=None, got {type(res_dict)}"
+    )
     np.testing.assert_array_equal(
         res_dict["screen"],
         np.array([1, 2, 3]),
-        err_msg="Interpolated dict result does not match mock output",
+        err_msg=f"Interpolated dict result does not match mock output. Got {res_dict['screen']}",
     )
 
 
@@ -154,10 +157,9 @@ def test_get_valid_range_all_devices(tmp_path, device_name, start_t, end_t):
             root_folder=str(experiment_path), modality_config=config
         )
         valid_range = experiment.get_valid_range(device_name)
-        assert valid_range == (
-            start_t,
-            end_t,
-        ), f"Expected valid range {(start_t, end_t)} for {device_name}, got {valid_range}"
+        assert valid_range == (start_t, end_t), (
+            f"Expected valid range {(start_t, end_t)} for {device_name}, got {valid_range}"
+        )
 
 
 def test_get_valid_range_raises_for_invalid_device(tmp_path):
@@ -214,9 +216,15 @@ def test_experiment_numeric_precision_offset(
             modality_config=make_modality_config("device_0"),
         )
         valid_range = experiment.get_valid_range("device_0")
-        # Keep pytest.approx here as it's dealing with floats generated by Hypothesis
-        assert valid_range[0] == pytest.approx(start_offset)
-        assert valid_range[1] == pytest.approx(start_offset + duration)
+
+        assert valid_range[0] == pytest.approx(start_offset), (
+            f"Expected valid_range[0] to be approx {start_offset}, got {valid_range[0]}"
+        )
+
+        assert valid_range[1] == pytest.approx(start_offset + duration), (
+            f"Expected valid_range[1] to be approx {start_offset + duration}, got {valid_range[1]}"
+        )
+
         res = experiment.interpolate(np.array([start_offset]), device="device_0")
         assert res is not None
 
@@ -279,13 +287,12 @@ def test_experiment_start_end_time_reflects_union(
             root_folder=str(experiment_path), modality_config=config
         )
 
-    # Removed pytest.approx here
-    assert experiment.start_time == (
-        expected_start
-    ), f"Expected start_time={expected_start}, got {experiment.start_time}"
-    assert experiment.end_time == (
-        expected_end
-    ), f"Expected end_time={expected_end}, got {experiment.end_time}"
+    assert experiment.start_time == (expected_start), (
+        f"Expected start_time={expected_start}, got {experiment.start_time}"
+    )
+    assert experiment.end_time == (expected_end), (
+        f"Expected end_time={expected_end}, got {experiment.end_time}"
+    )
 
 
 @pytest.mark.parametrize("override_meta", INVALID_META_CASES, ids=INVALID_META_IDS)
@@ -321,9 +328,13 @@ def test_experiment_skips_invalid_devices(tmp_path, override_meta, caplog):
     duration_val = np.random.lognormal(mean=0.0, sigma=1.0)
     end_val = start_val + duration_val
 
+    # Generate random values for the invalid device as well
+    inv_start = np.random.lognormal(mean=0.0, sigma=1.0)
+    inv_end = inv_start + 10.0
+
     devices_kwargs = [
         {"start_time": start_val, "t_end": end_val},  # valid device
-        {"start_time": 0.0, "t_end": 10.0},  # invalid device
+        {"start_time": inv_start, "t_end": inv_end},  # invalid device
     ]
 
     with setup_test_experiment(
@@ -348,20 +359,21 @@ def test_experiment_skips_invalid_devices(tmp_path, override_meta, caplog):
                 root_folder=str(experiment_path), modality_config=config
             )
 
-    assert (
-        "valid_device" in experiment.devices
-    ), "Expected 'valid_device' to be initialized"
-    assert (
-        "invalid_device" not in experiment.devices
-    ), "Expected 'invalid_device' to be skipped"
-
-    # Removed pytest.approx here
-    assert experiment.start_time == (
-        start_val
-    ), f"Expected start_time={start_val}, got {experiment.start_time}"
-    assert experiment.end_time == (
-        end_val
-    ), f"Expected end_time={end_val}, got {experiment.end_time}"
-    assert any(
-        "invalid_device" in message for message in caplog.messages
-    ), "Expected warning about invalid_device was skipped"
+    assert "valid_device" in experiment.devices, (
+        f"Expected 'valid_device' to be in experiment.devices but experiment.devices = {experiment.devices}"
+    )
+
+    assert "invalid_device" not in experiment.devices, (
+        f"Expected 'invalid_device' to be skipped in experiment.devices, instead experiment.devices = {experiment.devices}"
+    )
+
+    assert experiment.start_time == (start_val), (
+        f"Expected start_time={start_val}, got {experiment.start_time}"
+    )
+    assert experiment.end_time == (end_val), (
+        f"Expected end_time={end_val}, got {experiment.end_time}"
+    )
+
+    assert any("invalid_device" in message for message in caplog.messages), (
+        f"Expected warning about invalid_device was skipped. caplog.messages = {caplog.messages}"
+    )