fps計算方法および顔検出方法の変更に伴いtestの内容を変更

tests/test_face_geometry.py

@@ -9,7 +9,7 @@ def settings(**overrides: object) -> FaceSettings:
                   roi_expand_ratio=.1, min_roi_width=10, min_roi_height=10, static_image_mode=False,
                   max_num_faces=1, refine_landmarks=True, min_detection_confidence=.5,
                   min_tracking_confidence=.5, roi_square=False, roi_upscale_target=384,
-                  roi_truncated_width_ratio=0.0)
+                  roi_truncated_width_ratio=0.0, model_path=None)
     values.update(overrides)
     return FaceSettings(**values)  # type: ignore[arg-type]
 

tests/test_fps_counter.py

@@ -6,25 +6,27 @@ from src.fps_counter import FPSCounter
 def test_initial_and_tick_and_average(monkeypatch: pytest.MonkeyPatch) -> None:
     times = iter([1.0, 1.5, 1.75])
     monkeypatch.setattr("src.fps_counter.time.perf_counter", lambda: next(times))
-    counter = FPSCounter(2)
+    counter = FPSCounter(2, 2)
-    assert counter.current_fps == counter.average_fps == 0.0
+    assert counter.current_fps == counter.recent_average_fps == 0.0
     assert counter.tick() == 0.0
     assert counter.tick() == pytest.approx(2.0)
     assert counter.tick() == pytest.approx(4.0)
-    assert counter.average_fps == pytest.approx(3.0)
+    assert counter.sample_count == 1
+    assert counter.average_fps == pytest.approx(4.0)
+    assert counter.recent_average_fps == pytest.approx(4.0)
 
 
 def test_reset(monkeypatch: pytest.MonkeyPatch) -> None:
     times = iter([1.0, 2.0])
     monkeypatch.setattr("src.fps_counter.time.perf_counter", lambda: next(times))
-    counter = FPSCounter(3)
+    counter = FPSCounter(3, 0)
     counter.tick()
     counter.tick()
     counter.reset()
-    assert counter.current_fps == counter.average_fps == 0.0
+    assert counter.current_fps == counter.recent_average_fps == 0.0
     assert counter.sample_count == 0
 
 
 def test_invalid_window() -> None:
     with pytest.raises(ValueError):
-        FPSCounter(0)
+        FPSCounter(0, 0)