Merge branch 'develop' into bugfix/fix-single-smooth

Author: SBlokhuizen

tests/conftest.py

@@ -4,6 +4,7 @@
 import pytest
 from pytest import approx
 
+from tests.utils import filter_kwargs
 from waveform_editor.tendencies.constant import ConstantTendency
 from waveform_editor.tendencies.periodic.periodic_base import PeriodicBaseTendency
 
@@ -56,13 +57,11 @@ def test_bounds(
     """
     Test the base, amplitude, minimum and maximum values of the periodic base tendency
     """
-    tendency = PeriodicBaseTendency(
-        user_duration=1,
-        user_base=base,
-        user_amplitude=amplitude,
-        user_min=min,
-        user_max=max,
+    kwargs = filter_kwargs(
+        user_base=base, user_amplitude=amplitude, user_min=min, user_max=max
     )
+
+    tendency = PeriodicBaseTendency(user_duration=1, **kwargs)
     if has_error:
         assert tendency.annotations
     else:
@@ -104,13 +103,10 @@ def test_bounds_prev(
     when the tendency has a previous tendency.
     """
     prev_tendency = ConstantTendency(user_start=0, user_duration=1, user_value=8)
-    tendency = PeriodicBaseTendency(
-        user_duration=1,
-        user_base=base,
-        user_amplitude=amplitude,
-        user_min=min,
-        user_max=max,
+    kwargs = filter_kwargs(
+        user_base=base, user_amplitude=amplitude, user_min=min, user_max=max
     )
+    tendency = PeriodicBaseTendency(user_duration=1, **kwargs)
     if has_error:
         assert tendency.annotations
     else:
@@ -151,13 +147,10 @@ def test_bounds_next(
     when the tendency has a next tendency.
     """
     next_tendency = ConstantTendency(user_duration=1, user_value=8)
-    tendency = PeriodicBaseTendency(
-        user_duration=1,
-        user_base=base,
-        user_amplitude=amplitude,
-        user_min=min,
-        user_max=max,
+    kwargs = filter_kwargs(
+        user_base=base, user_amplitude=amplitude, user_min=min, user_max=max
     )
+    tendency = PeriodicBaseTendency(user_duration=1, **kwargs)
     tendency.set_next_tendency(next_tendency)
     assert tendency.base == approx(expected_base)
     assert not tendency.annotations

tests/tendencies/periodic/test_periodic_base.py

@@ -1,6 +1,7 @@
 import pytest
 from pytest import approx
 
+from tests.utils import filter_kwargs
 from waveform_editor.tendencies.base import BaseTendency
 
 
@@ -31,7 +32,7 @@ def test_first_base_tendency(
     has_error,
 ):
     """Test validity of the created base tendency when it is the first tendency."""
-    kwargs = dict(user_start=start, user_duration=duration, user_end=end)
+    kwargs = filter_kwargs(user_start=start, user_duration=duration, user_end=end)
     base_tendency = BaseTendency(**kwargs)
 
     assert base_tendency.start == approx(expected_start)
@@ -71,7 +72,7 @@ def test_second_base_tendency(
 ):
     """Test validity of the created base tendency when it is the second tendency."""
     prev_tendency = BaseTendency(user_start=0, user_end=10)
-    kwargs = dict(user_start=start, user_duration=duration, user_end=end)
+    kwargs = filter_kwargs(user_start=start, user_duration=duration, user_end=end)
     base_tendency = BaseTendency(**kwargs)
     base_tendency.set_previous_tendency(prev_tendency)
     prev_tendency.set_next_tendency(base_tendency)

tests/tendencies/test_base.py

@@ -2,6 +2,7 @@
 import pytest
 from pytest import approx
 
+from tests.utils import filter_kwargs
 from waveform_editor.tendencies.linear import LinearTendency
 
 
@@ -41,9 +42,11 @@ def test_linear_tendency(
     duration, from_, to, rate, expected_from, expected_to, expected_rate, has_error
 ):
     """Test values of filled tendency."""
-    tendency = LinearTendency(
+    kwargs = filter_kwargs(
         user_duration=duration, user_from=from_, user_to=to, user_rate=rate
     )
+
+    tendency = LinearTendency(**kwargs)
     if has_error:
         assert tendency.annotations
     else:
@@ -78,9 +81,10 @@ def test_linear_tendency_with_prev(
 ):
     """Test values of tendency that has a previous tendency."""
     prev_tendency = LinearTendency(user_duration=10, user_from=1, user_to=5)
-    tendency = LinearTendency(
+    kwargs = filter_kwargs(
         user_duration=duration, user_from=from_, user_to=to, user_rate=rate
     )
+    tendency = LinearTendency(**kwargs)
     if has_error:
         assert tendency.annotations
     else:
@@ -118,9 +122,10 @@ def test_linear_tendency_with_next(
     next_tendency = LinearTendency(
         user_start=10, user_duration=10, user_from=5, user_to=10
     )
-    tendency = LinearTendency(
+    kwargs = filter_kwargs(
         user_duration=duration, user_from=from_, user_to=to, user_rate=rate
     )
+    tendency = LinearTendency(**kwargs)
     if has_error:
         assert tendency.annotations
     else:

tests/tendencies/test_linear.py

@@ -0,0 +1,3 @@
+def filter_kwargs(**kwargs):
+    """Remove None values from keyword arguments."""
+    return {k: v for k, v in kwargs.items() if v is not None}

tests/utils.py

@@ -87,6 +87,14 @@ def __init__(self, **kwargs):
         super().__init__()
         with param.parameterized.batch_call_watchers(self):
             for param_name, value in kwargs.items():
+                if value is None:
+                    self.annotations.add(
+                        self.line_number,
+                        f"The value of {param_name.replace('user_', '')!r} cannot be "
+                        "empty.\nIt will be set to its default value.\n",
+                        is_warning=True,
+                    )
+
                 if param_name not in self.param:
                     unknown_kwargs.append(param_name.replace("user_", ""))
                     continue