From e821159d5a24da411b88fdc47c7d83cb049a6dd6 Mon Sep 17 00:00:00 2001 From: Chang Huan Lo <changhuan.lo@ucl.ac.uk> Date: Thu, 30 Jan 2025 17:27:46 +0000 Subject: [PATCH] Apply suggestions from code review Co-authored-by: sfmig <33267254+sfmig@users.noreply.github.com> --- tests/test_unit/test_filtering.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tests/test_unit/test_filtering.py b/tests/test_unit/test_filtering.py index b96072679..d97dcc8e6 100644 --- a/tests/test_unit/test_filtering.py +++ b/tests/test_unit/test_filtering.py @@ -68,25 +68,20 @@ def test_filter_with_nans_on_position( ) @pytest.mark.parametrize( - "override_kwargs", + "override_kwargs, expected_exception", [ - {"mode": "nearest"}, - {"axis": 1}, - {"mode": "nearest", "axis": 1}, + ({"mode": "nearest"}, does_not_raise()), + ({"axis": 1}, pytest.raises(ValueError)), + ({"mode": "nearest", "axis": 1}, pytest.raises(ValueError)), ], ) def test_savgol_filter_kwargs_override( - self, valid_dataset, override_kwargs, request + self, valid_dataset, override_kwargs, expected_exception, request ): """Test that overriding keyword arguments in the Savitzky-Golay filter works, except for the ``axis`` argument, which should raise a ValueError. """ - expected_exception = ( - pytest.raises(ValueError) - if "axis" in override_kwargs - else does_not_raise() - ) with expected_exception: savgol_filter( request.getfixturevalue(valid_dataset).position, @@ -158,7 +153,7 @@ def test_interpolate_over_time_on_position( @pytest.mark.parametrize( "window", - [3, 5, 6, 10], # data is nframes = 10 + [3, 5, 6, 10], # input data has 10 frames ) @pytest.mark.parametrize("filter_func", [median_filter, savgol_filter]) def test_filter_with_nans_on_position_varying_window(