Skip to content

Commit cce4958

Browse files
wkhenonwkhenon
committed
add version check
1 parent b0da333 commit cce4958

File tree

6 files changed

+166
-21
lines changed

6 files changed

+166
-21
lines changed

‎drivers/SmartThings/zigbee-switch/src/test/test_sengled_dimmer_bulb_with_motion_sensor.lua‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ local test = require "integration_test"
1616
local capabilities = require "st.capabilities"
1717
local clusters = require "st.zigbee.zcl.clusters"
1818
local t_utils = require "integration_test.utils"
19+
local version = require "version"
1920
local zigbee_test_utils = require "integration_test.zigbee_test_utils"
2021

2122
local OnOff = clusters.OnOff
@@ -116,9 +117,18 @@ test.register_coroutine_test(
116117
test.socket.zigbee:__set_channel_ordering("relaxed")
117118
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
118119
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "on", args = {} } })
119-
mock_device:expect_native_cmd_handler_registration("switch", "on")
120+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "on") end
120121

121122
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
123+
124+
if version.api <= 15 then
125+
test.wait_for_events()
126+
test.mock_time.advance_time(2)
127+
128+
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
129+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
130+
test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
131+
end
122132
end
123133
)
124134

@@ -128,9 +138,18 @@ test.register_coroutine_test(
128138
test.socket.zigbee:__set_channel_ordering("relaxed")
129139
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
130140
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "off", args = {} } })
131-
mock_device:expect_native_cmd_handler_registration("switch", "off")
141+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "off") end
132142

133143
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.Off(mock_device) })
144+
145+
if version.api <= 15 then
146+
test.wait_for_events()
147+
test.mock_time.advance_time(2)
148+
149+
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
150+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
151+
test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
152+
end
134153
end
135154
)
136155

@@ -140,9 +159,18 @@ test.register_coroutine_test(
140159
test.socket.zigbee:__set_channel_ordering("relaxed")
141160
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
142161
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switchLevel", component = "main", command = "setLevel", args = { 57 } } })
143-
mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel")
162+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel") end
144163

145164
test.socket.zigbee:__expect_send({ mock_device.id, Level.server.commands.MoveToLevelWithOnOff(mock_device, 144, 0xFFFF) })
165+
166+
if version.api <= 15 then
167+
test.wait_for_events()
168+
test.mock_time.advance_time(2)
169+
170+
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
171+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
172+
test.socket.zigbee:__expect_send({ mock_device.id, IASZone.attributes.ZoneStatus:read(mock_device) })
173+
end
146174
end
147175
)
148176

‎drivers/SmartThings/zigbee-switch/src/test/test_zll_color_temp_bulb.lua‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
local test = require "integration_test"
1616
local clusters = require "st.zigbee.zcl.clusters"
1717
local t_utils = require "integration_test.utils"
18+
local version = require "version"
1819
local zigbee_test_utils = require "integration_test.zigbee_test_utils"
1920

2021
local OnOff = clusters.OnOff
@@ -83,7 +84,7 @@ test.register_coroutine_test(
8384
test.socket.zigbee:__set_channel_ordering("relaxed")
8485
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
8586
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "on", args = {} } })
86-
mock_device:expect_native_cmd_handler_registration("switch", "on")
87+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "on") end
8788
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device)})
8889
test.wait_for_events()
8990
test.mock_time.advance_time(2)
@@ -99,11 +100,17 @@ test.register_coroutine_test(
99100
test.socket.zigbee:__set_channel_ordering("relaxed")
100101
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
101102
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "off", args = {} } })
102-
mock_device:expect_native_cmd_handler_registration("switch", "off")
103+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "off") end
104+
103105
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.Off(mock_device)})
104106
test.wait_for_events()
105107
test.mock_time.advance_time(2)
106108
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
109+
110+
if version.api <= 15 then
111+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
112+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
113+
end
107114
end
108115
)
109116

@@ -113,11 +120,13 @@ test.register_coroutine_test(
113120
test.socket.zigbee:__set_channel_ordering("relaxed")
114121
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
115122
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switchLevel", component = "main", command = "setLevel", args = {50} } })
116-
mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel")
123+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel") end
117124
test.socket.zigbee:__expect_send({ mock_device.id, Level.commands.MoveToLevelWithOnOff(mock_device, math.floor(50 / 100.0 * 254), 0xFFFF)})
118125
test.wait_for_events()
119126
test.mock_time.advance_time(2)
127+
if version.api <= 15 then test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) }) end
120128
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
129+
if version.api <= 15 then test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) }) end
121130
end
122131
)
123132

@@ -127,11 +136,15 @@ test.register_coroutine_test(
127136
test.socket.zigbee:__set_channel_ordering("relaxed")
128137
test.timer.__create_and_queue_test_time_advance_timer(1, "oneshot")
129138
test.socket.capability:__queue_receive({ mock_device.id, { capability = "colorTemperature", component = "main", command = "setColorTemperature", args = {200} } })
130-
mock_device:expect_native_cmd_handler_registration("colorTemperature", "setColorTemperature")
139+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("colorTemperature", "setColorTemperature") end
131140
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device)})
132141
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.commands.MoveToColorTemperature(mock_device, 5000, 0x0000)})
133142
test.wait_for_events()
134143
test.mock_time.advance_time(2)
144+
if version.api <= 15 then
145+
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
146+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
147+
end
135148
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
136149
end
137150
)

‎drivers/SmartThings/zigbee-switch/src/test/test_zll_dimmer_bulb.lua‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
local test = require "integration_test"
1616
local clusters = require "st.zigbee.zcl.clusters"
1717
local t_utils = require "integration_test.utils"
18+
local version = require "version"
1819
local zigbee_test_utils = require "integration_test.zigbee_test_utils"
1920

2021
local OnOff = clusters.OnOff
@@ -122,7 +123,7 @@ test.register_coroutine_test(
122123
test.socket.zigbee:__set_channel_ordering("relaxed")
123124
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
124125
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "on", args = {} } })
125-
mock_device:expect_native_cmd_handler_registration("switch", "on")
126+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "on") end
126127

127128
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
128129

@@ -131,7 +132,9 @@ test.register_coroutine_test(
131132

132133
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
133134
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
134-
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
135+
if version.api > 15 then
136+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
137+
end
135138
end
136139
)
137140

@@ -141,14 +144,17 @@ test.register_coroutine_test(
141144
test.socket.zigbee:__set_channel_ordering("relaxed")
142145
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
143146
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "off", args = {} } })
144-
mock_device:expect_native_cmd_handler_registration("switch", "off")
147+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "off") end
145148

146149
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.Off(mock_device) })
147150

148151
test.wait_for_events()
149152
test.mock_time.advance_time(2)
150153

151154
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
155+
if version.api <= 15 then
156+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
157+
end
152158
end
153159
)
154160

@@ -158,13 +164,16 @@ test.register_coroutine_test(
158164
test.socket.zigbee:__set_channel_ordering("relaxed")
159165
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
160166
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switchLevel", component = "main", command = "setLevel", args = { 57 } } })
161-
mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel")
167+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel") end
162168

163169
test.socket.zigbee:__expect_send({ mock_device.id, Level.server.commands.MoveToLevelWithOnOff(mock_device, 144, 0xFFFF) })
164170

165171
test.wait_for_events()
166172
test.mock_time.advance_time(2)
167173

174+
if version.api <= 15 then
175+
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
176+
end
168177
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
169178
end
170179
)

‎drivers/SmartThings/zigbee-switch/src/test/test_zll_rgb_bulb.lua‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ local test = require "integration_test"
1616
local capabilities = require "st.capabilities"
1717
local clusters = require "st.zigbee.zcl.clusters"
1818
local t_utils = require "integration_test.utils"
19+
local version = require "version"
1920
local zigbee_test_utils = require "integration_test.zigbee_test_utils"
2021

2122
local OnOff = clusters.OnOff
@@ -149,7 +150,7 @@ test.register_coroutine_test(
149150
test.socket.zigbee:__set_channel_ordering("relaxed")
150151
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
151152
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "on", args = {} } })
152-
mock_device:expect_native_cmd_handler_registration("switch", "on")
153+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "on") end
153154

154155
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.On(mock_device) })
155156

@@ -158,7 +159,12 @@ test.register_coroutine_test(
158159

159160
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
160161
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
161-
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
162+
if version.api <= 15 then
163+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentX:read(mock_device) })
164+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
165+
else
166+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
167+
end
162168
end
163169
)
164170

@@ -168,32 +174,41 @@ test.register_coroutine_test(
168174
test.socket.zigbee:__set_channel_ordering("relaxed")
169175
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
170176
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switch", component = "main", command = "off", args = {} } })
171-
mock_device:expect_native_cmd_handler_registration("switch", "off")
177+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switch", "off") end
172178

173179
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.commands.Off(mock_device) })
174180

175181
test.wait_for_events()
176182
test.mock_time.advance_time(2)
177183

178184
test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
185+
if version.api <= 15 then
186+
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
187+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentX:read(mock_device) })
188+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
189+
end
179190
end
180191
)
181192

182-
183193
test.register_coroutine_test(
184194
"Capability 'switchLevel' command 'setLevel' should be handled",
185195
function()
186196
test.socket.zigbee:__set_channel_ordering("relaxed")
187197
test.timer.__create_and_queue_test_time_advance_timer(2, "oneshot")
188198
test.socket.capability:__queue_receive({ mock_device.id, { capability = "switchLevel", component = "main", command = "setLevel", args = { 57 } } })
189-
mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel")
199+
if version.api > 15 then mock_device:expect_native_cmd_handler_registration("switchLevel", "setLevel") end
190200

191201
test.socket.zigbee:__expect_send({ mock_device.id, Level.server.commands.MoveToLevelWithOnOff(mock_device, 144, 0xFFFF) })
192202

193203
test.wait_for_events()
194204
test.mock_time.advance_time(2)
195205

206+
if version.api <= 15 then test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) }) end
196207
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
208+
if version.api <= 15 then
209+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentX:read(mock_device) })
210+
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.CurrentY:read(mock_device) })
211+
end
197212
end
198213
)
199214

0 commit comments

Comments
 (0)