Skip to content

Fix test cases using EnergyMeasurementStruct #2470

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix test cases using EnergyMeasurementStruct #2470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions drivers/SmartThings/matter-energy/src/test/test_battery_storage.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyImported:build_test_report_data(mock_device,
BATTERY_STORAGE_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --100Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --100Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("importedEnergy",
Expand All @@ -219,7 +219,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyExported:build_test_report_data(mock_device,
BATTERY_STORAGE_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 400000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --400Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 400000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --400Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("exportedEnergy",
Expand All @@ -245,7 +245,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyImported:build_test_report_data(mock_device,
BATTERY_STORAGE_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 200000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --200Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 200000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --200Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("importedEnergy",
Expand All @@ -266,7 +266,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyExported:build_test_report_data(mock_device,
BATTERY_STORAGE_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 400000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --400Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 400000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --400Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("exportedEnergy",
Expand Down
8 changes: 4 additions & 4 deletions drivers/SmartThings/matter-energy/src/test/test_solar_power.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyExported:build_test_report_data(mock_device,
SOLAR_POWER_EP_ONE,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --100Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --100Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -156,7 +156,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyExported:build_test_report_data(mock_device,
SOLAR_POWER_EP_TWO,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 150000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --150Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 150000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --150Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -178,7 +178,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyExported:build_test_report_data(mock_device,
SOLAR_POWER_EP_ONE,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --100Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --100Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -190,7 +190,7 @@ test.register_coroutine_test(
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyImported:build_test_report_data(mock_device,
SOLAR_POWER_EP_ONE,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) --100Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 100000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) --100Wh
end
)

Expand Down
6 changes: 6 additions & 0 deletions drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ local cumulative_report_val_19 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local cumulative_report_val_29 = {
Expand All @@ -131,6 +133,8 @@ local cumulative_report_val_29 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local cumulative_report_val_39 = {
Expand All @@ -139,6 +143,8 @@ local cumulative_report_val_39 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local function configure_buttons()
Expand Down
8 changes: 8 additions & 0 deletions drivers/SmartThings/matter-switch/src/test/test_electrical_sensor.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ local cumulative_report_val_19 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local cumulative_report_val_29 = {
Expand All @@ -119,6 +121,8 @@ local cumulative_report_val_29 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local cumulative_report_val_39 = {
Expand All @@ -127,6 +131,8 @@ local cumulative_report_val_39 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local periodic_report_val_23 = {
Expand All @@ -135,6 +141,8 @@ local periodic_report_val_23 = {
end_timestamp = 0,
start_systime = 0,
end_systime = 0,
apparent_energy = 0,
reactive_energy = 0
}

local function test_init()
Expand Down
12 changes: 6 additions & 6 deletions drivers/SmartThings/matter-thermostat/src/test/test_matter_heat_pump.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ test.register_message_test(
clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyImported:build_test_report_data(mock_device,
HEAT_PUMP_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 15000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 }))
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 15000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 }))
}
},
{
Expand All @@ -651,7 +651,7 @@ test.register_coroutine_test(

test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
HEAT_PUMP_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 20Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 20Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -675,7 +675,7 @@ test.register_coroutine_test(

test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
HEAT_PUMP_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 30000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 30Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 30000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 30Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -698,7 +698,7 @@ test.register_coroutine_test(

test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
HEAT_PUMP_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 20Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 20Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -722,12 +722,12 @@ test.register_coroutine_test(
-- do not expect energyMeter event for this report.
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.PeriodicEnergyImported:build_test_report_data(mock_device,
HEAT_PUMP_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 800, start_systime = 0, end_systime = 0 })) }) -- 20Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 800, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 20Wh

-- do not expect a powerConsumptionReport to be emitted
test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
HEAT_PUMP_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 50000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 50Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 50000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 50Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand Down
8 changes: 4 additions & 4 deletions drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ test.register_message_test(
clusters.ElectricalEnergyMeasurement.attributes
.CumulativeEnergyImported:build_test_report_data(mock_device,
ELECTRICAL_SENSOR_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 15000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 }))
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 15000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 }))
}
},
{
Expand All @@ -267,7 +267,7 @@ test.register_coroutine_test(

test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
ELECTRICAL_SENSOR_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 20Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 20000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 20Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -288,7 +288,7 @@ test.register_coroutine_test(

test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
ELECTRICAL_SENSOR_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 30000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 30Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 30000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 30Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand All @@ -303,7 +303,7 @@ test.register_coroutine_test(

test.socket.matter:__queue_receive({ mock_device.id, clusters.ElectricalEnergyMeasurement.attributes.CumulativeEnergyImported:build_test_report_data(mock_device,
ELECTRICAL_SENSOR_EP,
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 50000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0 })) }) -- 30Wh
clusters.ElectricalEnergyMeasurement.types.EnergyMeasurementStruct({ energy = 50000, start_timestamp = 0, end_timestamp = 0, start_systime = 0, end_systime = 0, apparent_energy = 0, reactive_energy = 0 })) }) -- 30Wh

test.socket.capability:__expect_send(
mock_device:generate_test_message("main",
Expand Down
Loading