refactor: keep style-specific config off the base class via **kwargs

The base AlarmStyle contract carried music_file, forcing SimpleStyle to
accept a parameter it never uses. Move style-specific config to the
subclass: the base __init__ takes only set_led (**kwargs swallows the rest);
each style declares the keyword args it actually uses (BlinkStyle: music_file;
SimpleStyle: none). The runner passes config as keyword args and each style
keeps only what it needs, so the base contract never grows as styles are
added — a future 'talk' style adds talk_file to its own signature, not to the
base. README plugin contract updated.
This commit is contained in:
2026-08-02 22:09:46 +02:00
parent 3a7b6ac7a3
commit 000b204215
7 changed files with 32 additions and 19 deletions
+10
View File
@@ -8,6 +8,16 @@ def _make_style():
return SimpleStyle(lambda on: calls.append(on)), calls
def test_simple_ignores_unrelated_config():
# SimpleStyle must swallow style-specific kwargs it doesn't use (e.g.
# music_file belongs to blink), so the runner can pass config uniformly.
style, _ = _make_style()
style = SimpleStyle(lambda on: None, music_file="ignored.mp3")
with patch("styles.simple.pygame", MagicMock()):
style.start()
assert style.update(0.0, False) is True
def test_simple_keeps_ringing_when_not_pressed():
style, _ = _make_style()
with patch("styles.simple.pygame", MagicMock()):
+5 -6
View File
@@ -66,9 +66,8 @@ def test_run_alarm_uses_selected_style(mock_gpio, mock_pygame):
wecker.run_alarm(style_name="whatever", test_mode=True)
get_style.assert_called_once_with("whatever")
args = fake_style_cls.call_args.args
assert args[0] is wecker.set_led
assert isinstance(args[1], str) # resolved music file
assert fake_style_cls.call_args.args[0] is wecker.set_led
assert isinstance(fake_style_cls.call_args.kwargs["music_file"], str)
fake.start.assert_called_once()
fake.update.assert_called()
@@ -80,7 +79,7 @@ def test_run_alarm_default_music_file(mock_gpio, mock_pygame, monkeypatch):
fake_style_cls = MagicMock(return_value=fake)
with patch("wecker.get_style", return_value=fake_style_cls):
wecker.run_alarm(test_mode=True)
assert fake_style_cls.call_args.args[1] == wecker.DEFAULT_MUSIC_FILE
assert fake_style_cls.call_args.kwargs["music_file"] == wecker.DEFAULT_MUSIC_FILE
def test_run_alarm_env_music_file(mock_gpio, mock_pygame, monkeypatch):
@@ -90,7 +89,7 @@ def test_run_alarm_env_music_file(mock_gpio, mock_pygame, monkeypatch):
fake_style_cls = MagicMock(return_value=fake)
with patch("wecker.get_style", return_value=fake_style_cls):
wecker.run_alarm(test_mode=True)
assert fake_style_cls.call_args.args[1] == "/env/track.mp3"
assert fake_style_cls.call_args.kwargs["music_file"] == "/env/track.mp3"
def test_run_alarm_music_file_arg_overrides_env(mock_gpio, mock_pygame, monkeypatch):
@@ -100,7 +99,7 @@ def test_run_alarm_music_file_arg_overrides_env(mock_gpio, mock_pygame, monkeypa
fake_style_cls = MagicMock(return_value=fake)
with patch("wecker.get_style", return_value=fake_style_cls):
wecker.run_alarm(music_file="/arg/track.mp3", test_mode=True)
assert fake_style_cls.call_args.args[1] == "/arg/track.mp3"
assert fake_style_cls.call_args.kwargs["music_file"] == "/arg/track.mp3"
def test_run_alarm_blink_plays_music(mock_gpio, mock_pygame):