From 3921739550c42d9a4e26591bdfdc777b41db65c4 Mon Sep 17 00:00:00 2001 From: manjunath-grl <102359958+manjunath-grl@users.noreply.github.com> Date: Sat, 27 Aug 2022 22:06:27 +0530 Subject: [PATCH] Modified CC scripts (#22194) * Modified CC tests with 15% tolerance range check * Auto generated files --- .../suites/certification/Test_TC_CC_3_2.yaml | 2 +- .../suites/certification/Test_TC_CC_3_3.yaml | 6 +- .../suites/certification/Test_TC_CC_4_1.yaml | 2 +- .../suites/certification/Test_TC_CC_4_2.yaml | 2 +- .../suites/certification/Test_TC_CC_4_3.yaml | 6 +- .../suites/certification/Test_TC_CC_4_4.yaml | 23 +- .../suites/certification/Test_TC_CC_5_1.yaml | 8 +- .../suites/certification/Test_TC_CC_5_3.yaml | 16 +- .../suites/certification/Test_TC_CC_6_1.yaml | 10 +- .../suites/certification/Test_TC_CC_7_1.yaml | 28 +- .../suites/certification/Test_TC_CC_7_2.yaml | 32 +-- .../suites/certification/Test_TC_CC_7_3.yaml | 18 +- .../suites/certification/Test_TC_CC_7_4.yaml | 6 +- .../suites/certification/Test_TC_CC_8_1.yaml | 10 +- .../chip-tool/zap-generated/test/Commands.h | 253 ++++++++--------- .../zap-generated/test/Commands.h | 256 ++++++++++-------- 16 files changed, 361 insertions(+), 317 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml index a629614f4b3795..88222beb4995c6 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml @@ -99,7 +99,7 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 245 + minValue: 215 maxValue: 255 - label: "Wait 10s" diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml index c3e2ad14f2714e..454d7743ec686b 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml @@ -101,8 +101,8 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 215 - maxValue: 245 + minValue: 210 + maxValue: 250 - label: "Wait 10s" cluster: "DelayCommands" @@ -211,7 +211,7 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 245 + minValue: 210 maxValue: 255 - label: "Wait 5s" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml index 2f4fe4a27f5e9b..6f4666e21f0a72 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml @@ -134,7 +134,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - minValue: 110 + minValue: 102 maxValue: 120 - label: "Wait 5s" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml index f338768af6aa88..ef0e5174d659cf 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml @@ -114,7 +114,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - minValue: 235 + minValue: 215 maxValue: 254 - label: "Wait 5s" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml index f66cfa2afa84bc..1a6b0df2bf5826 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml @@ -99,8 +99,8 @@ tests: attribute: "CurrentSaturation" response: constraints: - minValue: 210 - maxValue: 230 + minValue: 205 + maxValue: 235 - label: "Wait 10s" cluster: "DelayCommands" @@ -116,7 +116,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - minValue: 230 + minValue: 205 maxValue: 240 - label: "Wait 5s" diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml index 5de1f4e59a1f19..25e76fc401b9d5 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml @@ -76,10 +76,13 @@ tests: attribute: "CurrentHue" response: value: 200 - constraints: - type: int8u - minValue: 0 - maxValue: 254 + + - label: "TH reads CurrentSaturation attribute from DUT" + PICS: CC.S.F01 && CC.S.A0001 + command: "readAttribute" + attribute: "CurrentSaturation" + response: + value: 50 - label: "TH sends MoveToHueAndSaturation command to DUT with Hue=160, @@ -113,8 +116,8 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 175 - maxValue: 185 + minValue: 165 + maxValue: 195 - label: "TH reads CurrentSaturation attribute from DUT" PICS: CC.S.F01 && CC.S.A0001 @@ -122,8 +125,8 @@ tests: attribute: "CurrentSaturation" response: constraints: - minValue: 60 - maxValue: 70 + minValue: 55 + maxValue: 75 - label: "Wait 10s" cluster: "DelayCommands" @@ -140,7 +143,7 @@ tests: response: constraints: minValue: 160 - maxValue: 170 + maxValue: 185 - label: "TH reads CurrentSaturation attribute from DUT" PICS: CC.S.F01 && CC.S.A0001 @@ -149,7 +152,7 @@ tests: response: constraints: type: int8u - minValue: 70 + minValue: 68 maxValue: 80 - label: "Wait 5s" diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml index dbcdd80a8c09d3..226bd43f7a7df2 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml @@ -115,8 +115,8 @@ tests: attribute: "CurrentX" response: constraints: - minValue: 13107 - maxValue: 32768 + minValue: 19500 + maxValue: 26400 - label: "TH reads CurrentY attribute from DUT" PICS: CC.S.F03 && CC.S.A0004 && CC.S.C07.Rsp @@ -124,8 +124,8 @@ tests: attribute: "CurrentY" response: constraints: - minValue: 13107 - maxValue: 19660 + minValue: 13900 + maxValue: 18900 - label: "Wait 10s" cluster: "DelayCommands" diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml index 8ff6b447ed9256..68de5492f19ed1 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml @@ -70,8 +70,8 @@ tests: value: 100 - label: - "TH sends StepColor command to DUT, with StepX = -2000, StepY = -6000, - TransitionTime = 200 (20s)" + "TH sends StepColor command to DUT, with StepX = -20000, StepY = + -6000, TransitionTime = 200 (20s)" command: "StepColor" PICS: CC.S.F03 && CC.S.C09.Rsp arguments: @@ -101,8 +101,8 @@ tests: attribute: "CurrentX" response: constraints: - minValue: 13000 - maxValue: 33000 + minValue: 19500 + maxValue: 26500 - label: "TH reads CurrentY attribute from DUT" command: "readAttribute" @@ -110,8 +110,8 @@ tests: attribute: "CurrentY" response: constraints: - minValue: 14000 - maxValue: 20000 + minValue: 14500 + maxValue: 19500 - label: "Wait 10s" cluster: "DelayCommands" @@ -128,7 +128,7 @@ tests: response: constraints: minValue: 13000 - maxValue: 14000 + maxValue: 15000 - label: "TH reads CurrentY attribute from DUT" command: "readAttribute" @@ -137,7 +137,7 @@ tests: response: constraints: minValue: 14000 - maxValue: 15000 + maxValue: 16000 - label: "Wait 5s" cluster: "DelayCommands" diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml index c8271e1df685fb..32f47357b30fc3 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml @@ -131,8 +131,8 @@ tests: attribute: "ColorTemperature" response: constraints: - minValue: 280 - maxValue: 300 + minValue: 275 + maxValue: 305 - label: "Wait 10s" cluster: "DelayCommands" @@ -148,8 +148,8 @@ tests: attribute: "ColorTemperature" response: constraints: - minValue: 260 - maxValue: 280 + minValue: 255 + maxValue: 285 - label: "Wait 10s" cluster: "DelayCommands" @@ -166,7 +166,7 @@ tests: response: constraints: minValue: 250 - maxValue: 260 + maxValue: 280 - label: "Wait 5s" cluster: "DelayCommands" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml index 6b1fb45985681a..6908af2c2debcc 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml @@ -102,8 +102,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7000 - maxValue: 9000 + minValue: 6800 + maxValue: 9200 - label: "Wait 10s" cluster: "DelayCommands" @@ -119,8 +119,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 9000 - maxValue: 11000 + minValue: 8500 + maxValue: 11500 - label: "Wait 10s" cluster: "DelayCommands" @@ -137,7 +137,7 @@ tests: response: constraints: minValue: 11000 - maxValue: 12000 + maxValue: 12700 - label: "Wait 5s" cluster: "DelayCommands" @@ -322,8 +322,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7000 - maxValue: 9000 + minValue: 6800 + maxValue: 9200 - label: "Wait 10s" cluster: "DelayCommands" @@ -339,8 +339,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 9000 - maxValue: 11000 + minValue: 8500 + maxValue: 11500 - label: "Wait 10s" cluster: "DelayCommands" @@ -357,7 +357,7 @@ tests: response: constraints: minValue: 11000 - maxValue: 12000 + maxValue: 12700 - label: "Wait 5s" cluster: "DelayCommands" @@ -432,8 +432,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 9000 - maxValue: 11000 + minValue: 8500 + maxValue: 11500 - label: "Wait 10s" cluster: "DelayCommands" @@ -449,8 +449,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7000 - maxValue: 9000 + minValue: 6800 + maxValue: 9200 - label: "Wait 10s" cluster: "DelayCommands" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml index e8a371c97eff0e..2e42a32b3a3df7 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml @@ -99,8 +99,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 22500 - maxValue: 27500 + minValue: 21250 + maxValue: 28750 - label: "Wait 10s" cluster: "DelayCommands" @@ -116,8 +116,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 27500 - maxValue: 32500 + minValue: 25500 + maxValue: 34500 - label: "Wait 10s" cluster: "DelayCommands" @@ -149,8 +149,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 34000 - maxValue: 36500 + minValue: 30000 + maxValue: 40250 - label: "Wait 2s" cluster: "DelayCommands" @@ -167,8 +167,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 34500 - maxValue: 36500 + minValue: 30000 + maxValue: 40250 - label: "TH sends EnhancedMoveToHue command to DUT with EnhancedHue=25000, @@ -226,8 +226,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 17500 - maxValue: 22500 + minValue: 17000 + maxValue: 23000 - label: "Wait 10s" cluster: "DelayCommands" @@ -243,8 +243,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 12500 - maxValue: 17500 + minValue: 12750 + maxValue: 17250 - label: "Wait 10s" cluster: "DelayCommands" @@ -276,8 +276,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7500 - maxValue: 12500 + minValue: 8500 + maxValue: 11500 - label: "Wait 2s" cluster: "DelayCommands" @@ -294,8 +294,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7500 - maxValue: 12500 + minValue: 8500 + maxValue: 11500 - label: "TH reads ColorMode attribute from DUT" PICS: CC.S.F00 && CC.S.A0008 diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml index f336d397ec1076..f8ff877b455b19 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml @@ -101,8 +101,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7000 - maxValue: 9000 + minValue: 6800 + maxValue: 9200 - label: "Wait 10s" cluster: "DelayCommands" @@ -118,8 +118,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 9000 - maxValue: 11000 + minValue: 8500 + maxValue: 11500 - label: "Wait 10s" cluster: "DelayCommands" @@ -135,7 +135,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 11000 + minValue: 9350 maxValue: 12000 - label: "Wait 5s" @@ -211,8 +211,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 9000 - maxValue: 11000 + minValue: 8500 + maxValue: 11500 - label: "Wait 10s" cluster: "DelayCommands" @@ -228,8 +228,8 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - minValue: 7000 - maxValue: 9000 + minValue: 6800 + maxValue: 9200 - label: "Wait 10s" cluster: "DelayCommands" diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml index e7809e76bf4024..a41127e7f4bfaf 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml @@ -118,8 +118,8 @@ tests: response: constraints: type: int16u - minValue: 17000 - maxValue: 19000 + minValue: 16000 + maxValue: 20000 - label: "TH reads CurrentSaturation attribute from DUT" PICS: CC.S.F01 && CC.S.A0001 @@ -146,7 +146,7 @@ tests: constraints: type: int16u minValue: 16000 - maxValue: 17000 + maxValue: 18400 - label: "TH reads CurrentSaturation attribute from DUT" PICS: CC.S.F01 && CC.S.A0001 diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml index 4efdcf2f096dc9..09ecbf5d22cae4 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml @@ -109,7 +109,7 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 235 + minValue: 215 maxValue: 254 - label: "Wait 2s" @@ -126,7 +126,7 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 240 + minValue: 215 maxValue: 254 - label: @@ -398,8 +398,8 @@ tests: response: saveAs: EnhancedCurrentHueValue constraints: - minValue: 23500 - maxValue: 26500 + minValue: 21250 + maxValue: 28750 - label: "Wait 10s" cluster: "DelayCommands" @@ -416,7 +416,7 @@ tests: response: constraints: minValue: EnhancedCurrentHueValue - maxValue: 26500 + maxValue: 28750 - label: "Turn Off light that we turned on" PICS: OO.S.C00.Rsp diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 6f7db91e3aadd9..bb7850cd84314e 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -4490,7 +4490,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 245U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 215U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } break; @@ -4974,8 +4974,8 @@ class Test_TC_CC_3_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 215U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 245U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 210U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 250U)); } break; case 8: @@ -5035,7 +5035,7 @@ class Test_TC_CC_3_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 245U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 210U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } break; @@ -5400,7 +5400,7 @@ class Test_TC_CC_4_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 110U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 102U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 120U)); } break; @@ -5683,7 +5683,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 235U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 215U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } break; @@ -6190,8 +6190,8 @@ class Test_TC_CC_4_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 210U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 230U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 205U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 235U)); } break; case 8: @@ -6203,7 +6203,7 @@ class Test_TC_CC_4_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 230U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 205U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 240U)); } break; @@ -6608,7 +6608,7 @@ class Test_TC_CC_4_3Suite : public TestCommand class Test_TC_CC_4_4Suite : public TestCommand { public: - Test_TC_CC_4_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_4", 20, credsIssuerConfig) + Test_TC_CC_4_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_CC_4_4", 21, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -6664,64 +6664,69 @@ class Test_TC_CC_4_4Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentHue", value, 200U)); - VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); - VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } break; case 6: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + uint8_t value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("currentSaturation", value, 50U)); + } break; case 7: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; break; case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + shouldContinue = true; + break; + case 9: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 175U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 185U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 165U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 195U)); } break; - case 9: + case 10: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 60U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 70U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 55U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 75U)); } break; - case 10: + case 11: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); shouldContinue = true; break; - case 11: + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 160U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 170U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 185U)); } break; - case 12: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); - VerifyOrReturn(CheckConstraintMinValue("value", value, 70U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 68U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 80U)); } break; - case 13: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); shouldContinue = true; break; - case 14: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -6729,7 +6734,7 @@ class Test_TC_CC_4_4Suite : public TestCommand VerifyOrReturn(CheckValue("currentHue", value, 160U)); } break; - case 15: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -6737,7 +6742,7 @@ class Test_TC_CC_4_4Suite : public TestCommand VerifyOrReturn(CheckValue("currentSaturation", value, 80U)); } break; - case 16: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -6746,7 +6751,7 @@ class Test_TC_CC_4_4Suite : public TestCommand VerifyOrReturn(CheckConstraintMaxValue("value", value, 2U)); } break; - case 17: + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint8_t value; @@ -6755,10 +6760,10 @@ class Test_TC_CC_4_4Suite : public TestCommand VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } break; - case 18: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 19: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { bool value; @@ -6836,7 +6841,13 @@ class Test_TC_CC_4_4Suite : public TestCommand chip::NullOptional); } case 6: { - LogStep(6, "TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and TransitionTime=200 (20s)"); + LogStep(6, "TH reads CurrentSaturation attribute from DUT"); + VerifyOrDo(!ShouldSkip("CC.S.F01 && CC.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentSaturation::Id, + true, chip::NullOptional); + } + case 7: { + LogStep(7, "TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and TransitionTime=200 (20s)"); VerifyOrDo(!ShouldSkip("CC.S.F01 && CC.S.C06.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::ColorControl::Commands::MoveToHueAndSaturation::Type value; @@ -6850,77 +6861,77 @@ class Test_TC_CC_4_4Suite : public TestCommand ); } - case 7: { - LogStep(7, "Wait 10s"); + case 8: { + LogStep(8, "Wait 10s"); ListFreer listFreer; chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; value.ms = 10000UL; return WaitForMs(kIdentityAlpha, value); } - case 8: { - LogStep(8, "TH reads CurrentHue attribute from DUT"); + case 9: { + LogStep(9, "TH reads CurrentHue attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F00 && CC.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentHue::Id, true, chip::NullOptional); } - case 9: { - LogStep(9, "TH reads CurrentSaturation attribute from DUT"); + case 10: { + LogStep(10, "TH reads CurrentSaturation attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F01 && CC.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentSaturation::Id, true, chip::NullOptional); } - case 10: { - LogStep(10, "Wait 10s"); + case 11: { + LogStep(11, "Wait 10s"); ListFreer listFreer; chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; value.ms = 10000UL; return WaitForMs(kIdentityAlpha, value); } - case 11: { - LogStep(11, "TH reads CurrentHue attribute from DUT"); + case 12: { + LogStep(12, "TH reads CurrentHue attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F00 && CC.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentHue::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "TH reads CurrentSaturation attribute from DUT"); + case 13: { + LogStep(13, "TH reads CurrentSaturation attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F01 && CC.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentSaturation::Id, true, chip::NullOptional); } - case 13: { - LogStep(13, "Wait 5s"); + case 14: { + LogStep(14, "Wait 5s"); ListFreer listFreer; chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; value.ms = 5000UL; return WaitForMs(kIdentityAlpha, value); } - case 14: { - LogStep(14, "TH reads CurrentHue attribute from DUT"); + case 15: { + LogStep(15, "TH reads CurrentHue attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F00 && CC.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentHue::Id, true, chip::NullOptional); } - case 15: { - LogStep(15, "TH reads CurrentSaturation attribute from DUT"); + case 16: { + LogStep(16, "TH reads CurrentSaturation attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F01 && CC.S.A0001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::CurrentSaturation::Id, true, chip::NullOptional); } - case 16: { - LogStep(16, "TH reads ColorMode attribute from DUT"); + case 17: { + LogStep(17, "TH reads ColorMode attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F00 && CC.S.A0008"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorMode::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "TH reads EnhancedColorMode attribute from DUT"); + case 18: { + LogStep(18, "TH reads EnhancedColorMode attribute from DUT"); VerifyOrDo(!ShouldSkip("CC.S.F00 && CC.S.A4001"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), ColorControl::Id, ColorControl::Attributes::ColorMode::Id, true, chip::NullOptional); } - case 18: { - LogStep(18, "Turn off light that we turned on"); + case 19: { + LogStep(19, "Turn off light that we turned on"); VerifyOrDo(!ShouldSkip("OO.S.C00.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::OnOff::Commands::Off::Type value; @@ -6928,8 +6939,8 @@ class Test_TC_CC_4_4Suite : public TestCommand ); } - case 19: { - LogStep(19, "Check on/off attribute value is false after off command"); + case 20: { + LogStep(20, "Check on/off attribute value is false after off command"); VerifyOrDo(!ShouldSkip("OO.S.A0000"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), OnOff::Id, OnOff::Attributes::OnOff::Id, true, chip::NullOptional); } @@ -7019,8 +7030,8 @@ class Test_TC_CC_5_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 13107U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 32768U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 19500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 26400U)); } break; case 10: @@ -7028,8 +7039,8 @@ class Test_TC_CC_5_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 13107U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 19660U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 13900U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 18900U)); } break; case 11: @@ -8261,8 +8272,8 @@ class Test_TC_CC_5_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 13000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 33000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 19500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 26500U)); } break; case 8: @@ -8270,8 +8281,8 @@ class Test_TC_CC_5_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 14000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 20000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 14500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 19500U)); } break; case 9: @@ -8284,7 +8295,7 @@ class Test_TC_CC_5_3Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 13000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 14000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 15000U)); } break; case 11: @@ -8293,7 +8304,7 @@ class Test_TC_CC_5_3Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 14000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 15000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 16000U)); } break; case 12: @@ -8408,7 +8419,7 @@ class Test_TC_CC_5_3Suite : public TestCommand return WaitForMs(kIdentityAlpha, value); } case 5: { - LogStep(5, "TH sends StepColor command to DUT, with StepX = -2000, StepY = -6000, TransitionTime = 200 (20s)"); + LogStep(5, "TH sends StepColor command to DUT, with StepX = -20000, StepY = -6000, TransitionTime = 200 (20s)"); VerifyOrDo(!ShouldSkip("CC.S.F03 && CC.S.C09.Rsp"), return ContinueOnChipMainThread(CHIP_NO_ERROR)); ListFreer listFreer; chip::app::Clusters::ColorControl::Commands::StepColor::Type value; @@ -8610,8 +8621,8 @@ class Test_TC_CC_6_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 280U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 300U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 275U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 305U)); } break; case 11: @@ -8623,8 +8634,8 @@ class Test_TC_CC_6_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 260U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 280U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 255U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 285U)); } break; case 13: @@ -8637,7 +8648,7 @@ class Test_TC_CC_6_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 250U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 260U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 280U)); } break; case 15: @@ -9895,8 +9906,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 22500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 27500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 21250U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 28750U)); } break; case 8: @@ -9908,8 +9919,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 27500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 32500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 25500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 34500U)); } break; case 10: @@ -9924,8 +9935,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 34000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 36500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 30000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 40250U)); } break; case 13: @@ -9937,8 +9948,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 34500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 36500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 30000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 40250U)); } break; case 15: @@ -9960,8 +9971,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 17500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 22500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 17000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 23000U)); } break; case 20: @@ -9973,8 +9984,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 12500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 17500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 12750U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 17250U)); } break; case 22: @@ -9989,8 +10000,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 12500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 25: @@ -10002,8 +10013,8 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 12500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 27: @@ -10379,8 +10390,8 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 9000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 9200U)); } break; case 8: @@ -10392,8 +10403,8 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 11000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 10: @@ -10405,7 +10416,7 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 11000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 9350U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 12000U)); } break; @@ -10440,8 +10451,8 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 11000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 19: @@ -10453,8 +10464,8 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 9000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 9200U)); } break; case 21: @@ -10849,8 +10860,8 @@ class Test_TC_CC_7_4Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("value", value, 17000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 19000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 16000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 20000U)); } break; case 10: @@ -10873,7 +10884,7 @@ class Test_TC_CC_7_4Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 16000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 17000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 18400U)); } break; case 13: @@ -11189,7 +11200,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 235U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 215U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } break; @@ -11202,7 +11213,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 240U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 215U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } break; @@ -11330,8 +11341,8 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 23500U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 26500U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 21250U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 28750U)); EnhancedCurrentHueValue = value; } break; @@ -11345,7 +11356,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, EnhancedCurrentHueValue)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 26500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 28750U)); } break; case 37: @@ -92701,8 +92712,8 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 9000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 9200U)); } break; case 8: @@ -92714,8 +92725,8 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 11000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 10: @@ -92728,7 +92739,7 @@ class Test_TC_CC_7_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 11000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 12000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 12700U)); } break; case 12: @@ -92823,8 +92834,8 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 9000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 9200U)); } break; case 30: @@ -92836,8 +92847,8 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 11000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 32: @@ -92850,7 +92861,7 @@ class Test_TC_CC_7_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintMinValue("value", value, 11000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 12000U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 12700U)); } break; case 34: @@ -92884,8 +92895,8 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 11000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 11500U)); } break; case 41: @@ -92897,8 +92908,8 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value", value, 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 9000U)); + VerifyOrReturn(CheckConstraintMinValue("value", value, 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 9200U)); } break; case 43: 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 e825b858b634f3..ded17f4866bb30 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -7282,7 +7282,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 245U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 215U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 255U)); NextTest(); @@ -8146,8 +8146,8 @@ class Test_TC_CC_3_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 215U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 245U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 210U)); + VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 250U)); NextTest(); }]; @@ -8327,7 +8327,7 @@ class Test_TC_CC_3_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 245U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 210U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 255U)); NextTest(); @@ -8885,7 +8885,7 @@ class Test_TC_CC_4_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 110U)); + VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 102U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 120U)); NextTest(); @@ -9569,7 +9569,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 235U)); + VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 215U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); NextTest(); @@ -10520,8 +10520,8 @@ class Test_TC_CC_4_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 210U)); - VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 230U)); + VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 205U)); + VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 235U)); NextTest(); }]; @@ -10549,7 +10549,7 @@ class Test_TC_CC_4_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 230U)); + VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 205U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 240U)); NextTest(); @@ -11023,106 +11023,114 @@ class Test_TC_CC_4_4 : public TestCommandBridge { err = TestThReadsCurrentHueAttributeFromDut_5(); break; case 6: + ChipLogProgress(chipTool, " ***** Test Step 6 : TH reads CurrentSaturation attribute from DUT\n"); + if (ShouldSkip("CC.S.F01 && CC.S.A0001")) { + NextTest(); + return; + } + err = TestThReadsCurrentSaturationAttributeFromDut_6(); + break; + case 7: ChipLogProgress(chipTool, - " ***** Test Step 6 : TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and " + " ***** Test Step 7 : TH sends MoveToHueAndSaturation command to DUT with Hue=160, Saturation=80 and " "TransitionTime=200 (20s)\n"); if (ShouldSkip("CC.S.F01 && CC.S.C06.Rsp")) { NextTest(); return; } - err = TestThSendsMoveToHueAndSaturationCommandToDutWithHue160Saturation80AndTransitionTime20020s_6(); - break; - case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Wait 10s\n"); - err = TestWait10s_7(); + err = TestThSendsMoveToHueAndSaturationCommandToDutWithHue160Saturation80AndTransitionTime20020s_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : TH reads CurrentHue attribute from DUT\n"); + ChipLogProgress(chipTool, " ***** Test Step 8 : Wait 10s\n"); + err = TestWait10s_8(); + break; + case 9: + ChipLogProgress(chipTool, " ***** Test Step 9 : TH reads CurrentHue attribute from DUT\n"); if (ShouldSkip("CC.S.F00 && CC.S.A0000")) { NextTest(); return; } - err = TestThReadsCurrentHueAttributeFromDut_8(); + err = TestThReadsCurrentHueAttributeFromDut_9(); break; - case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : TH reads CurrentSaturation attribute from DUT\n"); + case 10: + ChipLogProgress(chipTool, " ***** Test Step 10 : TH reads CurrentSaturation attribute from DUT\n"); if (ShouldSkip("CC.S.F01 && CC.S.A0001")) { NextTest(); return; } - err = TestThReadsCurrentSaturationAttributeFromDut_9(); - break; - case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : Wait 10s\n"); - err = TestWait10s_10(); + err = TestThReadsCurrentSaturationAttributeFromDut_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : TH reads CurrentHue attribute from DUT\n"); + ChipLogProgress(chipTool, " ***** Test Step 11 : Wait 10s\n"); + err = TestWait10s_11(); + break; + case 12: + ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads CurrentHue attribute from DUT\n"); if (ShouldSkip("CC.S.F00 && CC.S.A0000")) { NextTest(); return; } - err = TestThReadsCurrentHueAttributeFromDut_11(); + err = TestThReadsCurrentHueAttributeFromDut_12(); break; - case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : TH reads CurrentSaturation attribute from DUT\n"); + case 13: + ChipLogProgress(chipTool, " ***** Test Step 13 : TH reads CurrentSaturation attribute from DUT\n"); if (ShouldSkip("CC.S.F01 && CC.S.A0001")) { NextTest(); return; } - err = TestThReadsCurrentSaturationAttributeFromDut_12(); - break; - case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Wait 5s\n"); - err = TestWait5s_13(); + err = TestThReadsCurrentSaturationAttributeFromDut_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : TH reads CurrentHue attribute from DUT\n"); + ChipLogProgress(chipTool, " ***** Test Step 14 : Wait 5s\n"); + err = TestWait5s_14(); + break; + case 15: + ChipLogProgress(chipTool, " ***** Test Step 15 : TH reads CurrentHue attribute from DUT\n"); if (ShouldSkip("CC.S.F00 && CC.S.A0000")) { NextTest(); return; } - err = TestThReadsCurrentHueAttributeFromDut_14(); + err = TestThReadsCurrentHueAttributeFromDut_15(); break; - case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : TH reads CurrentSaturation attribute from DUT\n"); + case 16: + ChipLogProgress(chipTool, " ***** Test Step 16 : TH reads CurrentSaturation attribute from DUT\n"); if (ShouldSkip("CC.S.F01 && CC.S.A0001")) { NextTest(); return; } - err = TestThReadsCurrentSaturationAttributeFromDut_15(); + err = TestThReadsCurrentSaturationAttributeFromDut_16(); break; - case 16: - ChipLogProgress(chipTool, " ***** Test Step 16 : TH reads ColorMode attribute from DUT\n"); + case 17: + ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads ColorMode attribute from DUT\n"); if (ShouldSkip("CC.S.F00 && CC.S.A0008")) { NextTest(); return; } - err = TestThReadsColorModeAttributeFromDut_16(); + err = TestThReadsColorModeAttributeFromDut_17(); break; - case 17: - ChipLogProgress(chipTool, " ***** Test Step 17 : TH reads EnhancedColorMode attribute from DUT\n"); + case 18: + ChipLogProgress(chipTool, " ***** Test Step 18 : TH reads EnhancedColorMode attribute from DUT\n"); if (ShouldSkip("CC.S.F00 && CC.S.A4001")) { NextTest(); return; } - err = TestThReadsEnhancedColorModeAttributeFromDut_17(); + err = TestThReadsEnhancedColorModeAttributeFromDut_18(); break; - case 18: - ChipLogProgress(chipTool, " ***** Test Step 18 : Turn off light that we turned on\n"); + case 19: + ChipLogProgress(chipTool, " ***** Test Step 19 : Turn off light that we turned on\n"); if (ShouldSkip("OO.S.C00.Rsp")) { NextTest(); return; } - err = TestTurnOffLightThatWeTurnedOn_18(); + err = TestTurnOffLightThatWeTurnedOn_19(); break; - case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : Check on/off attribute value is false after off command\n"); + case 20: + ChipLogProgress(chipTool, " ***** Test Step 20 : Check on/off attribute value is false after off command\n"); if (ShouldSkip("OO.S.A0000")) { NextTest(); return; } - err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_19(); + err = TestCheckOnOffAttributeValueIsFalseAfterOffCommand_20(); break; } @@ -11195,6 +11203,9 @@ class Test_TC_CC_4_4 : public TestCommandBridge { case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 20: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -11208,7 +11219,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 20; + const uint16_t mTestCount = 21; chip::Optional mNodeId; chip::Optional mCluster; @@ -11314,9 +11325,29 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("CurrentHue", actualValue, 200U)); } - VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_6() + { + MTRBaseDevice * device = GetDevice("alpha"); + MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device + endpoint:1 + queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeCurrentSaturationWithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"TH reads CurrentSaturation attribute from DUT Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("CurrentSaturation", actualValue, 50U)); + } NextTest(); }]; @@ -11324,7 +11355,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThSendsMoveToHueAndSaturationCommandToDutWithHue160Saturation80AndTransitionTime20020s_6() + CHIP_ERROR TestThSendsMoveToHueAndSaturationCommandToDutWithHue160Saturation80AndTransitionTime20020s_7() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11352,14 +11383,14 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWait10s_7() + CHIP_ERROR TestWait10s_8() { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; value.ms = 10000UL; return WaitForMs("alpha", value); } - CHIP_ERROR TestThReadsCurrentHueAttributeFromDut_8() + CHIP_ERROR TestThReadsCurrentHueAttributeFromDut_9() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11372,8 +11403,8 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 175U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 185U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 165U)); + VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 195U)); NextTest(); }]; @@ -11381,7 +11412,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_9() + CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_10() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11394,8 +11425,8 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 60U)); - VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 70U)); + VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 55U)); + VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 75U)); NextTest(); }]; @@ -11403,14 +11434,14 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWait10s_10() + CHIP_ERROR TestWait10s_11() { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; value.ms = 10000UL; return WaitForMs("alpha", value); } - CHIP_ERROR TestThReadsCurrentHueAttributeFromDut_11() + CHIP_ERROR TestThReadsCurrentHueAttributeFromDut_12() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11424,7 +11455,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 160U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 170U)); + VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 185U)); NextTest(); }]; @@ -11432,7 +11463,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_12() + CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_13() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11446,7 +11477,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); - VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 70U)); + VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 68U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 80U)); NextTest(); @@ -11455,14 +11486,14 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWait5s_13() + CHIP_ERROR TestWait5s_14() { chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; value.ms = 5000UL; return WaitForMs("alpha", value); } - CHIP_ERROR TestThReadsCurrentHueAttributeFromDut_14() + CHIP_ERROR TestThReadsCurrentHueAttributeFromDut_15() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11486,7 +11517,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_15() + CHIP_ERROR TestThReadsCurrentSaturationAttributeFromDut_16() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11510,7 +11541,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsColorModeAttributeFromDut_16() + CHIP_ERROR TestThReadsColorModeAttributeFromDut_17() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11532,7 +11563,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestThReadsEnhancedColorModeAttributeFromDut_17() + CHIP_ERROR TestThReadsEnhancedColorModeAttributeFromDut_18() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -11554,7 +11585,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTurnOffLightThatWeTurnedOn_18() + CHIP_ERROR TestTurnOffLightThatWeTurnedOn_19() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterOnOff * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -11571,7 +11602,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_19() + CHIP_ERROR TestCheckOnOffAttributeValueIsFalseAfterOffCommand_20() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterOnOff * cluster = [[MTRBaseClusterOnOff alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -12457,8 +12488,8 @@ class Test_TC_CC_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 13107U)); - VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 32768U)); + VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 19500U)); + VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 26400U)); NextTest(); }]; @@ -12479,8 +12510,8 @@ class Test_TC_CC_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 13107U)); - VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 19660U)); + VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 13900U)); + VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 18900U)); NextTest(); }]; @@ -14248,13 +14279,13 @@ class Test_TC_CC_5_3 : public TestCommandBridge { break; case 5: ChipLogProgress(chipTool, - " ***** Test Step 5 : TH sends StepColor command to DUT, with StepX = -2000, StepY = -6000, TransitionTime = 200 " + " ***** Test Step 5 : TH sends StepColor command to DUT, with StepX = -20000, StepY = -6000, TransitionTime = 200 " "(20s)\n"); if (ShouldSkip("CC.S.F03 && CC.S.C09.Rsp")) { NextTest(); return; } - err = TestThSendsStepColorCommandToDutWithStepX2000StepY6000TransitionTime20020s_5(); + err = TestThSendsStepColorCommandToDutWithStepX20000StepY6000TransitionTime20020s_5(); break; case 6: ChipLogProgress(chipTool, " ***** Test Step 6 : Wait 10s\n"); @@ -14517,7 +14548,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { return WaitForMs("alpha", value); } - CHIP_ERROR TestThSendsStepColorCommandToDutWithStepX2000StepY6000TransitionTime20020s_5() + CHIP_ERROR TestThSendsStepColorCommandToDutWithStepX20000StepY6000TransitionTime20020s_5() { MTRBaseDevice * device = GetDevice("alpha"); MTRBaseClusterColorControl * cluster = [[MTRBaseClusterColorControl alloc] initWithDevice:device @@ -14531,17 +14562,16 @@ class Test_TC_CC_5_3 : public TestCommandBridge { params.transitionTime = [NSNumber numberWithUnsignedShort:200U]; params.optionsMask = [NSNumber numberWithUnsignedChar:0U]; params.optionsOverride = [NSNumber numberWithUnsignedChar:0U]; - [cluster - stepColorWithParams:params - completionHandler:^(NSError * _Nullable err) { - NSLog( - @"TH sends StepColor command to DUT, with StepX = -2000, StepY = -6000, TransitionTime = 200 (20s) Error: %@", - err); + [cluster stepColorWithParams:params + completionHandler:^(NSError * _Nullable err) { + NSLog(@"TH sends StepColor command to DUT, with StepX = -20000, StepY = -6000, TransitionTime = 200 (20s) " + @"Error: %@", + err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -14566,8 +14596,8 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 13000U)); - VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 33000U)); + VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 19500U)); + VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 26500U)); NextTest(); }]; @@ -14588,8 +14618,8 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 14000U)); - VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 20000U)); + VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 14500U)); + VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 19500U)); NextTest(); }]; @@ -14618,7 +14648,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 13000U)); - VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 14000U)); + VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 15000U)); NextTest(); }]; @@ -14640,7 +14670,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 14000U)); - VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 15000U)); + VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 16000U)); NextTest(); }]; @@ -15275,8 +15305,8 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 280U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 300U)); + VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 275U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 305U)); NextTest(); }]; @@ -15304,8 +15334,8 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 260U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 280U)); + VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 255U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 285U)); NextTest(); }]; @@ -15334,7 +15364,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 250U)); - VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 260U)); + VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 280U)); NextTest(); }]; @@ -15939,8 +15969,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 9000U)); + VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 9200U)); NextTest(); }]; @@ -15968,8 +15998,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 11000U)); + VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 11500U)); NextTest(); }]; @@ -15997,7 +16027,7 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 11000U)); + VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 9350U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 12000U)); NextTest(); @@ -16121,8 +16151,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 9000U)); - VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 11000U)); + VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 8500U)); + VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 11500U)); NextTest(); }]; @@ -16150,8 +16180,8 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 7000U)); - VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 9000U)); + VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 6800U)); + VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 9200U)); NextTest(); }]; @@ -16766,8 +16796,8 @@ class Test_TC_CC_7_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 17000U)); - VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 19000U)); + VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 16000U)); + VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 20000U)); NextTest(); }]; @@ -16819,7 +16849,7 @@ class Test_TC_CC_7_4 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 16000U)); - VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 17000U)); + VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 18400U)); NextTest(); }];