Skip to content

Commit e636fde

Browse files
committed
fix(test-em511): Change places on two tests
did this because thests where in worng order Signed-off-by: Bobo Bäck Engström <bobo@id8-engineering.io>
1 parent a6bfecc commit e636fde

1 file changed

Lines changed: 38 additions & 38 deletions

File tree

src/em511/test_em511.py

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,44 @@ def test_get_alarm_state() -> None:
491491
_ = meter.alarm_state
492492

493493

494+
def test_get_alarm_mode() -> None:
495+
"""Test Get alarm_mode."""
496+
client = MagicMock()
497+
mock_result = MagicMock()
498+
mock_result.isError.return_value = False
499+
meter = Em511(1, client)
500+
501+
"""Test 1: should pass"""
502+
mock_result.registers = [0x0006]
503+
client.read_input_registers.return_value = mock_result
504+
value = meter.alarm_mode
505+
assert value == int("6")
506+
507+
"""Test 2: Should pass."""
508+
mock_result.registers = [0x0001]
509+
client.read_input_registers.return_value = mock_result
510+
value = meter.alarm_mode
511+
assert value == int("1")
512+
513+
"""Test 3: Should raise exception due to value not in range"""
514+
mock_result.registers = [0x0007]
515+
client.read_input_registers.return_value = mock_result
516+
with pytest.raises(ValueError, match="Invalid alarm mode value: "):
517+
_ = meter.alarm_mode
518+
519+
"""Test 4: Should raise exception due to more registers in use than allowed."""
520+
mock_result.registers = [0x1860, 0x0023, 0x4244]
521+
client.read_input_registers.return_value = mock_result
522+
with pytest.raises(ValueError, match="Unexpected register count:"):
523+
_ = meter.alarm_mode
524+
525+
"""Test 5: Should raise exception if input value exceeds maximum value, display shows 'EEE', 32-bit register."""
526+
mock_result.registers = [0x7FFF]
527+
client.read_input_registers.return_value = mock_result
528+
with pytest.raises(ValueError, match="Input overflow EEE for 16-bit register: "):
529+
_ = meter.alarm_mode
530+
531+
494532
def test_get_dmd_integration_time() -> None:
495533
"""Test Get dmd_integration_time."""
496534
client = MagicMock()
@@ -855,44 +893,6 @@ def test_set_alarm_mode() -> None:
855893
meter.alarm_mode = 1
856894

857895

858-
def test_get_alarm_mode() -> None:
859-
"""Test Get alarm_mode."""
860-
client = MagicMock()
861-
mock_result = MagicMock()
862-
mock_result.isError.return_value = False
863-
meter = Em511(1, client)
864-
865-
"""Test 1: should pass"""
866-
mock_result.registers = [0x0006]
867-
client.read_input_registers.return_value = mock_result
868-
value = meter.alarm_mode
869-
assert value == int("6")
870-
871-
"""Test 2: Should pass."""
872-
mock_result.registers = [0x0001]
873-
client.read_input_registers.return_value = mock_result
874-
value = meter.alarm_mode
875-
assert value == int("1")
876-
877-
"""Test 3: Should raise exception due to value not in range"""
878-
mock_result.registers = [0x0007]
879-
client.read_input_registers.return_value = mock_result
880-
with pytest.raises(ValueError, match="Invalid alarm mode value: "):
881-
_ = meter.alarm_mode
882-
883-
"""Test 4: Should raise exception due to more registers in use than allowed."""
884-
mock_result.registers = [0x1860, 0x0023, 0x4244]
885-
client.read_input_registers.return_value = mock_result
886-
with pytest.raises(ValueError, match="Unexpected register count:"):
887-
_ = meter.alarm_mode
888-
889-
"""Test 5: Should raise exception if input value exceeds maximum value, display shows 'EEE', 32-bit register."""
890-
mock_result.registers = [0x7FFF]
891-
client.read_input_registers.return_value = mock_result
892-
with pytest.raises(ValueError, match="Input overflow EEE for 16-bit register: "):
893-
_ = meter.alarm_mode
894-
895-
896896
def test_set_device_id() -> None:
897897
"""Test Set device id."""
898898
client = MagicMock()

0 commit comments

Comments
 (0)