Skip to content

Commit ec40623

Browse files
aleclorimeraleclorimer
committed
Some driver fixes
1 parent 19c6905 commit ec40623

File tree

44 files changed

+348
-16
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+348
-16
lines changed

‎drivers/SmartThings/matter-sensor/src/test/test_matter_smoke_co_alarm.lua‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,15 @@ local cluster_subscribe_list = {
7373
}
7474

7575
local function test_init()
76+
test.disable_startup_messages()
7677
local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device)
7778
for i, cluster in ipairs(cluster_subscribe_list) do
7879
if i > 1 then
7980
subscribe_request:merge(cluster:subscribe(mock_device))
8081
end
8182
end
83+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
84+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
8285
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
8386
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
8487
local read_attribute_list = clusters.PowerSource.attributes.AttributeList:read()

‎drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,16 +122,17 @@ local function test_init()
122122
for i, clus in ipairs(CLUSTER_SUBSCRIBE_LIST) do
123123
if i > 1 then subscribe_request:merge(clus:subscribe(mock_device)) end
124124
end
125-
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
125+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
126+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
126127
mock_device:set_field("__ELECTRICAL_TOPOLOGY", {topology = false, tags_on_ep = {}}, {persist = false}) -- since we're assuming this would have happened during device_added in this case.
128+
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
127129
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
128-
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
129-
test.mock_device.add_test_device(mock_device)
130130
local read_attribute_list = clusters.PowerSource.attributes.AttributeList:read()
131131
test.socket.matter:__expect_send({mock_device.id, read_attribute_list})
132+
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
133+
test.mock_device.add_test_device(mock_device)
132134
configure_buttons()
133-
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
134-
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
135+
135136
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
136137
local device_info_copy = utils.deep_copy(mock_device.raw_st_data)
137138
device_info_copy.profile.id = "5-buttons-battery"

‎drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,17 @@ local function configure_buttons()
193193
end
194194

195195
local function test_init()
196+
test.disable_startup_messages()
196197
local subscribe_request = CLUSTER_SUBSCRIBE_LIST[1]:subscribe(mock_device)
197198
for i, clus in ipairs(CLUSTER_SUBSCRIBE_LIST) do
198199
if i > 1 then subscribe_request:merge(clus:subscribe(mock_device)) end
199200
end
200201
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
201202
mock_device:set_field("__ELECTRICAL_TOPOLOGY", {topology = false, tags_on_ep = {}}, {persist = false}) -- since we're assuming this would have happened during device_added in this case.
203+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
204+
configure_buttons()
205+
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
206+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
202207
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
203208
mock_device:expect_metadata_update({ profile = "light-level-3-button" })
204209
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
@@ -217,9 +222,7 @@ local function test_init()
217222
parent_device_id = mock_device.id,
218223
parent_assigned_child_key = string.format("%d", mock_device_ep5)
219224
})
220-
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
221-
configure_buttons()
222-
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
225+
223226
end
224227

225228
local function test_init_mcd_unsupported_switch_device_type()
@@ -236,6 +239,8 @@ local function test_init_mcd_unsupported_switch_device_type()
236239
subscribe_request:merge(cluster:subscribe(mock_device_mcd_unsupported_switch_device_type))
237240
end
238241
end
242+
test.socket.device_lifecycle:__queue_receive({ mock_device_mcd_unsupported_switch_device_type.id, "added" })
243+
test.socket.device_lifecycle:__queue_receive({ mock_device_mcd_unsupported_switch_device_type.id, "init" })
239244
test.socket.matter:__expect_send({mock_device_mcd_unsupported_switch_device_type.id, subscribe_request})
240245
mock_device_mcd_unsupported_switch_device_type:set_field("__ELECTRICAL_TOPOLOGY", {topology = false, tags_on_ep = {}}, {persist = false}) -- since we're assuming this would have happened during device_added in this case.
241246
test.socket.device_lifecycle:__queue_receive({ mock_device_mcd_unsupported_switch_device_type.id, "doConfigure" })

‎drivers/SmartThings/zigbee-contact/src/test/test_frient_contact_sensor_pro.lua‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,14 @@ test.register_message_test(
199199
channel = "capability",
200200
direction = "send",
201201
message = mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C" }))
202+
},
203+
{
204+
channel = "devices",
205+
direction = "send",
206+
message = {
207+
"register_native_capability_attr_handler",
208+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
209+
}
202210
}
203211
}
204212
)

‎drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact.lua‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,14 @@ test.register_message_test(
147147
channel = "capability",
148148
direction = "send",
149149
message = mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C" }))
150+
},
151+
{
152+
channel = "devices",
153+
direction = "send",
154+
message = {
155+
"register_native_capability_attr_handler",
156+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
157+
}
150158
}
151159
}
152160
)

‎drivers/SmartThings/zigbee-contact/src/test/test_zigbee_contact_tyco.lua‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@ test.register_message_test(
8080
channel = "capability",
8181
direction = "send",
8282
message = mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C" }))
83+
},
84+
{
85+
channel = "devices",
86+
direction = "send",
87+
message = {
88+
"register_native_capability_attr_handler",
89+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
90+
}
8391
}
8492
}
8593
)
@@ -97,6 +105,7 @@ test.register_coroutine_test(
97105
}
98106
)
99107
test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C" })))
108+
mock_device:expect_native_attr_handler_registration("temperatureMeasurement", "temperature")
100109
test.wait_for_events()
101110
end
102111
)

‎drivers/SmartThings/zigbee-humidity-sensor/src/test/test_aqara_sensor.lua‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ test.register_message_test(
167167
direction = "send",
168168
message = mock_device:generate_test_message("main",
169169
capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C" }))
170+
},
171+
{
172+
channel = "devices",
173+
direction = "send",
174+
message = {
175+
"register_native_capability_attr_handler",
176+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
177+
}
170178
}
171179
}
172180
)

‎drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_plaid_systems.lua‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,14 @@ test.register_message_test(
116116
channel = "capability",
117117
direction = "send",
118118
message = mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C"}))
119+
},
120+
{
121+
channel = "devices",
122+
direction = "send",
123+
message = {
124+
"register_native_capability_attr_handler",
125+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
126+
}
119127
}
120128
}
121129
)

‎drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature.lua‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ test.register_message_test(
4848
channel = "capability",
4949
direction = "send",
5050
message = mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C"}))
51+
},
52+
{
53+
channel = "devices",
54+
direction = "send",
55+
message = {
56+
"register_native_capability_attr_handler",
57+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
58+
}
5159
}
5260
}
5361
)

‎drivers/SmartThings/zigbee-humidity-sensor/src/test/test_humidity_temperature_battery.lua‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ test.register_message_test(
6060
channel = "capability",
6161
direction = "send",
6262
message = mock_device:generate_test_message("main", capabilities.temperatureMeasurement.temperature({ value = 25.0, unit = "C"}))
63+
},
64+
{
65+
channel = "devices",
66+
direction = "send",
67+
message = {
68+
"register_native_capability_attr_handler",
69+
{ device_uuid = mock_device.id, capability_id = "temperatureMeasurement", capability_attr_id = "temperature" }
70+
}
6371
}
6472
}
6573
)

0 commit comments

Comments
 (0)