Skip to content

Commit eabffb2

Browse files
TheJulianJESTheJulianJES
authored
Replace deprecated dev.handle_message usage in tests (#3746)
1 parent eaa46ac commit eabffb2

File tree

6 files changed

+200
-88
lines changed

6 files changed

+200
-88
lines changed

‎tests/test_inovelli_blue.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
from unittest import mock
44
from unittest.mock import MagicMock
55

6+
import zigpy.types as t
7+
68
import zhaquirks
79
from zhaquirks.inovelli.VZM31SN import InovelliVZM31SNv11
810

@@ -25,7 +27,15 @@ class Listener:
2527
cluster_listener
2628
)
2729

28-
device.handle_message(260, cluster_id, endpoint_id, endpoint_id, data)
30+
device.packet_received(
31+
t.ZigbeePacket(
32+
profile_id=260,
33+
cluster_id=cluster_id,
34+
src_ep=endpoint_id,
35+
dst_ep=endpoint_id,
36+
data=t.SerializableBytes(data),
37+
)
38+
)
2939

3040
assert cluster_listener.zha_send_event.call_count == 1
3141
assert cluster_listener.zha_send_event.call_args == mock.call(
@@ -35,8 +45,14 @@ class Listener:
3545
cluster_listener.zha_send_event.reset_mock()
3646

3747
led_effect_complete_data = b"\x15/\x12\x0c$\x10"
38-
device.handle_message(
39-
260, cluster_id, endpoint_id, endpoint_id, led_effect_complete_data
48+
device.packet_received(
49+
t.ZigbeePacket(
50+
profile_id=260,
51+
cluster_id=cluster_id,
52+
src_ep=endpoint_id,
53+
dst_ep=endpoint_id,
54+
data=t.SerializableBytes(led_effect_complete_data),
55+
)
4056
)
4157

4258
assert cluster_listener.zha_send_event.call_count == 1

‎tests/test_konke.py‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from unittest import mock
55

66
import pytest
7+
import zigpy.types as t
78

89
from tests.common import ZCL_IAS_MOTION_COMMAND, ClusterListener
910
import zhaquirks
@@ -83,7 +84,15 @@ async def test_konke_button(zigpy_device_from_quirk, quirk):
8384

8485
# single press
8586
message = b"\x08W\n\x00\x00\x10\x80"
86-
device.handle_message(260, cluster.cluster_id, 1, 1, message)
87+
device.packet_received(
88+
t.ZigbeePacket(
89+
profile_id=260,
90+
cluster_id=cluster.cluster_id,
91+
src_ep=1,
92+
dst_ep=1,
93+
data=t.SerializableBytes(message),
94+
)
95+
)
8796
assert listener.zha_send_event.call_count == 1
8897
assert listener.zha_send_event.call_args_list[0][0][0] == COMMAND_SINGLE
8998
assert listener.zha_send_event.call_args_list[0][0][1][PRESS_TYPE] == COMMAND_SINGLE
@@ -92,7 +101,15 @@ async def test_konke_button(zigpy_device_from_quirk, quirk):
92101
# double press
93102
listener.reset_mock()
94103
message = b"\x08X\n\x00\x00\x10\x81"
95-
device.handle_message(260, cluster.cluster_id, 1, 1, message)
104+
device.packet_received(
105+
t.ZigbeePacket(
106+
profile_id=260,
107+
cluster_id=cluster.cluster_id,
108+
src_ep=1,
109+
dst_ep=1,
110+
data=t.SerializableBytes(message),
111+
)
112+
)
96113
assert listener.zha_send_event.call_count == 1
97114
assert listener.zha_send_event.call_args_list[0][0][0] == COMMAND_DOUBLE
98115
assert listener.zha_send_event.call_args_list[0][0][1][PRESS_TYPE] == COMMAND_DOUBLE
@@ -101,7 +118,15 @@ async def test_konke_button(zigpy_device_from_quirk, quirk):
101118
# long press
102119
listener.reset_mock()
103120
message = b"\x08Y\n\x00\x00\x10\x82"
104-
device.handle_message(260, cluster.cluster_id, 1, 1, message)
121+
device.packet_received(
122+
t.ZigbeePacket(
123+
profile_id=260,
124+
cluster_id=cluster.cluster_id,
125+
src_ep=1,
126+
dst_ep=1,
127+
data=t.SerializableBytes(message),
128+
)
129+
)
105130
assert listener.zha_send_event.call_count == 1
106131
assert listener.zha_send_event.call_args_list[0][0][0] == COMMAND_HOLD
107132
assert listener.zha_send_event.call_args_list[0][0][1][PRESS_TYPE] == COMMAND_HOLD

‎tests/test_linxura.py‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from unittest import mock
44

55
import pytest
6+
import zigpy.types as t
67
from zigpy.zcl.clusters.security import IasZone
78

89
import zhaquirks
@@ -105,7 +106,15 @@ async def test_button_triggers(zigpy_device_from_quirk, message, button, press_t
105106
listener = mock.MagicMock()
106107
cluster.add_listener(listener)
107108

108-
device.handle_message(260, cluster.cluster_id, 1, 1, message)
109+
device.packet_received(
110+
t.ZigbeePacket(
111+
profile_id=260,
112+
cluster_id=cluster.cluster_id,
113+
src_ep=1,
114+
dst_ep=1,
115+
data=t.SerializableBytes(message),
116+
)
117+
)
109118
assert listener.zha_send_event.call_count == 1
110119
assert listener.zha_send_event.call_args == mock.call(
111120
f"{button}_{press_type}",

‎tests/test_tuya_air.py‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
import pytest
77
import zigpy.profiles.zha
8+
import zigpy.types as t
89

910
import zhaquirks
1011
from zhaquirks.tuya import TuyaNewManufCluster
@@ -65,8 +66,14 @@ def air_quality_device(zigpy_device_from_v2_quirk):
6566
def test_co2_sensor(air_quality_device, data, ep_attr, expected_value):
6667
"""Test Tuya Air Quality Sensor."""
6768

68-
air_quality_device.handle_message(
69-
zigpy.profiles.zha.PROFILE_ID, TuyaNewManufCluster.cluster_id, 1, 1, data
69+
air_quality_device.packet_received(
70+
t.ZigbeePacket(
71+
profile_id=zigpy.profiles.zha.PROFILE_ID,
72+
cluster_id=TuyaNewManufCluster.cluster_id,
73+
src_ep=1,
74+
dst_ep=1,
75+
data=t.SerializableBytes(data),
76+
)
7077
)
7178
cluster = getattr(air_quality_device.endpoints[1], ep_attr)
7279
assert cluster.get("measured_value") == expected_value
@@ -132,8 +139,14 @@ def smart_air_quality_device(zigpy_device_from_v2_quirk):
132139
def test_smart_air_sensor(smart_air_quality_device, data, ep_attr, expected_value):
133140
"""Test Tuya Smart Air Sensor."""
134141

135-
smart_air_quality_device.handle_message(
136-
zigpy.profiles.zha.PROFILE_ID, TuyaNewManufCluster.cluster_id, 1, 1, data
142+
smart_air_quality_device.packet_received(
143+
t.ZigbeePacket(
144+
profile_id=zigpy.profiles.zha.PROFILE_ID,
145+
cluster_id=TuyaNewManufCluster.cluster_id,
146+
src_ep=1,
147+
dst_ep=1,
148+
data=t.SerializableBytes(data),
149+
)
137150
)
138151
cluster = getattr(smart_air_quality_device.endpoints[1], ep_attr)
139152
assert cluster.get("measured_value") == expected_value

‎tests/test_xbee.py‎

Lines changed: 54 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from unittest import mock
44

55
import pytest
6+
import zigpy.types as t
67
from zigpy.zcl import foundation
78
from zigpy.zcl.clusters.general import AnalogOutput, Basic, LevelControl, OnOff
89

@@ -177,12 +178,14 @@ async def test_receive_serial_data(zigpy_device_from_quirk):
177178
].add_listener(listener)
178179

179180
# Receive serial data
180-
xbee3_device.handle_message(
181-
XBEE_PROFILE_ID,
182-
XBEE_DATA_CLUSTER,
183-
XBEE_DATA_ENDPOINT,
184-
XBEE_DATA_ENDPOINT,
185-
b"Test UART data",
181+
xbee3_device.packet_received(
182+
t.ZigbeePacket(
183+
profile_id=XBEE_PROFILE_ID,
184+
cluster_id=XBEE_DATA_CLUSTER,
185+
src_ep=XBEE_DATA_ENDPOINT,
186+
dst_ep=XBEE_DATA_ENDPOINT,
187+
data=t.SerializableBytes(b"Test UART data"),
188+
)
186189
)
187190

188191
listener.zha_send_event.assert_called_once_with(
@@ -350,12 +353,14 @@ async def test_remote_at_non_native(
350353

351354
def mock_at_response(*args, **kwargs):
352355
"""Simulate remote AT command response from device."""
353-
xbee3_device.handle_message(
354-
XBEE_PROFILE_ID,
355-
XBEE_AT_RESPONSE_CLUSTER,
356-
XBEE_AT_ENDPOINT,
357-
XBEE_AT_ENDPOINT,
358-
response_data,
356+
xbee3_device.packet_received(
357+
t.ZigbeePacket(
358+
profile_id=XBEE_PROFILE_ID,
359+
cluster_id=XBEE_AT_RESPONSE_CLUSTER,
360+
src_ep=XBEE_AT_ENDPOINT,
361+
dst_ep=XBEE_AT_ENDPOINT,
362+
data=t.SerializableBytes(response_data),
363+
)
359364
)
360365
return mock.DEFAULT
361366

@@ -477,12 +482,14 @@ async def test_remote_at_tx_failure(zigpy_device_from_quirk):
477482

478483
def mock_at_response(*args, **kwargs):
479484
"""Simulate remote AT command response from device."""
480-
xbee3_device.handle_message(
481-
XBEE_PROFILE_ID,
482-
XBEE_AT_RESPONSE_CLUSTER,
483-
XBEE_AT_ENDPOINT,
484-
XBEE_AT_ENDPOINT,
485-
b"\x01TP\x04",
485+
xbee3_device.packet_received(
486+
t.ZigbeePacket(
487+
profile_id=XBEE_PROFILE_ID,
488+
cluster_id=XBEE_AT_RESPONSE_CLUSTER,
489+
src_ep=XBEE_AT_ENDPOINT,
490+
dst_ep=XBEE_AT_ENDPOINT,
491+
data=t.SerializableBytes(b"\x01TP\x04"),
492+
)
486493
)
487494
return mock.DEFAULT
488495

@@ -515,12 +522,16 @@ async def test_io_sample_report(zigpy_device_from_quirk):
515522
]
516523

517524
# {'digital_samples': [1, None, 0, None, 1, None, 0, None, 1, None, 0, None, 1, None, 0], 'analog_samples': [341, None, 682, None, None, None, None, 3305]}
518-
xbee3_device.handle_message(
519-
XBEE_PROFILE_ID,
520-
XBEE_IO_CLUSTER,
521-
XBEE_DATA_ENDPOINT,
522-
XBEE_DATA_ENDPOINT,
523-
b"\x01\x55\x55\x85\x11\x11\x01\x55\x02\xaa\x0c\xe9",
525+
xbee3_device.packet_received(
526+
t.ZigbeePacket(
527+
profile_id=XBEE_PROFILE_ID,
528+
cluster_id=XBEE_IO_CLUSTER,
529+
src_ep=XBEE_DATA_ENDPOINT,
530+
dst_ep=XBEE_DATA_ENDPOINT,
531+
data=t.SerializableBytes(
532+
b"\x01\x55\x55\x85\x11\x11\x01\x55\x02\xaa\x0c\xe9"
533+
),
534+
)
524535
)
525536

526537
for i in range(len(digital_listeners)):
@@ -564,12 +575,16 @@ async def test_io_sample_report_on_at_response(zigpy_device_from_quirk):
564575

565576
def mock_at_response(*args, **kwargs):
566577
"""Simulate remote AT command response from device."""
567-
xbee_device.handle_message(
568-
XBEE_PROFILE_ID,
569-
XBEE_AT_RESPONSE_CLUSTER,
570-
XBEE_AT_ENDPOINT,
571-
XBEE_AT_ENDPOINT,
572-
b"\x01IS\x00\x01\x55\x55\x85\x11\x11\x01\x55\x02\xaa\x0c\xe9",
578+
xbee_device.packet_received(
579+
t.ZigbeePacket(
580+
profile_id=XBEE_PROFILE_ID,
581+
cluster_id=XBEE_AT_RESPONSE_CLUSTER,
582+
src_ep=XBEE_AT_ENDPOINT,
583+
dst_ep=XBEE_AT_ENDPOINT,
584+
data=t.SerializableBytes(
585+
b"\x01IS\x00\x01\x55\x55\x85\x11\x11\x01\x55\x02\xaa\x0c\xe9"
586+
),
587+
)
573588
)
574589
return mock.DEFAULT
575590

@@ -649,7 +664,15 @@ async def test_zdo(handle_mgmt_lqi_resp, zigpy_device_from_quirk):
649664
xbee3_device = zigpy_device_from_quirk(XBee3Sensor)
650665

651666
# Receive ZDOCmd.IEEE_addr_req
652-
xbee3_device.handle_message(0, 0x0001, 0, 0, b"\x07\x34\x12\x00\x00")
667+
xbee3_device.packet_received(
668+
t.ZigbeePacket(
669+
profile_id=0,
670+
cluster_id=0x01,
671+
src_ep=0,
672+
dst_ep=0,
673+
data=t.SerializableBytes(b"\x07\x34\x12\x00\x00"),
674+
)
675+
)
653676

654677
assert handle_mgmt_lqi_resp.call_count == 1
655678
assert len(handle_mgmt_lqi_resp.call_args_list[0][0]) == 4

0 commit comments

Comments
 (0)