Skip to content

Commit 43e1617

Browse files
jamesharrowjamesharrow
committed
Renamed DEMBaseTest.py to TC_DEMTestBase.py so that it's grouped with the TC_DEM scripts.
Also split the expected result in the TestSteps() into 3rd 'expected' arg. Corrected some missing Verification steps.
1 parent f3d6018 commit 43e1617

File tree

3 files changed

+154
-83
lines changed

3 files changed

+154
-83
lines changed

‎src/python_testing/DEMTestBase.py ‎src/python_testing/TC_DEMTestBase.py

File renamed without changes.

‎src/python_testing/TC_DEM_2_2.py

+81-46
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
import chip.clusters as Clusters
2626
from chip.interaction_model import Status
27-
from DEMTestBase import DEMTestBase
27+
from TC_DEMTestBase import DEMTestBase
2828
from matter_testing_support import EventChangeCallback, MatterBaseTest, TestStep, async_test_body, default_matter_test_main
2929
from mobly import asserts
3030

@@ -48,51 +48,86 @@ def pics_TC_DEM_2_2(self):
4848
def steps_TC_DEM_2_2(self) -> list[TestStep]:
4949
"""Execute the test steps."""
5050
steps = [
51-
TestStep("1", "Commissioning, already done", is_commissioning=True),
52-
TestStep("2", "TH reads TestEventTriggersEnabled attribute from General Diagnostics Cluster. Verify that TestEventTriggersEnabled attribute has a value of 1 (True)"),
53-
TestStep("3", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for Power Adjustment Test Event"),
54-
TestStep("3a", "TH reads ESAState attribute. Verify value is 0x01 (Online)"),
55-
TestStep("3b", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=NoAdjustment. Note value for later. Determine the OverallMaxPower and OverallMaxDuration as the largest MaxPower and MaxDuration of the PowerAdjustStructs returned, and similarly the OverallMinPower and OverallMinDuration as the smallest of the MinPower and MinDuration values."),
56-
TestStep("3c", "TH reads OptOutState attribute. Verify value is 0x00 (NoOptOut)"),
57-
TestStep(
58-
"4", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization. Verify Command response is Success and Event DEM.S.E00(PowerAdjustStart) sent"),
59-
TestStep("4a", "TH reads ESAState attribute. Verify value is 0x04 (PowerAdjustActive)"),
60-
TestStep("4b", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=LocalOptimizationAdjustment."),
61-
TestStep("5", "TH sends CancelPowerAdjustRequest. Verify Command response is Success and Event DEM.S.E01(PowerAdjustEnd) sent with Cause=Cancelled"),
62-
TestStep("5a", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=NoAdjustment."),
63-
TestStep("5b", "TH reads ESAState attribute. Verify value is 0x01 (Online)"),
64-
TestStep("6", "TH sends CancelPowerAdjustRequest. Verify Command response is InvalidInStateError"),
65-
TestStep("7", "TH sends PowerAdjustRequest with Power=OverallMaxPower+1 Duration=OverallMinDuration Cause=LocalOptimization. Verify Command response is ConstraintError"),
66-
TestStep("8", "TH sends PowerAdjustRequest with Power=OverallMinPower Duration=OverallMaxDuration+1 Cause=LocalOptimization. Verify Command response is ConstraintError"),
67-
TestStep("9", "TH sends PowerAdjustRequest with Power=OverallMinPower-1 Duration=OverallMaxDuration Cause=LocalOptimization. Verify Command response is ConstraintError"),
68-
TestStep("10", "TH sends PowerAdjustRequest with Power=OverallMaxPower Duration=OverallMinDuration-1 Cause=LocalOptimization. Verify Command response is ConstraintError"),
69-
TestStep(
70-
"11", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization. Verify Command response is Success and event DEM.S.E00(PowerAdjustStart) sent"),
71-
TestStep("11a", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=LocalOptimizationAdjustment."),
72-
TestStep(
73-
"12", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=GridOptimization. Verify Command response is Success and no event sent"),
74-
TestStep("12a", "TH reads ESAState attribute. Verify value is 0x04 (PowerAdjustActive)"),
75-
TestStep("12b", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=GridOptimizationAdjustment."),
76-
TestStep("13", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for User Opt-out Local Optimization Test Event. No event sent"),
77-
TestStep("13a", "TH reads ESAState attribute. Verify value is 0x04 (PowerAdjustActive)"),
78-
TestStep("13b", "TH reads OptOutState attribute. Verify value is 0x02 (LocalOptOut)"),
79-
TestStep(
80-
"14", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization. Verify Command response is ConstraintError"),
81-
TestStep("15", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for User Opt-out Grid Optimization Test Event. Event DEM.S.E01(PowerAdjustEnd) sent with Cause=UserOptOut, Duration= approx time from step 11 to step 15, EnergyUse= a valid value"),
82-
TestStep("15a", "TH reads ESAState attribute. Verify value is 0x01 (Online)"),
83-
TestStep("15b", "TH reads OptOutState attribute. Verify value is 0x03 (OptOut)"),
84-
TestStep("15c", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=NoAdjustment."),
85-
TestStep("16", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for User Opt-out Test Event Clear"),
86-
TestStep("16a", "TH reads ESAState attribute. Verify value is 0x01 (Online)"),
87-
TestStep("16b", "TH reads OptOutState attribute. Verify value is 0x00 (NoOptOut)"),
88-
TestStep(
89-
"17", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization. Verify Command response is Success and event DEM.S.E00(PowerAdjustStart) sent"),
90-
TestStep("17a", "TH reads ESAState attribute. Verify value is 0x04 (PowerAdjustActive)"),
91-
TestStep("17b", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=LocalOptimizationAdjustment."),
92-
TestStep("18", "Wait 10 seconds. Event DEM.S.E01(PowerAdjustEnd) sent with Cause=NormalCompletion, Duration=10s, EnergyUse= a valid value"),
93-
TestStep("18a", "TH reads ESAState attribute. Verify value is 0x01 (Online)"),
94-
TestStep("18b", "TH reads PowerAdjustmentCapability attribute. Value has to include Cause=NoAdjustment."),
95-
TestStep("19", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for Power Adjustment Test Event Clear"),
51+
TestStep("1", "Commissioning, already done",
52+
is_commissioning=True),
53+
TestStep("2", "TH reads TestEventTriggersEnabled attribute from General Diagnostics Cluster.",
54+
"Verify that TestEventTriggersEnabled attribute has a value of 1 (True)"),
55+
TestStep("3", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for Power Adjustment Test Event",
56+
"Verify DUT responds with status SUCCESS(0x00)"),
57+
TestStep("3a", "TH reads ESAState attribute.",
58+
"Verify value is 0x01 (Online)"),
59+
TestStep("3b", "TH reads PowerAdjustmentCapability attribute.",
60+
"Value has to include Cause=NoAdjustment. Note value for later. Determine the OverallMaxPower and OverallMaxDuration as the largest MaxPower and MaxDuration of the PowerAdjustStructs returned, and similarly the OverallMinPower and OverallMinDuration as the smallest of the MinPower and MinDuration values."),
61+
TestStep("3c", "TH reads OptOutState attribute.",
62+
"Verify value is 0x00 (NoOptOut)"),
63+
TestStep("4", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization.",
64+
"Verify DUT responds with status SUCCESS(0x00) and Event DEM.S.E00(PowerAdjustStart) sent"),
65+
TestStep("4a", "TH reads ESAState attribute.",
66+
"Verify value is 0x04 (PowerAdjustActive)"),
67+
TestStep("4b", "TH reads PowerAdjustmentCapability attribute.",
68+
"Value has to include Cause=LocalOptimizationAdjustment."),
69+
TestStep("5", "TH sends CancelPowerAdjustRequest.",
70+
"Verify DUT responds with status SUCCESS(0x00) and Event DEM.S.E01(PowerAdjustEnd) sent with Cause=Cancelled"),
71+
TestStep("5a", "TH reads PowerAdjustmentCapability attribute.",
72+
"Value has to include Cause=NoAdjustment."),
73+
TestStep("5b", "TH reads ESAState attribute.",
74+
"Verify value is 0x01 (Online)"),
75+
TestStep("6", "TH sends CancelPowerAdjustRequest.",
76+
"Verify DUT responds with status INVALID_IN_STATE(0xcb)"),
77+
TestStep("7", "TH sends PowerAdjustRequest with Power=OverallMaxPower+1 Duration=OverallMinDuration Cause=LocalOptimization.",
78+
"Verify DUT responds with status CONSTRAINT_ERROR(0x87)"),
79+
TestStep("8", "TH sends PowerAdjustRequest with Power=OverallMinPower Duration=OverallMaxDuration+1 Cause=LocalOptimization.",
80+
"Verify DUT responds with status CONSTRAINT_ERROR(0x87)"),
81+
TestStep("9", "TH sends PowerAdjustRequest with Power=OverallMinPower-1 Duration=OverallMaxDuration Cause=LocalOptimization.",
82+
"Verify DUT responds with status CONSTRAINT_ERROR(0x87)"),
83+
TestStep("10", "TH sends PowerAdjustRequest with Power=OverallMaxPower Duration=OverallMinDuration-1 Cause=LocalOptimization.",
84+
"Verify DUT responds with status CONSTRAINT_ERROR(0x87)"),
85+
TestStep("11", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization.",
86+
"Verify DUT responds with status SUCCESS(0x00) and event DEM.S.E00(PowerAdjustStart) sent"),
87+
TestStep("11a", "TH reads PowerAdjustmentCapability attribute.",
88+
"Value has to include Cause=LocalOptimizationAdjustment."),
89+
TestStep("12", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=GridOptimization.",
90+
"Verify DUT responds with status SUCCESS(0x00) and no event sent"),
91+
TestStep("12a", "TH reads ESAState attribute.",
92+
"Verify value is 0x04 (PowerAdjustActive)"),
93+
TestStep("12b", "TH reads PowerAdjustmentCapability attribute.",
94+
"Value has to include Cause=GridOptimizationAdjustment."),
95+
TestStep("13", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for User Opt-out Local Optimization Test Event.",
96+
"Verify DUT responds with status SUCCESS(0x00) and no event sent"),
97+
TestStep("13a", "TH reads ESAState attribute.",
98+
"Verify value is 0x04 (PowerAdjustActive)"),
99+
TestStep("13b", "TH reads OptOutState attribute.",
100+
"Verify value is 0x02 (LocalOptOut)"),
101+
TestStep("14", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization.",
102+
"Verify DUT responds with status CONSTRAINT_ERROR(0x87)"),
103+
TestStep("15", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for User Opt-out Grid Optimization Test Event.",
104+
"Verify DUT responds with status SUCCESS(0x00) and event DEM.S.E01(PowerAdjustEnd) sent with Cause=UserOptOut, Duration= approx time from step 11 to step 15, EnergyUse= a valid value"),
105+
TestStep("15a", "TH reads ESAState attribute.",
106+
"Verify value is 0x01 (Online)"),
107+
TestStep("15b", "TH reads OptOutState attribute.",
108+
"Verify value is 0x03 (OptOut)"),
109+
TestStep("15c", "TH reads PowerAdjustmentCapability attribute.",
110+
"Value has to include Cause=NoAdjustment."),
111+
TestStep("16", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for User Opt-out Test Event Clear",
112+
"Verify DUT responds with status SUCCESS(0x00)"),
113+
TestStep("16a", "TH reads ESAState attribute.",
114+
"Verify value is 0x01 (Online)"),
115+
TestStep("16b", "TH reads OptOutState attribute.",
116+
"Verify value is 0x00 (NoOptOut)"),
117+
TestStep("17", "TH sends PowerAdjustRequest with Power=PowerAdjustmentCapability[0].MaxPower, Duration=PowerAdjustmentCapability[0].MinDuration, Cause=LocalOptimization.",
118+
"Verify DUT responds with status SUCCESS(0x00) and event DEM.S.E00(PowerAdjustStart) sent"),
119+
TestStep("17a", "TH reads ESAState attribute.",
120+
"Verify value is 0x04 (PowerAdjustActive)"),
121+
TestStep("17b", "TH reads PowerAdjustmentCapability attribute.",
122+
"Value has to include Cause=LocalOptimizationAdjustment."),
123+
TestStep("18", "Wait 10 seconds.",
124+
"Event DEM.S.E01(PowerAdjustEnd) sent with Cause=NormalCompletion, Duration=10s, EnergyUse= a valid value"),
125+
TestStep("18a", "TH reads ESAState attribute.",
126+
"Verify value is 0x01 (Online)"),
127+
TestStep("18b", "TH reads PowerAdjustmentCapability attribute.",
128+
"Value has to include Cause=NoAdjustment."),
129+
TestStep("19", "TH sends TestEventTrigger command to General Diagnostics Cluster on Endpoint 0 with EnableKey field set to PIXIT.DEM.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to PIXIT.DEM.TEST_EVENT_TRIGGER for Power Adjustment Test Event Clear",
130+
"Verify DUT responds with status SUCCESS(0x00)"),
96131
]
97132

98133
return steps

0 commit comments

Comments
 (0)