diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py index c6c84740a9c868..d039e80f96519d 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/parser.py +++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py @@ -482,6 +482,16 @@ def __init__(self, test: _TestStepWithPlaceholders, step_index: int, runtime_con self._test.run_if) self._test.event_number = self._config_variable_substitution( self._test.event_number) + self._test.cluster = self._config_variable_substitution( + self._test.cluster) + self._test.command = self._config_variable_substitution( + self._test.command) + self._test.attribute = self._config_variable_substitution( + self._test.attribute) + self._test.event = self._config_variable_substitution( + self._test.event) + self._test.endpoint = self._config_variable_substitution( + self._test.endpoint) test.update_arguments(self.arguments) test.update_responses(self.responses) diff --git a/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py b/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py index 8664428197a41c..33fd8b9dbbdab3 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py +++ b/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py @@ -90,7 +90,7 @@ def __check_test_step(self, content): 'nodeId': int, 'runIf': str, # Should be a variable. 'groupId': int, - 'endpoint': int, + 'endpoint': (int, str), # Can be a variable 'cluster': str, 'attribute': str, 'command': str, diff --git a/scripts/py_matter_yamltests/test_yaml_loader.py b/scripts/py_matter_yamltests/test_yaml_loader.py index 1e748e317a3082..067dc831627907 100644 --- a/scripts/py_matter_yamltests/test_yaml_loader.py +++ b/scripts/py_matter_yamltests/test_yaml_loader.py @@ -249,7 +249,6 @@ def test_key_tests_step_int_keys(self): keys = [ 'nodeId', 'groupId', - 'endpoint', 'minInterval', 'maxInterval', 'timedInteractionTimeoutMs', @@ -307,6 +306,23 @@ def test_key_tests_step_response_key(self): x = content.format(value=value) self.assertRaises(TestStepInvalidTypeError, load, x) + def test_key_tests_step_endpoint_number_key(self): + load = YamlLoader().load + + content = ('tests:\n' + ' - endpoint: {value}') + + _, _, _, _, tests = load(content.format(value=1)) + self.assertEqual(tests, [{'endpoint': 1}]) + + _, _, _, _, tests = load(content.format(value='TestKey')) + self.assertEqual(tests, [{'endpoint': 'TestKey'}]) + + wrong_values = self._get_wrong_values([str, int], spaces=6) + for value in wrong_values: + x = content.format(value=value) + self.assertRaises(TestStepInvalidTypeError, load, x) + def test_key_tests_step_event_number_key(self): load = YamlLoader().load diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml index 6507dc3af97304..8a5f74d70700bd 100644 --- a/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGETH_2_2.yaml @@ -136,35 +136,35 @@ tests: command: "readAttribute" attribute: "PacketRxCount" response: - saveAs: PacketRxCount + saveAs: PacketRxCountValue - label: "TH reads PacketTxCount attribute value from DUT" PICS: DGETH.S.A0003 command: "readAttribute" attribute: "PacketTxCount" response: - saveAs: PacketTxCount + saveAs: PacketTxCountValue - label: "TH reads TxErrCount attribute value from DUT" PICS: DGETH.S.A0004 command: "readAttribute" attribute: "TxErrCount" response: - saveAs: TxErrCount + saveAs: TxErrCountValue - label: "TH reads CollisionCount attribute value from DUT" PICS: DGETH.S.A0005 command: "readAttribute" attribute: "CollisionCount" response: - saveAs: CollisionCount + saveAs: CollisionCountValue - label: "TH reads OverrunCount attribute value from DUT" PICS: DGETH.S.A0006 command: "readAttribute" attribute: "OverrunCount" response: - saveAs: OverrunCount + saveAs: OverrunCountValue #issue #13648 - label: "Sends ResetCounts command" @@ -215,7 +215,7 @@ tests: attribute: "TxErrCount" response: constraints: - maxValue: TxErrCount + maxValue: TxErrCountValue - label: "TH reads CollisionCount attribute value from DUT" PICS: DGETH.S.A0005 @@ -223,7 +223,7 @@ tests: attribute: "CollisionCount" response: constraints: - maxValue: CollisionCount + maxValue: CollisionCountValue - label: "TH reads OverrunCount attribute value from DUT" PICS: DGETH.S.A0006 @@ -231,4 +231,4 @@ tests: attribute: "OverrunCount" response: constraints: - maxValue: OverrunCount + maxValue: OverrunCountValue diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml index 58da8b42f3f8af..e5055578e1a590 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml @@ -47,7 +47,7 @@ tests: command: "readAttribute" attribute: "MinSetpointDeadBand" response: - saveAs: MinSetpointDeadBand + saveAs: MinSetpointDeadBandValue - label: "Saving value for comparision in step 6 read AbsMaxCoolSetpointLimit @@ -65,7 +65,7 @@ tests: command: "readAttribute" attribute: "MinCoolSetpointLimit" response: - saveAs: MinCoolSetpointLimit + saveAs: MinCoolSetpointLimitValue - label: "Saving value for comparision in step 17 read MaxCoolSetpointLimit @@ -74,7 +74,7 @@ tests: command: "readAttribute" attribute: "MaxCoolSetpointLimit" response: - saveAs: MaxCoolSetpointLimit + saveAs: MaxCoolSetpointLimitValue - label: "Saving value for comparision in step 17 read MaxHeatSetpointLimit" PICS: TSTAT.S.A0016 @@ -90,7 +90,7 @@ tests: command: "readAttribute" attribute: "OccupiedCoolingSetpoint" response: - saveAs: OccupiedCoolingSetpoint + saveAs: OccupiedCoolingSetpointValue - label: "Saving value for comparision in step 15 read attribute @@ -99,7 +99,7 @@ tests: command: "readAttribute" attribute: "AbsMinHeatSetpointLimit" response: - saveAs: AbsMinHeat + saveAs: AbsMinHeatValue - label: "Saving value for comparision in step 15 read attribute @@ -108,7 +108,7 @@ tests: command: "readAttribute" attribute: "AbsMaxHeatSetpointLimit" response: - saveAs: AbsMaxHeat + saveAs: AbsMaxHeatValue - label: "Saving value for comparision in step 16 read @@ -117,7 +117,7 @@ tests: command: "readAttribute" attribute: "UnoccupiedCoolingSetpoint" response: - saveAs: UnoccupiedCoolingSetpoint + saveAs: UnoccupiedCoolingSetpointValue - label: "Reads mandatory attributes from DUT: LocalTemperature" command: "readAttribute" @@ -157,7 +157,7 @@ tests: response: constraints: type: int16s - maxValue: AbsMinCoolSetpointLimitStep5 - MinSetpointDeadBand + maxValue: AbsMinCoolSetpointLimitStep5 - MinSetpointDeadBandValue - label: "Read attribute AbsMinHeatSetpointLimit if TSTAT.S.F05 feature is @@ -257,8 +257,8 @@ tests: response: constraints: type: int16s - minValue: MinCoolSetpointLimit - maxValue: MaxCoolSetpointLimit + minValue: MinCoolSetpointLimitValue + maxValue: MaxCoolSetpointLimitValue - label: "Read attribute OccupiedCoolingSetpoint from the DUT" PICS: TSTAT.S.F01 && !TSTAT.S.A0017 && !TSTAT.S.A0018 @@ -280,7 +280,7 @@ tests: constraints: type: int16s minValue: AbsMinCoolSetpointLimitStep5 - maxValue: OccupiedCoolingSetpoint - MinSetpointDeadBand + maxValue: OccupiedCoolingSetpointValue - MinSetpointDeadBandValue - label: "Read attribute OccupiedHeatingSetpoint from the DUT" PICS: TSTAT.S.F00 && !TSTAT.S.F05 @@ -299,8 +299,8 @@ tests: response: constraints: type: int16s - minValue: AbsMinHeat - maxValue: AbsMaxHeat + minValue: AbsMinHeatValue + maxValue: AbsMaxHeatValue - label: "Read UnoccupiedCoolingSetpoint attribute from the DUT" PICS: TSTAT.S.F01 && TSTAT.S.F02 && !TSTAT.S.F05 @@ -320,7 +320,8 @@ tests: constraints: type: int16s minValue: 700 - maxValue: UnoccupiedCoolingSetpoint - MinSetpointDeadBand + maxValue: + UnoccupiedCoolingSetpointValue - MinSetpointDeadBandValue - label: "Read UnoccupiedHeatingSetpoint attribute from the DUT" PICS: TSTAT.S.F00 && TSTAT.S.F02 && !TSTAT.S.F05 @@ -340,7 +341,7 @@ tests: constraints: type: int16s minValue: 700 - maxValue: MinCoolSetpointLimit - MinSetpointDeadBand + maxValue: MinCoolSetpointLimitValue - MinSetpointDeadBandValue - label: "Reads MinHeatSetpointLimit attribute from Server DUT and verifies @@ -385,7 +386,7 @@ tests: constraints: type: int16s minValue: 700 - maxValue: MaxCoolSetpointLimit - MinSetpointDeadBand + maxValue: MaxCoolSetpointLimitValue - MinSetpointDeadBandValue - label: "Read attribute MinCoolSetpointLimit from DUT" PICS: TSTAT.S.A0017 && TSTAT.S.A0018 && TSTAT.S.A0005 @@ -395,7 +396,7 @@ tests: constraints: type: int16s minValue: AbsMinCoolSetpointLimitStep5 - maxValue: MaxCoolSetpointLimit + maxValue: MaxCoolSetpointLimitValue - label: "Read attribute MinCoolSetpointLimit from DUT" PICS: TSTAT.S.A0017 && !TSTAT.S.A0018 && !TSTAT.S.A0005 @@ -414,7 +415,7 @@ tests: response: constraints: type: int16s - minValue: MinCoolSetpointLimit + minValue: MinCoolSetpointLimitValue maxValue: AbsMaxCoolSetpointLimitStep6 - label: "Read attribute MinSetpointDeadBand from DUT" diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml index c3df4a41e8221f..3f486c510e7463 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml @@ -36,14 +36,14 @@ tests: command: "readAttribute" attribute: "MinCoolSetpointLimit" response: - saveAs: MinCoolSetpointLimit + saveAs: MinCoolSetpointLimitValue - label: "Saving value for comparision in step 2a read MaxCoolSetpointLimit" PICS: TSTAT.S.A0018 command: "readAttribute" attribute: "MaxCoolSetpointLimit" response: - saveAs: MaxCoolSetpointLimit + saveAs: MaxCoolSetpointLimitValue - label: "Saving value for comparision in step 2c read attribute @@ -52,14 +52,14 @@ tests: command: "readAttribute" attribute: "MinSetpointDeadBand" response: - saveAs: MinSetpointDeadBand + saveAs: MinSetpointDeadBandValue - label: "Saving value for comparision in step 3a read MinHeatSetpointLimit" PICS: TSTAT.S.A0015 command: "readAttribute" attribute: "MinHeatSetpointLimit" response: - saveAs: MinHeatSetpointLimit + saveAs: MinHeatSetpointLimitValue - label: "Saving value for comparision in step 3 reads @@ -68,14 +68,14 @@ tests: attribute: "UnoccupiedCoolingSetpoint" PICS: TSTAT.S.A0013 response: - saveAs: UnoccupiedCoolingSetpoint + saveAs: UnoccupiedCoolingSetpointValue - label: "Saving value for comparision in step 3a read MaxHeatSetpointLimit" PICS: TSTAT.S.A0016 command: "readAttribute" attribute: "MaxHeatSetpointLimit" response: - saveAs: MaxHeatSetpointLimit + saveAs: MaxHeatSetpointLimitValue - label: "Saving value for comparision in step3c read attribute @@ -84,7 +84,7 @@ tests: command: "readAttribute" attribute: "OccupiedHeatingSetpoint" response: - saveAs: OccupiedHeatingSetpoint + saveAs: OccupiedHeatingSetpointValue - label: "Saving value for comparision in step3c read attribute @@ -93,7 +93,7 @@ tests: command: "readAttribute" attribute: "OccupiedCoolingSetpoint" response: - saveAs: OccupiedCoolingSetpoint + saveAs: OccupiedCoolingSetpointValue - label: "Saving value for comparision in step 6a read attribute @@ -120,7 +120,7 @@ tests: attribute: "AbsMinCoolSetpointLimit" PICS: TSTAT.S.A0005 response: - saveAs: AbsMinCoolSetpointLimit + saveAs: AbsMinCoolSetpointLimitValue - label: "Saving value for comparision in step9a read attribute @@ -129,7 +129,7 @@ tests: attribute: "AbsMaxCoolSetpointLimit" PICS: TSTAT.S.A0006 response: - saveAs: AbsMaxCoolSetpointLimit + saveAs: AbsMaxCoolSetpointLimitValue #Using saved values when optional attributes are available - label: "Read attribute OccupiedCoolingSetpoint from the DUT" @@ -139,8 +139,8 @@ tests: response: constraints: type: int16s - minValue: MinCoolSetpointLimit - maxValue: MaxCoolSetpointLimit + minValue: MinCoolSetpointLimitValue + maxValue: MaxCoolSetpointLimitValue #Using hard coded values when optional attributes are not available - label: @@ -194,7 +194,7 @@ tests: #2 Test Harness Client attempts to write OccupiedCoolingSetpoint below the MinCoolSetpointLimit and confirms that the device does not accept the value. ./chip-tool thermostat write occupied-cooling-setpoint 1000 1 1 - On TH(chip-tool) verify that DUT sends a CONSTRAINT_ERROR (0x87) for the value which is below of the MinCoolSetpointLimit + On TH(chip-tool) verify that DUT sends a CONSTRAINT_ERROR (0x87) for the value which is below of the MinCoolSetpointLimitValue [1676028984.901635][19375:19377] CHIP:DMG: WriteClient moving to [AwaitingDe] [1676028984.901706][19375:19377] CHIP:TOO: Response Failure: IM Error 0x00000587: General error: 0x87 (CONSTRAINT_ERROR) @@ -227,7 +227,7 @@ tests: attribute: "OccupiedCoolingSetpoint" PICS: TSTAT.S.F01 && TSTAT.S.A0017 arguments: - value: MaxCoolSetpointLimit + 1000 + value: MaxCoolSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -247,7 +247,7 @@ tests: attribute: "OccupiedCoolingSetpoint" PICS: TSTAT.S.F01 && TSTAT.S.A0017 arguments: - value: MaxCoolSetpointLimit + value: MaxCoolSetpointLimitValue - label: "Writes the limit of MinCoolSetpointLimit to OccupiedCoolingSetpoint @@ -265,7 +265,7 @@ tests: attribute: "OccupiedCoolingSetpoint" PICS: TSTAT.S.F01 && !TSTAT.S.F05 && TSTAT.S.A0017 arguments: - value: MinCoolSetpointLimit + value: MinCoolSetpointLimitValue #LowerLimit = Max(MinCoolSetpointLimit,(OccupiedHeatingSetpoint + MinSetpointDeadBand)) not possible in YAML - label: @@ -302,8 +302,8 @@ tests: response: constraints: type: int16s - minValue: MinHeatSetpointLimit - maxValue: MaxHeatSetpointLimit + minValue: MinHeatSetpointLimitValue + maxValue: MaxHeatSetpointLimitValue #Using hard coded values when optional attributes are not available - label: @@ -389,7 +389,7 @@ tests: attribute: "OccupiedHeatingSetpoint" PICS: TSTAT.S.F00 && TSTAT.S.A0016 arguments: - value: MaxHeatSetpointLimit + 1000 + value: MaxHeatSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -409,7 +409,7 @@ tests: attribute: "OccupiedHeatingSetpoint" PICS: TSTAT.S.F00 && !TSTAT.S.F05 && TSTAT.S.A0016 arguments: - value: MaxHeatSetpointLimit + value: MaxHeatSetpointLimitValue - label: "Writes the limit of MaxHeatSetpointLimit to OccupiedHeatingSetpoint @@ -476,7 +476,7 @@ tests: attribute: "OccupiedHeatingSetpoint" PICS: TSTAT.S.F00 && TSTAT.S.A0015 arguments: - value: MinHeatSetpointLimit + value: MinHeatSetpointLimitValue - label: "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and @@ -487,8 +487,8 @@ tests: response: constraints: type: int16s - minValue: MinCoolSetpointLimit - maxValue: MaxCoolSetpointLimit + minValue: MinCoolSetpointLimitValue + maxValue: MaxCoolSetpointLimitValue - label: "Reads UnoccupiedCoolingSetpoint attribute from Server DUT and @@ -573,7 +573,7 @@ tests: attribute: "UnoccupiedCoolingSetpoint" PICS: TSTAT.S.F02 && TSTAT.S.F01 && TSTAT.S.A0018 arguments: - value: MaxCoolSetpointLimit + 1000 + value: MaxCoolSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -593,7 +593,7 @@ tests: attribute: "UnoccupiedCoolingSetpoint" PICS: TSTAT.S.F02 && TSTAT.S.F01 && TSTAT.S.A0018 && !TSTAT.S.F05 arguments: - value: MaxCoolSetpointLimit + value: MaxCoolSetpointLimitValue #LowerLimit = Max(MinCoolSetpointLimit,(UnoccupiedCoolingSetpoint + MinSetpointDeadBand)) not possible in YAML - label: @@ -651,7 +651,7 @@ tests: attribute: "UnoccupiedCoolingSetpoint" PICS: TSTAT.S.F02 && TSTAT.S.F01 && TSTAT.S.A0017 && !TSTAT.S.F05 arguments: - value: MinCoolSetpointLimit + value: MinCoolSetpointLimitValue #Using saved values when optional attributes are available - label: @@ -663,8 +663,8 @@ tests: response: constraints: type: int16s - minValue: MinHeatSetpointLimit - maxValue: MaxHeatSetpointLimit + minValue: MinHeatSetpointLimitValue + maxValue: MaxHeatSetpointLimitValue #Using hardcoded values when optional attributes are not available - label: @@ -752,7 +752,7 @@ tests: attribute: "UnoccupiedHeatingSetpoint" PICS: TSTAT.S.F02 && TSTAT.S.F00 && TSTAT.S.A0016 arguments: - value: MaxHeatSetpointLimit + 1000 + value: MaxHeatSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -772,7 +772,7 @@ tests: attribute: "UnoccupiedHeatingSetpoint" PICS: TSTAT.S.F02 && TSTAT.S.F00 && TSTAT.S.A0016 && !TSTAT.S.F05 arguments: - value: MaxHeatSetpointLimit + value: MaxHeatSetpointLimitValue - label: "Writes the limit of MaxHeatSetpointLimit to UnoccupiedHeatingSetpoint @@ -832,7 +832,7 @@ tests: attribute: "UnoccupiedHeatingSetpoint" PICS: TSTAT.S.F02 && TSTAT.S.F00 && TSTAT.S.A0015 arguments: - value: MinHeatSetpointLimit + value: MinHeatSetpointLimitValue #Using saved values when optional attributes are available - label: @@ -845,7 +845,7 @@ tests: constraints: type: int16s minValue: AbsMinHeatSetpointLimitValue - maxValue: MaxHeatSetpointLimit + maxValue: MaxHeatSetpointLimitValue #Using hard coded values when optional attributes are not available - label: @@ -940,7 +940,7 @@ tests: attribute: "MinHeatSetpointLimit" PICS: TSTAT.S.F00 && TSTAT.S.A0015 && TSTAT.S.A0016 arguments: - value: MaxHeatSetpointLimit + 1000 + value: MaxHeatSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -960,7 +960,7 @@ tests: attribute: "MinHeatSetpointLimit" PICS: TSTAT.S.F00 && TSTAT.S.A0015 && !TSTAT.S.F05 && TSTAT.S.A0016 arguments: - value: MaxHeatSetpointLimit + value: MaxHeatSetpointLimitValue #UpperLimit = Min(MaxHeatSetpointLimit,(MinCoolSetpointLimit - MinSetpointDeadBand)) not possible in YAML - label: @@ -1024,7 +1024,7 @@ tests: response: constraints: type: int16s - minValue: MinHeatSetpointLimit + minValue: MinHeatSetpointLimitValue maxValue: AbsMaxHeatSetpointLimitValue #Using hard coded values when optional attributes are not available @@ -1207,7 +1207,7 @@ tests: attribute: "MaxHeatSetpointLimit" PICS: TSTAT.S.F00 && TSTAT.S.A0016 && TSTAT.S.A0015 arguments: - value: MinHeatSetpointLimit + value: MinHeatSetpointLimitValue #Using saved values when optional attributes are available - label: @@ -1219,8 +1219,8 @@ tests: response: constraints: type: int16s - minValue: AbsMinCoolSetpointLimit - maxValue: MaxCoolSetpointLimit + minValue: AbsMinCoolSetpointLimitValue + maxValue: MaxCoolSetpointLimitValue #Using hard coded values when optional attributes are not available - label: @@ -1306,7 +1306,7 @@ tests: attribute: "MinCoolSetpointLimit" PICS: TSTAT.S.F01 && TSTAT.S.A0017 && TSTAT.S.A0018 arguments: - value: MaxCoolSetpointLimit + 1000 + value: MaxCoolSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -1326,7 +1326,7 @@ tests: attribute: "MinCoolSetpointLimit" PICS: TSTAT.S.F01 && TSTAT.S.A0017 && TSTAT.S.A0018 arguments: - value: MaxCoolSetpointLimit + value: MaxCoolSetpointLimitValue - label: "Writes the limit of AbsMinCoolSetpointLimit to MinCoolSetpointLimit @@ -1344,7 +1344,7 @@ tests: attribute: "MinCoolSetpointLimit" PICS: TSTAT.S.F01 && TSTAT.S.A0017 && TSTAT.S.A0005 && !TSTAT.S.F05 arguments: - value: AbsMinCoolSetpointLimit + value: AbsMinCoolSetpointLimitValue #LowerLimit = Max(AbsMinCoolSetpointLimit,(MinHeatSetpointLimit + MinSetpointDeadBand)) not possible in YAML - label: @@ -1389,8 +1389,8 @@ tests: response: constraints: type: int16s - minValue: MinCoolSetpointLimit - maxValue: AbsMaxCoolSetpointLimit + minValue: MinCoolSetpointLimitValue + maxValue: AbsMaxCoolSetpointLimitValue #Using hard coded values when optional attributes are not available - label: @@ -1477,7 +1477,7 @@ tests: attribute: "MaxCoolSetpointLimit" PICS: TSTAT.S.F01 && TSTAT.S.A0018 && TSTAT.S.A0006 arguments: - value: AbsMaxCoolSetpointLimit + 1000 + value: AbsMaxCoolSetpointLimitValue + 1000 response: error: CONSTRAINT_ERROR @@ -1497,7 +1497,7 @@ tests: attribute: "MaxCoolSetpointLimit" PICS: TSTAT.S.F01 && TSTAT.S.A0018 && TSTAT.S.A0006 arguments: - value: AbsMaxCoolSetpointLimit + value: AbsMaxCoolSetpointLimitValue - label: "Writes the limit of MinCoolSetpointLimit to MaxCoolSetpointLimit @@ -1526,7 +1526,7 @@ tests: attribute: "MaxCoolSetpointLimit" PICS: TSTAT.S.F01 && TSTAT.S.A0018 && TSTAT.S.A0017 && !TSTAT.S.F05 arguments: - value: MinCoolSetpointLimit + value: MinCoolSetpointLimitValue #LowerLimit = Max(MinCoolSetpointLimit,(MaxHeatSetpointLimit + MinSetpointDeadBand)) not possible in YAML - label: diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 688b47fe0e9a2d..10ce329045e1cb 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -25953,11 +25953,11 @@ class Test_TC_DGETH_2_2Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; - uint64_t PacketRxCount; - uint64_t PacketTxCount; - uint64_t TxErrCount; - uint64_t CollisionCount; - uint64_t OverrunCount; + uint64_t PacketRxCountValue; + uint64_t PacketTxCountValue; + uint64_t TxErrCountValue; + uint64_t CollisionCountValue; + uint64_t OverrunCountValue; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -26080,7 +26080,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - PacketRxCount = value; + PacketRxCountValue = value; } break; case 12: @@ -26088,7 +26088,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - PacketTxCount = value; + PacketTxCountValue = value; } break; case 13: @@ -26096,7 +26096,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - TxErrCount = value; + TxErrCountValue = value; } break; case 14: @@ -26104,7 +26104,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - CollisionCount = value; + CollisionCountValue = value; } break; case 15: @@ -26112,7 +26112,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - OverrunCount = value; + OverrunCountValue = value; } break; case 16: @@ -26131,7 +26131,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxValue("value", value, TxErrCount)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, TxErrCountValue)); } break; case 20: @@ -26139,7 +26139,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxValue("value", value, CollisionCount)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, CollisionCountValue)); } break; case 21: @@ -26147,7 +26147,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxValue("value", value, OverrunCount)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, OverrunCountValue)); } break; default: @@ -48247,15 +48247,15 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand chip::Optional mTimeout; int16_t AbsMinCoolSetpointLimitStep5; - int8_t MinSetpointDeadBand; + int8_t MinSetpointDeadBandValue; int16_t AbsMaxCoolSetpointLimitStep6; - int16_t MinCoolSetpointLimit; - int16_t MaxCoolSetpointLimit; + int16_t MinCoolSetpointLimitValue; + int16_t MaxCoolSetpointLimitValue; int16_t MaxHeatSetpointLimit; - int16_t OccupiedCoolingSetpoint; - int16_t AbsMinHeat; - int16_t AbsMaxHeat; - int16_t UnoccupiedCoolingSetpoint; + int16_t OccupiedCoolingSetpointValue; + int16_t AbsMinHeatValue; + int16_t AbsMaxHeatValue; + int16_t UnoccupiedCoolingSetpointValue; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -48286,7 +48286,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MinSetpointDeadBand = value; + MinSetpointDeadBandValue = value; } break; case 3: @@ -48302,7 +48302,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MinCoolSetpointLimit = value; + MinCoolSetpointLimitValue = value; } break; case 5: @@ -48310,7 +48310,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MaxCoolSetpointLimit = value; + MaxCoolSetpointLimitValue = value; } break; case 6: @@ -48326,7 +48326,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - OccupiedCoolingSetpoint = value; + OccupiedCoolingSetpointValue = value; } break; case 8: @@ -48334,7 +48334,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - AbsMinHeat = value; + AbsMinHeatValue = value; } break; case 9: @@ -48342,7 +48342,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - AbsMaxHeat = value; + AbsMaxHeatValue = value; } break; case 10: @@ -48350,7 +48350,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - UnoccupiedCoolingSetpoint = value; + UnoccupiedCoolingSetpointValue = value; } break; case 11: @@ -48389,7 +48389,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMinCoolSetpointLimitStep5 - MinSetpointDeadBand)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMinCoolSetpointLimitStep5 - MinSetpointDeadBandValue)); } break; case 15: @@ -48487,8 +48487,8 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimitValue)); } break; case 25: @@ -48508,7 +48508,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinCoolSetpointLimitStep5)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, OccupiedCoolingSetpoint - MinSetpointDeadBand)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, OccupiedCoolingSetpointValue - MinSetpointDeadBandValue)); } break; case 27: @@ -48527,8 +48527,8 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinHeat)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMaxHeat)); + VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinHeatValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMaxHeatValue)); } break; case 29: @@ -48548,7 +48548,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, UnoccupiedCoolingSetpoint - MinSetpointDeadBand)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, UnoccupiedCoolingSetpointValue - MinSetpointDeadBandValue)); } break; case 31: @@ -48568,7 +48568,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MinCoolSetpointLimit - MinSetpointDeadBand)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MinCoolSetpointLimitValue - MinSetpointDeadBandValue)); } break; case 33: @@ -48608,7 +48608,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimit - MinSetpointDeadBand)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimitValue - MinSetpointDeadBandValue)); } break; case 37: @@ -48618,7 +48618,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinCoolSetpointLimitStep5)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimitValue)); } break; case 38: @@ -48637,7 +48637,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimitValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMaxCoolSetpointLimitStep6)); } break; @@ -49412,18 +49412,18 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; - int16_t MinCoolSetpointLimit; - int16_t MaxCoolSetpointLimit; - int8_t MinSetpointDeadBand; - int16_t MinHeatSetpointLimit; - int16_t UnoccupiedCoolingSetpoint; - int16_t MaxHeatSetpointLimit; - int16_t OccupiedHeatingSetpoint; - int16_t OccupiedCoolingSetpoint; + int16_t MinCoolSetpointLimitValue; + int16_t MaxCoolSetpointLimitValue; + int8_t MinSetpointDeadBandValue; + int16_t MinHeatSetpointLimitValue; + int16_t UnoccupiedCoolingSetpointValue; + int16_t MaxHeatSetpointLimitValue; + int16_t OccupiedHeatingSetpointValue; + int16_t OccupiedCoolingSetpointValue; int16_t AbsMinHeatSetpointLimitValue; int16_t AbsMaxHeatSetpointLimitValue; - int16_t AbsMinCoolSetpointLimit; - int16_t AbsMaxCoolSetpointLimit; + int16_t AbsMinCoolSetpointLimitValue; + int16_t AbsMaxCoolSetpointLimitValue; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -49446,7 +49446,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MinCoolSetpointLimit = value; + MinCoolSetpointLimitValue = value; } break; case 2: @@ -49454,7 +49454,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MaxCoolSetpointLimit = value; + MaxCoolSetpointLimitValue = value; } break; case 3: @@ -49462,7 +49462,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MinSetpointDeadBand = value; + MinSetpointDeadBandValue = value; } break; case 4: @@ -49470,7 +49470,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MinHeatSetpointLimit = value; + MinHeatSetpointLimitValue = value; } break; case 5: @@ -49478,7 +49478,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - UnoccupiedCoolingSetpoint = value; + UnoccupiedCoolingSetpointValue = value; } break; case 6: @@ -49486,7 +49486,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - MaxHeatSetpointLimit = value; + MaxHeatSetpointLimitValue = value; } break; case 7: @@ -49494,7 +49494,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - OccupiedHeatingSetpoint = value; + OccupiedHeatingSetpointValue = value; } break; case 8: @@ -49502,7 +49502,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - OccupiedCoolingSetpoint = value; + OccupiedCoolingSetpointValue = value; } break; case 9: @@ -49526,7 +49526,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - AbsMinCoolSetpointLimit = value; + AbsMinCoolSetpointLimitValue = value; } break; case 12: @@ -49534,7 +49534,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - AbsMaxCoolSetpointLimit = value; + AbsMaxCoolSetpointLimitValue = value; } break; case 13: @@ -49543,8 +49543,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimitValue)); } break; case 14: @@ -49603,8 +49603,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinHeatSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxHeatSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinHeatSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxHeatSetpointLimitValue)); } break; case 27: @@ -49666,8 +49666,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimitValue)); } break; case 41: @@ -49729,8 +49729,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinHeatSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxHeatSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinHeatSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxHeatSetpointLimitValue)); } break; case 55: @@ -49793,7 +49793,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinHeatSetpointLimitValue)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxHeatSetpointLimit)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxHeatSetpointLimitValue)); } break; case 69: @@ -49855,7 +49855,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinHeatSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinHeatSetpointLimitValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMaxHeatSetpointLimitValue)); } break; @@ -49921,8 +49921,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinCoolSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, AbsMinCoolSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxCoolSetpointLimitValue)); } break; case 98: @@ -49981,8 +49981,8 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimit)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMaxCoolSetpointLimit)); + VerifyOrReturn(CheckConstraintMinValue("value", value, MinCoolSetpointLimitValue)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, AbsMaxCoolSetpointLimitValue)); } break; case 111: @@ -50376,7 +50376,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && TSTAT.S.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(MaxCoolSetpointLimit + 1000); + value = static_cast(MaxCoolSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50396,7 +50396,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && TSTAT.S.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MaxCoolSetpointLimit; + value = MaxCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50417,7 +50417,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F01 && !TSTAT.S.F05 && TSTAT.S.A0017"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MinCoolSetpointLimit; + value = MinCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::OccupiedCoolingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50501,7 +50501,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && TSTAT.S.A0016"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(MaxHeatSetpointLimit + 1000); + value = static_cast(MaxHeatSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50522,7 +50522,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && !TSTAT.S.F05 && TSTAT.S.A0016"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MaxHeatSetpointLimit; + value = MaxHeatSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50565,7 +50565,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F00 && TSTAT.S.A0015"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MinHeatSetpointLimit; + value = MinHeatSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::OccupiedHeatingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50636,7 +50636,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F01 && TSTAT.S.A0018"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(MaxCoolSetpointLimit + 1000); + value = static_cast(MaxCoolSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50658,7 +50658,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MaxCoolSetpointLimit; + value = MaxCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50704,7 +50704,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MinCoolSetpointLimit; + value = MinCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::UnoccupiedCoolingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50775,7 +50775,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00 && TSTAT.S.A0016"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(MaxHeatSetpointLimit + 1000); + value = static_cast(MaxHeatSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50797,7 +50797,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MaxHeatSetpointLimit; + value = MaxHeatSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50841,7 +50841,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand VerifyOrDo(!ShouldSkip("TSTAT.S.F02 && TSTAT.S.F00 && TSTAT.S.A0015"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MinHeatSetpointLimit; + value = MinHeatSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::UnoccupiedHeatingSetpoint::Id, value, chip::NullOptional, chip::NullOptional); @@ -50921,7 +50921,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(MaxHeatSetpointLimit + 1000); + value = static_cast(MaxHeatSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -50941,7 +50941,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MaxHeatSetpointLimit; + value = MaxHeatSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinHeatSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51115,7 +51115,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MinHeatSetpointLimit; + value = MinHeatSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxHeatSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51185,7 +51185,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(MaxCoolSetpointLimit + 1000); + value = static_cast(MaxCoolSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51205,7 +51205,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MaxCoolSetpointLimit; + value = MaxCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51225,7 +51225,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = AbsMinCoolSetpointLimit; + value = AbsMinCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MinCoolSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51308,7 +51308,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = static_cast(AbsMaxCoolSetpointLimit + 1000); + value = static_cast(AbsMaxCoolSetpointLimitValue + 1000); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51328,7 +51328,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = AbsMaxCoolSetpointLimit; + value = AbsMaxCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } @@ -51358,7 +51358,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; int16_t value; - value = MinCoolSetpointLimit; + value = MinCoolSetpointLimitValue; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), Thermostat::Id, Thermostat::Attributes::MaxCoolSetpointLimit::Id, value, chip::NullOptional, chip::NullOptional); } diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 0c5f225c2dd691..ca51e599315330 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -30638,7 +30638,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull PacketRxCount; + NSNumber * _Nonnull PacketRxCountValue; CHIP_ERROR TestThReadsPacketRxCountAttributeValueFromDut_11() { @@ -30655,7 +30655,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - PacketRxCount = value; + PacketRxCountValue = value; } NextTest(); @@ -30663,7 +30663,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull PacketTxCount; + NSNumber * _Nonnull PacketTxCountValue; CHIP_ERROR TestThReadsPacketTxCountAttributeValueFromDut_12() { @@ -30680,7 +30680,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - PacketTxCount = value; + PacketTxCountValue = value; } NextTest(); @@ -30688,7 +30688,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull TxErrCount; + NSNumber * _Nonnull TxErrCountValue; CHIP_ERROR TestThReadsTxErrCountAttributeValueFromDut_13() { @@ -30705,7 +30705,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - TxErrCount = value; + TxErrCountValue = value; } NextTest(); @@ -30713,7 +30713,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull CollisionCount; + NSNumber * _Nonnull CollisionCountValue; CHIP_ERROR TestThReadsCollisionCountAttributeValueFromDut_14() { @@ -30730,7 +30730,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - CollisionCount = value; + CollisionCountValue = value; } NextTest(); @@ -30738,7 +30738,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull OverrunCount; + NSNumber * _Nonnull OverrunCountValue; CHIP_ERROR TestThReadsOverrunCountAttributeValueFromDut_15() { @@ -30755,7 +30755,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - OverrunCount = value; + OverrunCountValue = value; } NextTest(); @@ -30818,7 +30818,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMaxValue("txErrCount", [value unsignedLongLongValue], TxErrCount)); + VerifyOrReturn(CheckConstraintMaxValue("txErrCount", [value unsignedLongLongValue], TxErrCountValue)); NextTest(); }]; @@ -30840,7 +30840,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMaxValue("collisionCount", [value unsignedLongLongValue], CollisionCount)); + VerifyOrReturn(CheckConstraintMaxValue("collisionCount", [value unsignedLongLongValue], CollisionCountValue)); NextTest(); }]; @@ -30862,7 +30862,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMaxValue("overrunCount", [value unsignedLongLongValue], OverrunCount)); + VerifyOrReturn(CheckConstraintMaxValue("overrunCount", [value unsignedLongLongValue], OverrunCountValue)); NextTest(); }];