catch ValueError in base tendency if duration is negative

Author: SBlokhuizen

tests/tendencies/test_base.py

@@ -15,10 +15,10 @@
         (None, 20, None, 0, 20, 20, False),
         (None, None, 30, 0, 30, 30, False),
         (None, None, None, 0, 1, 1, False),
-        (10, 20, 40, None, None, None, True),
-        (10, None, 5, None, None, None, True),
-        (10, -5, None, None, None, None, True),
-        (None, 0, None, None, None, None, True),
+        (10, 20, 40, 0, 1, 1, True),
+        (10, None, 5, 10, 1, 11, True),
+        (10, -5, None, 10, 1, 11, True),
+        (None, 0, None, 0, 1, 1, True),
     ],
 )
 def test_first_base_tendency(
@@ -34,12 +34,12 @@ def test_first_base_tendency(
     kwargs = dict(user_start=start, user_duration=duration, user_end=end)
     base_tendency = BaseTendency(**kwargs)
 
+    assert base_tendency.start == approx(expected_start)
+    assert base_tendency.duration == approx(expected_duration)
+    assert base_tendency.end == approx(expected_end)
     if has_error:
         assert base_tendency.annotations
     else:
-        assert base_tendency.start == approx(expected_start)
-        assert base_tendency.duration == approx(expected_duration)
-        assert base_tendency.end == approx(expected_end)
         assert not base_tendency.annotations
 
 
@@ -54,10 +54,10 @@ def test_first_base_tendency(
         (None, 20, None, 10, 20, 30, False),
         (None, None, 30, 10, 20, 30, False),
         (None, None, None, 10, 1, 11, False),
-        (10, 20, 40, None, None, None, True),
-        (10, None, 5, None, None, None, True),
-        (10, -5, None, None, None, None, True),
-        (None, 0, None, None, None, None, True),
+        (10, 20, 40, 10, 1, 11, True),
+        (10, None, 5, 10, 1, 11, True),
+        (10, -5, None, 10, 1, 11, True),
+        (None, 0, None, 10, 1, 11, True),
     ],
 )
 def test_second_base_tendency(
@@ -73,21 +73,25 @@ def test_second_base_tendency(
     prev_tendency = BaseTendency(user_start=0, user_end=10)
     kwargs = dict(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)
 
+    assert base_tendency.start == approx(expected_start)
+    assert base_tendency.duration == approx(expected_duration)
+    assert base_tendency.end == approx(expected_end)
     if has_error:
         assert base_tendency.annotations
     else:
-        base_tendency.set_previous_tendency(prev_tendency)
-        assert base_tendency.start == approx(expected_start)
-        assert base_tendency.duration == approx(expected_duration)
-        assert base_tendency.end == approx(expected_end)
         assert not base_tendency.annotations
 
 
 def test_suggestion():
     """Test if suggestions are provided for miswritten keywords."""
     base_tendency = BaseTendency(user_starrt=0, user_duuration=5, user_ennd=10)
     assert base_tendency.annotations
+    assert base_tendency.start == 0
+    assert base_tendency.duration == 1
+    assert base_tendency.end == 1
     assert any(
         "start" in annotation["text"] for annotation in base_tendency.annotations
     )
@@ -106,6 +110,14 @@ def test_gap():
     assert not t1.annotations
     assert t2.annotations
 
+    assert t1.start == 0
+    assert t1.duration == 5
+    assert t1.end == 5
+
+    assert t2.start == 15
+    assert t2.duration == 5
+    assert t2.end == 20
+
 
 def test_overlap():
     """Test if an overlap between 2 tendencies is encountered."""
@@ -116,6 +128,14 @@ def test_overlap():
     assert not t1.annotations
     assert t2.annotations
 
+    assert t1.start == 0
+    assert t1.duration == 5
+    assert t1.end == 5
+
+    assert t2.start == 3
+    assert t2.duration == 5
+    assert t2.end == 8
+
 
 def test_declarative_assignments():
     t1 = BaseTendency(user_duration=10)

waveform_editor/tendencies/base.py

@@ -255,10 +255,9 @@ def _calc_times(self):
 
         # Check if any value has changed
         if (self.start, self.duration, self.end) != values:
-            self.start, self.duration, self.end = values
+            try:
+                self.start, self.duration, self.end = values
+            except Exception as error:
+                self._handle_error(error)
             # Trigger timing event
             self.times_changed = True
-
-        if self.duration <= 0:
-            error_msg = "Tendency end time must be greater than its start time."
-            self.annotations.add(self.line_number, error_msg)