Skip to content

Fixing zigbee-switch tests for ColorTempPhysMireds #2886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aleclorimer wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fixing zigbee-switch tests for ColorTempPhysMireds #2886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fcc16c
Fixing zigbee-switch tests for ColorTempPhysMireds
aleclorimer Apr 9, 2026
799a170
Splitting tests based off api_version
aleclorimer Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/jenkins-driver-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ on:
paths:
- 'drivers/**'

pull_request_target:
paths:
- 'drivers/**'

permissions:
statuses: write

Expand All @@ -12,7 +16,7 @@ jobs:
strategy:
matrix:
version:
[ 59, 60 ]
[ 59, 60 , dev]

runs-on: ubuntu-latest
steps:
Expand Down
147 changes: 146 additions & 1 deletion drivers/SmartThings/zigbee-switch/src/test/test_all_capability_zigbee_bulb.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,10 +423,155 @@ test.register_coroutine_test(
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end,
{
min_api_version = 17
min_api_version = 17,
max_api_version = 19
}
)

test.register_coroutine_test(
"lifecycle configure event should configure device",
function ()
test.socket.zigbee:__set_channel_ordering("relaxed")
test.socket.device_lifecycle:__queue_receive({mock_device.id, "doConfigure"})

test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device) })

test.socket.zigbee:__expect_send({
mock_device.id,
OnOff.attributes.OnOff:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
Level.attributes.CurrentLevel:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.ColorTemperatureMireds:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.CurrentHue:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.CurrentSaturation:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device,
zigbee_test_utils.mock_hub_eui,
OnOff.ID)
})
test.socket.zigbee:__expect_send({
mock_device.id,
SimpleMetering.attributes.InstantaneousDemand:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
SimpleMetering.attributes.CurrentSummationDelivered:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ElectricalMeasurement.attributes.ActivePower:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
OnOff.attributes.OnOff:configure_reporting(mock_device, 0, 300)
})
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device,
zigbee_test_utils.mock_hub_eui,
Level.ID)
})
test.socket.zigbee:__expect_send({
mock_device.id,
Level.attributes.CurrentLevel:configure_reporting(mock_device, 1, 3600, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device,
zigbee_test_utils.mock_hub_eui,
ColorControl.ID)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.ColorTemperatureMireds:configure_reporting(mock_device, 1, 3600, 0x0010)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.CurrentHue:configure_reporting(mock_device, 1, 3600, 0x0010)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.CurrentSaturation:configure_reporting(mock_device, 1, 3600, 0x0010)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device,
zigbee_test_utils.mock_hub_eui,
SimpleMetering.ID)
})
test.socket.zigbee:__expect_send({
mock_device.id,
SimpleMetering.attributes.InstantaneousDemand:configure_reporting(mock_device, 5, 3600, 5)
})
test.socket.zigbee:__expect_send({
mock_device.id,
SimpleMetering.attributes.CurrentSummationDelivered:configure_reporting(mock_device, 5, 3600, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device,
zigbee_test_utils.mock_hub_eui,
ElectricalMeasurement.ID)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ElectricalMeasurement.attributes.ActivePower:configure_reporting(mock_device, 5, 3600, 5)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ElectricalMeasurement.attributes.ACPowerMultiplier:configure_reporting(mock_device, 1, 43200, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ElectricalMeasurement.attributes.ACPowerDivisor:configure_reporting(mock_device, 1, 43200, 1)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ElectricalMeasurement.attributes.ACPowerDivisor:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
ElectricalMeasurement.attributes.ACPowerMultiplier:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
SimpleMetering.attributes.Multiplier:read(mock_device)
})
test.socket.zigbee:__expect_send({
mock_device.id,
SimpleMetering.attributes.Divisor:read(mock_device)
})
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMaxMireds:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTempPhysicalMinMireds:read(mock_device) })

mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end,
{
min_api_version = 20
}
)
-- test.register_coroutine_test(
-- "health check coroutine",
-- function()
Expand Down
70 changes: 69 additions & 1 deletion drivers/SmartThings/zigbee-switch/src/test/test_aqara_led_bulb.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,75 @@ test.register_coroutine_test(
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end,
{
min_api_version = 17
min_api_version = 17,
max_api_version = 19
}
)

test.register_coroutine_test(
"Configure should configure all necessary attributes and refresh device",
function()
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
test.socket.zigbee:__set_channel_ordering("relaxed")

test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.commands.MoveToColorTemperature(mock_device, 200, 0)
}
)

test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, Level.ID)
})
test.socket.zigbee:__expect_send(
{
mock_device.id,
Level.attributes.CurrentLevel:configure_reporting(mock_device, 1, 3600, 1)
}
)
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, ColorControl.ID)
})
test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.attributes.ColorTemperatureMireds:configure_reporting(mock_device, 1, 3600, 16)
}
)
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, OnOff.ID)
})
test.socket.zigbee:__expect_send(
{
mock_device.id,
OnOff.attributes.OnOff:configure_reporting(mock_device, 0, 300, 1)
}
)
test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)
}
)
test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)
}
)

test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })

mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end,
{
min_api_version = 20
}
)

Expand Down
72 changes: 71 additions & 1 deletion drivers/SmartThings/zigbee-switch/src/test/test_aqara_light.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,85 @@ test.register_coroutine_test(
OnOff.attributes.OnOff:configure_reporting(mock_device, 0, 300, 1)
}
)
test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.attributes.ColorTempPhysicalMaxMireds:configure_reporting(mock_device, 1, 43200, 1)
}
)
test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.attributes.ColorTempPhysicalMinMireds:configure_reporting(mock_device, 1, 43200, 1)
}
)

test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end,
{
min_api_version = 20
}
)


test.register_coroutine_test(
"Configure should configure all necessary attributes and refresh device",
function()
test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
test.socket.zigbee:__set_channel_ordering("relaxed")

test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OnTransitionTime:write(mock_device, 0) })
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.OffTransitionTime:write(mock_device, 0) })

test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.commands.MoveToColorTemperature(mock_device, 200, 0)
}
)

test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, Level.ID)
})
test.socket.zigbee:__expect_send(
{
mock_device.id,
Level.attributes.CurrentLevel:configure_reporting(mock_device, 1, 3600, 1)
}
)
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, ColorControl.ID)
})
test.socket.zigbee:__expect_send(
{
mock_device.id,
ColorControl.attributes.ColorTemperatureMireds:configure_reporting(mock_device, 1, 3600, 16)
}
)
test.socket.zigbee:__expect_send({
mock_device.id,
zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, OnOff.ID)
})
test.socket.zigbee:__expect_send(
{
mock_device.id,
OnOff.attributes.OnOff:configure_reporting(mock_device, 0, 300, 1)
}
)

test.socket.zigbee:__expect_send({ mock_device.id, OnOff.attributes.OnOff:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, Level.attributes.CurrentLevel:read(mock_device) })
test.socket.zigbee:__expect_send({ mock_device.id, ColorControl.attributes.ColorTemperatureMireds:read(mock_device) })
mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
end,
{
min_api_version = 17
min_api_version = 17,
max_api_version = 19
}
)

Expand Down
Loading
Loading