Skip to content

Commit 6bb6f9f

Browse files
nickolas-deboomnickolas-deboom
authored
58 Unit test fixes for matter test cases (#2311)
This commit covers the matter test case updates associated with #2310.
1 parent b1242ed commit 6bb6f9f

File tree

62 files changed

+1406
-1131
lines changed

Some content is hidden

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

62 files changed

+1406
-1131
lines changed

‎drivers/SmartThings/matter-appliance/src/test/test_cook_top.lua

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,34 +70,29 @@ local mock_device = test.mock_device.build_test_matter_device({
7070
})
7171

7272
local function test_init()
73+
test.disable_startup_messages()
74+
test.mock_device.add_test_device(mock_device)
7375
local cluster_subscribe_list = {
7476
clusters.OnOff.attributes.OnOff,
7577
clusters.TemperatureMeasurement.attributes.MeasuredValue,
7678
clusters.TemperatureControl.attributes.SelectedTemperatureLevel,
7779
clusters.TemperatureControl.attributes.SupportedTemperatureLevels
7880
}
79-
test.socket.matter:__set_channel_ordering("relaxed")
8081
local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device)
8182
for i, cluster in ipairs(cluster_subscribe_list) do
8283
if i > 1 then
8384
subscribe_request:merge(cluster:subscribe(mock_device))
8485
end
8586
end
86-
test.socket.matter:__expect_send({ mock_device.id, subscribe_request })
87-
test.mock_device.add_test_device(mock_device)
8887
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
88+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
89+
test.socket.matter:__expect_send({ mock_device.id, subscribe_request })
90+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure"})
91+
mock_device:expect_metadata_update({ profile = "cook-surface-one-tl-cook-surface-two-tl" })
92+
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
8993
end
9094
test.set_test_init_function(test_init)
9195

92-
test.register_coroutine_test(
93-
"Verify device profile update",
94-
function()
95-
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure"})
96-
mock_device:expect_metadata_update({ profile = "cook-surface-one-tl-cook-surface-two-tl" })
97-
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
98-
end
99-
)
100-
10196
test.register_coroutine_test(
10297
"Assert component to endpoint map",
10398
function()

‎drivers/SmartThings/matter-appliance/src/test/test_dishwasher.lua

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ local mock_device = test.mock_device.build_test_matter_device({
5757
})
5858

5959
local function test_init()
60+
test.disable_startup_messages()
61+
test.mock_device.add_test_device(mock_device)
6062
local cluster_subscribe_list = {
6163
clusters.OnOff.attributes.OnOff,
6264
clusters.DishwasherMode.attributes.CurrentMode,
@@ -71,20 +73,20 @@ local function test_init()
7173
clusters.TemperatureControl.attributes.SelectedTemperatureLevel,
7274
clusters.TemperatureControl.attributes.SupportedTemperatureLevels
7375
}
74-
test.socket.matter:__set_channel_ordering("relaxed")
7576
local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device)
7677
for i, cluster in ipairs(cluster_subscribe_list) do
7778
if i > 1 then
7879
subscribe_request:merge(cluster:subscribe(mock_device))
7980
end
8081
end
8182
test.socket.matter:__expect_send({ mock_device.id, subscribe_request })
82-
test.mock_device.add_test_device(mock_device)
8383
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
84-
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure"})
84+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
85+
test.socket.matter:__expect_send({ mock_device.id, subscribe_request })
8586
local read_req = clusters.TemperatureControl.attributes.MinTemperature:read()
8687
read_req:merge(clusters.TemperatureControl.attributes.MaxTemperature:read())
8788
test.socket.matter:__expect_send({mock_device.id, read_req})
89+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure"})
8890
mock_device:expect_metadata_update({ profile = "dishwasher-tn-tl" })
8991
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
9092
end

‎drivers/SmartThings/matter-appliance/src/test/test_extractor_hood.lua

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
local test = require "integration_test"
1616
local capabilities = require "st.capabilities"
1717
local t_utils = require "integration_test.utils"
18-
1918
local clusters = require "st.matter.clusters"
2019

2120
local mock_device = test.mock_device.build_test_matter_device({
@@ -86,6 +85,8 @@ local mock_device_onoff = test.mock_device.build_test_matter_device({
8685
})
8786

8887
local function test_init()
88+
test.disable_startup_messages()
89+
test.mock_device.add_test_device(mock_device)
8990
local subscribed_attributes = {
9091
[capabilities.fanMode.ID] = {
9192
clusters.FanControl.attributes.FanModeSequence,
@@ -117,16 +118,16 @@ local function test_init()
117118
end
118119
end
119120
end
120-
121-
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
122-
test.mock_device.add_test_device(mock_device)
123121
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
122+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
123+
test.socket.matter:__expect_send({mock_device.id, subscribe_request})
124124
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure"})
125125
mock_device:expect_metadata_update({ profile = "extractor-hood-hepa-ac-wind" })
126126
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
127127
end
128128

129129
local function test_init_onoff()
130+
test.disable_startup_messages()
130131
local cluster_subscribe_list = {
131132
clusters.FanControl.attributes.FanModeSequence,
132133
clusters.FanControl.attributes.FanMode,
@@ -135,15 +136,16 @@ local function test_init_onoff()
135136
clusters.FanControl.attributes.WindSetting,
136137
clusters.OnOff.attributes.OnOff
137138
}
138-
local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device)
139+
local subscribe_request = cluster_subscribe_list[1]:subscribe(mock_device_onoff)
139140
for i, cluster in ipairs(cluster_subscribe_list) do
140141
if i > 1 then
141-
subscribe_request:merge(cluster:subscribe(mock_device))
142+
subscribe_request:merge(cluster:subscribe(mock_device_onoff))
142143
end
143144
end
144-
test.socket.matter:__expect_send({mock_device_onoff.id, subscribe_request})
145145
test.mock_device.add_test_device(mock_device_onoff)
146146
test.socket.device_lifecycle:__queue_receive({ mock_device_onoff.id, "added" })
147+
test.socket.device_lifecycle:__queue_receive({ mock_device_onoff.id, "init" })
148+
test.socket.matter:__expect_send({mock_device_onoff.id, subscribe_request})
147149
test.socket.device_lifecycle:__queue_receive({ mock_device_onoff.id, "doConfigure"})
148150
mock_device_onoff:expect_metadata_update({ profile = "extractor-hood-wind-light" })
149151
mock_device_onoff:expect_metadata_update({ provisioning_state = "PROVISIONED" })

‎drivers/SmartThings/matter-appliance/src/test/test_laundry_dryer.lua

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ local mock_device = test.mock_device.build_test_matter_device({
5656
})
5757

5858
local function test_init()
59+
test.disable_startup_messages()
60+
test.mock_device.add_test_device(mock_device)
5961
local cluster_subscribe_list = {
6062
clusters.OnOff.attributes.OnOff,
6163
clusters.LaundryWasherMode.attributes.CurrentMode,
@@ -76,8 +78,9 @@ local function test_init()
7678
end
7779
end
7880
test.socket.matter:__expect_send({ mock_device.id, subscribe_request })
79-
test.mock_device.add_test_device(mock_device)
8081
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
82+
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "init" })
83+
test.socket.matter:__expect_send({ mock_device.id, subscribe_request })
8184
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure"})
8285
local read_req = clusters.TemperatureControl.attributes.MinTemperature:read()
8386
read_req:merge(clusters.TemperatureControl.attributes.MaxTemperature:read())

‎drivers/SmartThings/matter-appliance/src/test/test_laundry_washer.lua

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ local mock_device_washer = test.mock_device.build_test_matter_device({
5656
})
5757

5858
local function test_init()
59+
test.disable_startup_messages()
60+
test.mock_device.add_test_device(mock_device_washer)
5961
local cluster_subscribe_list = {
6062
clusters.OnOff.attributes.OnOff,
6163
clusters.LaundryWasherMode.attributes.CurrentMode,
@@ -69,16 +71,16 @@ local function test_init()
6971
clusters.TemperatureControl.attributes.SelectedTemperatureLevel,
7072
clusters.TemperatureControl.attributes.SupportedTemperatureLevels
7173
}
72-
test.socket.matter:__set_channel_ordering("relaxed")
7374
local subscribe_request_washer = cluster_subscribe_list[1]:subscribe(mock_device_washer)
7475
for i, cluster in ipairs(cluster_subscribe_list) do
7576
if i > 1 then
7677
subscribe_request_washer:merge(cluster:subscribe(mock_device_washer))
7778
end
7879
end
7980
test.socket.matter:__expect_send({ mock_device_washer.id, subscribe_request_washer })
80-
test.mock_device.add_test_device(mock_device_washer)
8181
test.socket.device_lifecycle:__queue_receive({ mock_device_washer.id, "added" })
82+
test.socket.device_lifecycle:__queue_receive({ mock_device_washer.id, "init" })
83+
test.socket.matter:__expect_send({ mock_device_washer.id, subscribe_request_washer })
8284
test.socket.device_lifecycle:__queue_receive({ mock_device_washer.id, "doConfigure"})
8385
local read_req = clusters.TemperatureControl.attributes.MinTemperature:read()
8486
read_req:merge(clusters.TemperatureControl.attributes.MaxTemperature:read())

0 commit comments

Comments
 (0)