refactor: make blink_led non-blocking in the state machine
This commit is contained in:
+38
-31
@@ -32,15 +32,6 @@ def test_set_led(mock_gpio):
|
||||
mock_gpio.output.assert_called_with(wecker.LED_PIN, mock_gpio.HIGH)
|
||||
|
||||
|
||||
@patch("wecker.time.sleep")
|
||||
def test_blink_led(mock_sleep, mock_gpio):
|
||||
wecker.blink_led(2)
|
||||
# 2 blinks = 4 sleep calls, 2 set_led(True), 2 set_led(False)
|
||||
assert mock_sleep.call_count == 4
|
||||
# GPIO output called 4 times total (on, off, on, off)
|
||||
assert mock_gpio.output.call_count == 4
|
||||
|
||||
|
||||
@patch("wecker.time.time")
|
||||
def test_run_alarm_start_to_wait(mock_time, mock_gpio, mock_pygame):
|
||||
# Mock pygame.mixer.get_init() to return True so music plays
|
||||
@@ -59,33 +50,30 @@ def test_state_machine_evaluation(mock_gpio, mock_pygame):
|
||||
assert clock.state == wecker.STATE_WAIT_BEFORE_BLINK
|
||||
|
||||
# Wait 3 seconds -> blinking
|
||||
with patch("wecker.blink_led"):
|
||||
with patch("wecker.random.randint", return_value=3):
|
||||
clock.update(103.1, False)
|
||||
assert clock.state == wecker.STATE_BLINKING
|
||||
assert clock.target_blinks == 3
|
||||
|
||||
with patch("wecker.blink_led"):
|
||||
clock.update(103.2, False)
|
||||
# Advance time past the blink sequence (3 blinks * 2 phases * 0.3s = 1.8s)
|
||||
clock.update(105.0, False)
|
||||
assert clock.state == wecker.STATE_WAIT_FOR_INPUT
|
||||
assert clock.target_blinks >= 1
|
||||
|
||||
# Set the user presses to be correct
|
||||
clock.target_blinks = 3
|
||||
|
||||
# Press 1
|
||||
clock.update(104.0, True)
|
||||
clock.update(104.1, False)
|
||||
clock.update(105.5, True)
|
||||
clock.update(105.6, False)
|
||||
# Press 2
|
||||
clock.update(104.5, True)
|
||||
clock.update(104.6, False)
|
||||
clock.update(106.0, True)
|
||||
clock.update(106.1, False)
|
||||
# Press 3
|
||||
clock.update(105.0, True)
|
||||
clock.update(105.1, False)
|
||||
clock.update(106.5, True)
|
||||
clock.update(106.6, False)
|
||||
|
||||
assert clock.user_presses == 3
|
||||
|
||||
# Wait 3 seconds to evaluate
|
||||
clock.update(108.2, False) # Triggers state change
|
||||
keep_running = clock.update(108.3, False) # Triggers evaluation
|
||||
clock.update(109.7, False) # Triggers state change
|
||||
keep_running = clock.update(109.8, False) # Triggers evaluation
|
||||
|
||||
# It should evaluate, see it's correct, and return False (stop running)
|
||||
assert clock.state == wecker.STATE_EVALUATING
|
||||
@@ -111,19 +99,38 @@ def test_state_machine_incorrect(mock_gpio, mock_pygame):
|
||||
assert clock.state == wecker.STATE_WAIT_BEFORE_RETRY
|
||||
|
||||
|
||||
@patch("wecker.time.time")
|
||||
def test_blinking_updates_time_correctly(mock_time, mock_gpio, mock_pygame):
|
||||
def test_blinking_is_non_blocking(mock_gpio, mock_pygame):
|
||||
clock = wecker.AlarmClock()
|
||||
clock.state = wecker.STATE_BLINKING
|
||||
clock.target_blinks = 2
|
||||
|
||||
# Start of blinking: LED on
|
||||
clock.update(100.0, False)
|
||||
assert clock.state == wecker.STATE_BLINKING
|
||||
mock_gpio.output.assert_called_with(wecker.LED_PIN, mock_gpio.LOW)
|
||||
|
||||
# Mid-blink: LED toggles based on elapsed time
|
||||
clock.update(100.3, False)
|
||||
mock_gpio.output.assert_called_with(wecker.LED_PIN, mock_gpio.HIGH)
|
||||
|
||||
# After sequence completes (2 blinks * 2 phases * 0.3s = 1.2s)
|
||||
clock.update(101.2, False)
|
||||
assert clock.state == wecker.STATE_WAIT_FOR_INPUT
|
||||
mock_gpio.output.assert_called_with(wecker.LED_PIN, mock_gpio.HIGH)
|
||||
|
||||
|
||||
def test_blinking_updates_time_correctly(mock_gpio, mock_pygame):
|
||||
clock = wecker.AlarmClock()
|
||||
clock.state = wecker.STATE_BLINKING
|
||||
clock.target_blinks = 4
|
||||
|
||||
mock_time.return_value = 200.0
|
||||
|
||||
with patch("wecker.blink_led"):
|
||||
clock.update(100.0, False)
|
||||
# Start blinking, then advance to the end of the sequence.
|
||||
# 4 blinks * 2 phases * 0.3s = 2.4s
|
||||
clock.update(100.0, False)
|
||||
clock.update(102.4, False)
|
||||
|
||||
assert clock.state == wecker.STATE_WAIT_FOR_INPUT
|
||||
assert clock.last_interaction_time == 200.0
|
||||
assert clock.last_interaction_time == 102.4
|
||||
|
||||
|
||||
def test_setup_uses_env_music_file(mock_gpio, mock_pygame, monkeypatch):
|
||||
|
||||
Reference in New Issue
Block a user