fix tests and ruff

Author: cgmaiorano

tests/unit/test_models.py

@@ -242,11 +242,13 @@ def test_valid_ink_trajectory(
 
 def test_uniform_motion() -> None:
     """Test with points moving at constant velocity."""
-    points = pd.DataFrame({
-        "x": [0, 1, 2, 3],
-        "y": [0, 0, 0, 0],
-        "seconds": [0, 1, 2, 3],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 1, 2, 3],
+            "y": [0, 0, 0, 0],
+            "seconds": [0, 1, 2, 3],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -267,11 +269,13 @@ def test_uniform_motion() -> None:
 
 def test_accelerating_motion() -> None:
     """Test with motion accelerating over time."""
-    points = pd.DataFrame({
-        "x": [0, 1, 4, 9],
-        "y": [0, 0, 0, 0],
-        "seconds": [0, 1, 2, 3],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 1, 4, 9],
+            "y": [0, 0, 0, 0],
+            "seconds": [0, 1, 2, 3],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -283,25 +287,22 @@ def test_accelerating_motion() -> None:
 
     segment.calculate_velocity_metrics()
 
-    assert segment.distance == pytest.approx(9.0)
-    assert segment.mean_speed == pytest.approx(3.0)
+    assert segment.distance == 9.0
+    assert segment.mean_speed == 3.0
     assert segment.speed_variance > 0.0
-    assert len(segment.velocities) == 3
-    assert segment.velocities[0] == pytest.approx(1.0)
-    assert segment.velocities[1] == pytest.approx(3.0)
-    assert segment.velocities[2] == pytest.approx(5.0)
-    assert len(segment.accelerations) == 2
-    assert segment.accelerations[0] == pytest.approx(2.0)
-    assert segment.accelerations[1] == pytest.approx(2.0)
+    assert segment.velocities == [1.0, 3.0, 5.0]
+    assert segment.accelerations == [2.0, 2.0]
 
 
 def test_velocity_two_points_only() -> None:
     """Test velocity calculation with only two points."""
-    points = pd.DataFrame({
-        "x": [0, 3],
-        "y": [0, 4],
-        "seconds": [0, 2],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 3],
+            "y": [0, 4],
+            "seconds": [0, 2],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -313,21 +314,22 @@ def test_velocity_two_points_only() -> None:
 
     segment.calculate_velocity_metrics()
 
-    assert segment.distance == pytest.approx(5.0)
-    assert segment.mean_speed == pytest.approx(2.5)
-    assert segment.speed_variance == pytest.approx(0.0)
-    assert len(segment.velocities) == 1
-    assert segment.velocities[0] == pytest.approx(2.5)
-    assert len(segment.accelerations) == 0
+    assert segment.distance == 5.0
+    assert segment.mean_speed == 2.5
+    assert segment.speed_variance == 0.0
+    assert segment.velocities == [2.5]
+    assert segment.accelerations == []  # No acceleration with only one velocity point
 
 
 def test_decelerating_motion() -> None:
     """Test with decelerating motion (negative acceleration)."""
-    points = pd.DataFrame({
-        "x": [0, 4, 7, 9],
-        "y": [0, 0, 0, 0],
-        "seconds": [0, 1, 2, 3],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 4, 7, 9],
+            "y": [0, 0, 0, 0],
+            "seconds": [0, 1, 2, 3],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -339,25 +341,22 @@ def test_decelerating_motion() -> None:
 
     segment.calculate_velocity_metrics()
 
-    assert segment.distance == pytest.approx(9.0)
-    assert segment.mean_speed == pytest.approx(3.0)
+    assert segment.distance == 9.0
+    assert segment.mean_speed == 3.0
     assert segment.speed_variance > 0.0
-    assert len(segment.velocities) == 3
-    assert segment.velocities[0] == pytest.approx(4.0)
-    assert segment.velocities[1] == pytest.approx(3.0)
-    assert segment.velocities[2] == pytest.approx(2.0)
-    assert len(segment.accelerations) == 2
-    assert segment.accelerations[0] == pytest.approx(-1.0)
-    assert segment.accelerations[1] == pytest.approx(-1.0)
+    assert segment.velocities == [4.0, 3.0, 2.0]
+    assert segment.accelerations == [-1.0, -1.0]
 
 
 def test_stationary_motion() -> None:
     """Test with no movement (all points the same)."""
-    points = pd.DataFrame({
-        "x": [1, 1, 1],
-        "y": [1, 1, 1],
-        "seconds": [0, 1, 2],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [1, 1, 1],
+            "y": [1, 1, 1],
+            "seconds": [0, 1, 2],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -369,22 +368,22 @@ def test_stationary_motion() -> None:
 
     segment.calculate_velocity_metrics()
 
-    assert segment.distance == pytest.approx(0.0)
-    assert segment.mean_speed == pytest.approx(0.0)
-    assert segment.speed_variance == pytest.approx(0.0)
-    assert len(segment.velocities) == 2
-    assert all(v == pytest.approx(0.0) for v in segment.velocities)
-    assert len(segment.accelerations) == 1
-    assert segment.accelerations[0] == pytest.approx(0.0)
+    assert segment.distance == 0.0
+    assert segment.mean_speed == 0.0
+    assert segment.speed_variance == 0.0
+    assert segment.velocities == [0.0, 0.0]
+    assert segment.accelerations == [0.0]
 
 
 def test_no_hesitations_uniform_motion() -> None:
     """Test with uniform motion where all velocities are equal."""
-    points = pd.DataFrame({
-        "x": [0, 1, 2, 3],
-        "y": [0, 0, 0, 0],
-        "seconds": [0, 1, 2, 3],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 1, 2, 3],
+            "y": [0, 0, 0, 0],
+            "seconds": [0, 1, 2, 3],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -398,16 +397,18 @@ def test_no_hesitations_uniform_motion() -> None:
     segment.detect_hesitations()
 
     assert segment.hesitation_count == 0
-    assert segment.hesitation_duration == pytest.approx(0.0)
+    assert segment.hesitation_duration == 0.0
 
 
 def test_hesitation_at_start() -> None:
     """Test when the line starts with a hesitation."""
-    points = pd.DataFrame({
-        "x": [0, 0.1, 1, 2],
-        "y": [0, 0.1, 0, 0],
-        "seconds": [0, 1, 2, 3],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 0.1, 1, 2],
+            "y": [0, 0.1, 0, 0],
+            "seconds": [0, 1, 2, 3],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -421,16 +422,18 @@ def test_hesitation_at_start() -> None:
     segment.detect_hesitations()
 
     assert segment.hesitation_count == 1
-    assert segment.hesitation_duration == pytest.approx(1.0)
+    assert segment.hesitation_duration == 1.0
 
 
 def test_multiple_hesitations() -> None:
     """Test when there are multiple hesitation periods."""
-    points = pd.DataFrame({
-        "x": [0, 100, 100.1, 200, 200.1, 300, 400, 500, 600],
-        "y": [0, 0, 0, 0, 0, 0, 0, 0, 0],
-        "seconds": [0, 1, 2, 3, 4, 5, 6, 7, 8],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 100, 100.1, 200, 200.1, 300, 400, 500, 600],
+            "y": [0, 0, 0, 0, 0, 0, 0, 0, 0],
+            "seconds": [0, 1, 2, 3, 4, 5, 6, 7, 8],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -444,16 +447,18 @@ def test_multiple_hesitations() -> None:
     segment.detect_hesitations()
 
     assert segment.hesitation_count == 2
-    assert segment.hesitation_duration == pytest.approx(2.0)
+    assert segment.hesitation_duration == 2.0
 
 
 def test_less_than_three_velocities() -> None:
     """Test early return when velocities length is less than 3."""
-    points = pd.DataFrame({
-        "x": [0, 1],
-        "y": [0, 0],
-        "seconds": [0, 1],
-    })
+    points = pd.DataFrame(
+        {
+            "x": [0, 1],
+            "y": [0, 0],
+            "seconds": [0, 1],
+        }
+    )
     segment = models.LineSegment(
         start_label="1",
         end_label="2",
@@ -467,4 +472,4 @@ def test_less_than_three_velocities() -> None:
     segment.detect_hesitations()
 
     assert segment.hesitation_count == 0
-    assert segment.hesitation_duration == pytest.approx(0.0)
+    assert segment.hesitation_duration == 0.0