From 2632101cb8276c898af9f226e6069c0999aac918 Mon Sep 17 00:00:00 2001 From: manjunath-grl <102359958+manjunath-grl@users.noreply.github.com> Date: Wed, 6 Dec 2023 00:08:13 +0530 Subject: [PATCH] Fixes YAML script issues Nov 20 (#30575) * Fixes issue: 53,55,56,57,58,60,61 Modified tests: TC_ACT_2_2 TC_ACT_3_2 TC_BIND_2_2 TC_BIND_2_3 TC_BOOL_1_1 TC_BOOL_2_2 TC_DGGEN_2_1 TC_DRLK_3_2 TC_I_1_1 TC_SWTCH_2_2 TC_SWTCH_3_2 * Restyled by whitespace * Restyled by prettier-yaml * Fix issue 64 TC-G-2.2 * Fixes issue: 65, 62 Modified tests: TC-G-2.2 TC-G-2.3 TC-G-2.4 TC-SC-5.3 * Restyled by whitespace * Fixes issue: 63 --------- Co-authored-by: Restyled.io --- src/app/tests/suites/certification/PICS.yaml | 6 +- .../suites/certification/Test_TC_ACT_2_2.yaml | 49 ++++++++--- .../suites/certification/Test_TC_ACT_3_2.yaml | 4 +- .../certification/Test_TC_BIND_2_2.yaml | 1 + .../certification/Test_TC_BIND_2_3.yaml | 1 + .../certification/Test_TC_BOOL_1_1.yaml | 24 +++--- .../certification/Test_TC_BOOL_2_2.yaml | 18 ++-- .../certification/Test_TC_CADMIN_1_8.yaml | 20 +++-- .../certification/Test_TC_DGGEN_2_1.yaml | 33 ++++++-- .../certification/Test_TC_DRLK_3_2.yaml | 26 +++--- .../suites/certification/Test_TC_G_2_2.yaml | 25 +++--- .../suites/certification/Test_TC_G_2_3.yaml | 7 +- .../suites/certification/Test_TC_G_2_4.yaml | 6 +- .../suites/certification/Test_TC_I_1_1.yaml | 26 +++--- .../suites/certification/Test_TC_SC_5_3.yaml | 29 +++---- .../certification/Test_TC_SWTCH_2_2.yaml | 76 ++++++++--------- .../certification/Test_TC_SWTCH_3_2.yaml | 20 ++--- .../tests/suites/certification/ci-pics-values | 6 +- .../zap-generated/test/Commands.h | 82 +++++++++---------- 19 files changed, 253 insertions(+), 206 deletions(-) diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml index a6f9974e59d182..996883dd700d28 100644 --- a/src/app/tests/suites/certification/PICS.yaml +++ b/src/app/tests/suites/certification/PICS.yaml @@ -891,7 +891,7 @@ PICS: - label: "Can the StateValue attribute be changed by manual operation at the DUT?" - id: BOOL.M.ManuallyControlled + id: BOOL.S.M.ManuallyControlled # # client / manually @@ -6066,10 +6066,10 @@ PICS: # - label: "Does the DUT support reading attribute to get switch state (polling)?" - id: SWTCH.C.M.RA + id: SWTCH.C.M.SwitchStatePolling - label: "Does the DUT support eventing to get switch state changes?" - id: SWTCH.C.M.EV + id: SWTCH.C.M.SwitchStateEventing - label: "Write all supported optional attributes" id: SWTCH.C.AO-WRITE diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml index 143290a78b99e7..cfd2b62eeb56fd 100755 --- a/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACT_2_2.yaml @@ -500,10 +500,11 @@ tests: - label: "Step 4c: subscribe to StateChanged and ActionFailed events" verification: | - To subscribe StateChanged event follow below steps + To subscribe StateChanged and ActionFailed event follow below steps 1) ./chip-tool interactive start - 2) actions subscribe-event action-failed 2 30 1 0 + + 2) actions subscribe-event action-failed 2 30 1 1 Via the TH (chip-tool), Verify ActionFailed event subscription. @@ -530,14 +531,28 @@ tests: [1659962630.456551][25381:25386] CHIP:DMG: } [1659962630.456563][25381:25386] CHIP:DMG: Subscription established with SubscriptionID = 0x78f0a04c MinInterval = 0s MaxInterval = 100s Peer = 01:0000000000000001 - 3) actions instant-action 0x1001 1 1 - - Via the TH (chip-tool), Verify the SUCCESS response for instant-action. - - [1659955888.114483][23216:23221] CHIP:DMG: StatusIB = - [1659955888.114499][23216:23221] CHIP:DMG: { - [1659955888.114515][23216:23221] CHIP:DMG: status = 0x00 (SUCCESS), - [1659955888.114529][23216:23221] CHIP:DMG: }, + 3) actions subscribe-event state-changed 2 30 1 1 + + Via the TH (chip-tool), Verify StateChanged event subscription. + + [1696947597.397495][20187:20190] CHIP:DMG: ReportDataMessage = + [1696947597.397508][20187:20190] CHIP:DMG: { + [1696947597.397517][20187:20190] CHIP:DMG: SubscriptionId = 0x78906430, + [1696947597.397529][20187:20190] CHIP:DMG: InteractionModelRevision = 11 + [1696947597.397539][20187:20190] CHIP:DMG: } + [1696947597.397561][20187:20190] CHIP:DMG: MoveToState ReadClient[0x7fe364020f30]: Moving to [AwaitingSu] + [1696947597.397646][20187:20190] CHIP:EM: <<< [E:22246i S:684 M:21569658 (Ack:244821317)] (S) Msg TX to 1:0000000000000001 [7884] [UDP:[fe80::ee12:c4a5:f800:bf4f%wlp0s20f3]:5540] --- Type 0001:01 (IM:StatusResponse) + [1696947597.398261][20187:20190] CHIP:EM: >>> [E:22246i S:684 M:244821318 (Ack:21569658)] (S) Msg RX from 1:0000000000000001 [7884] --- Type 0001:04 (IM:SubscribeResponse) + [1696947597.398292][20187:20190] CHIP:EM: Found matching exchange: 22246i, Delegate: 0x7fe364020f40 + [1696947597.398314][20187:20190] CHIP:EM: Rxd Ack; Removing MessageCounter:21569658 from Retrans Table on exchange 22246i + [1696947597.398334][20187:20190] CHIP:DMG: SubscribeResponse is received + [1696947597.398356][20187:20190] CHIP:DMG: SubscribeResponseMessage = + [1696947597.398369][20187:20190] CHIP:DMG: { + [1696947597.398382][20187:20190] CHIP:DMG: SubscriptionId = 0x78906430, + [1696947597.398394][20187:20190] CHIP:DMG: MaxInterval = 0x1e, + [1696947597.398407][20187:20190] CHIP:DMG: InteractionModelRevision = 11 + [1696947597.398417][20187:20190] CHIP:DMG: } + [1696947597.398431][20187:20190] CHIP:DMG: Subscription established with SubscriptionID = 0x78906430 MinInterval = 2s MaxInterval = 30s Peer = 01:0000000000000001 disabled: true - label: @@ -546,7 +561,7 @@ tests: SupportedCommands in this ActionStruct) by sending the command with this particular ActionID and a random value for InvokeID" verification: | - Only InstantActions command is supported + Only InstantAction command is supported in bridge-app. When testing with a real DUT, test for all the actions supported by the DUT (list from step 4b): ./chip-tool actions instant-action 0x1001 1 1 @@ -556,11 +571,21 @@ tests: [1659955888.114499][23216:23221] CHIP:DMG: { [1659955888.114515][23216:23221] CHIP:DMG: status = 0x00 (SUCCESS), [1659955888.114529][23216:23221] CHIP:DMG: }, + + + ./chip-tool actions instant-action 0x1003 1 1 + + Via the TH (chip-tool), Verify the SUCCESS response for instant-action. + + [1659955888.114483][23216:23221] CHIP:DMG: StatusIB = + [1659955888.114499][23216:23221] CHIP:DMG: { + [1659955888.114515][23216:23221] CHIP:DMG: status = 0x00 (SUCCESS), + [1659955888.114529][23216:23221] CHIP:DMG: }, disabled: true - label: "Step 4e: repeat 4d for the other SupportedCommands of each ActionStruct" verification: | - Only InstantActions command is supported + Only InstantAction command is supported in bridge-app. When testing with a real DUT, test for all the actions supported by the DUT (list from step 4b) disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml index e6390348f7148e..914718896d97ca 100644 --- a/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACT_3_2.yaml @@ -132,9 +132,7 @@ tests: - label: "Step 2: DUT issues an StartAction command to TH" PICS: ACT.C.C02.Tx verification: | - ./chip-tool actions start-action 0 1 1 - - Note: Message log similar as in step 1 + The reference app doesn't have implementation for this command disabled: true - label: "Step 3: DUT issues an StopAction command to TH" diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml index e5934b40d091bc..d0f2e3029079f0 100644 --- a/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_BIND_2_2.yaml @@ -19,6 +19,7 @@ name: PICS: - BIND.C + - GRPKEY.C config: nodeId: 0x12344321 diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml index 68fd298978f2f6..9c5167aa46c699 100644 --- a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml @@ -19,6 +19,7 @@ name: PICS: - BIND.C + - GRPKEY.C config: nodeId: 0x12344321 diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml index eef7cf54c85715..3131f070d0fce3 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml @@ -65,35 +65,35 @@ tests: type: list contains: [0, 65528, 65529, 65531, 65532, 65533] - - label: "Step 5: Read the global attribute: AcceptedCommandList" + - label: "Step 5: Read the global attribute: EventList" + PICS: BOOL.S.E00 && PICS_EVENT_LIST_ENABLED command: "readAttribute" - attribute: "AcceptedCommandList" + attribute: "EventList" response: - value: [] + value: [0] constraints: type: list - - label: "Step 6: Read the global attribute: GeneratedCommandList" + - label: "Step 5: Read the global attribute: EventList" + PICS: " !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED " command: "readAttribute" - attribute: "GeneratedCommandList" + attribute: "EventList" response: value: [] constraints: type: list - - label: "Step 7: Read the global attribute: EventList" - PICS: BOOL.S.E00 && PICS_EVENT_LIST_ENABLED + - label: "Step 6: Read the global attribute: AcceptedCommandList" command: "readAttribute" - attribute: "EventList" + attribute: "AcceptedCommandList" response: - value: [0] + value: [] constraints: type: list - - label: "Step 7: Read the global attribute: EventList" - PICS: " !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED " + - label: "Step 7: Read the global attribute: GeneratedCommandList" command: "readAttribute" - attribute: "EventList" + attribute: "GeneratedCommandList" response: value: [] constraints: diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml index 2ffa03aca52f0b..000d0c51965dda 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_2.yaml @@ -37,13 +37,13 @@ tests: disabled: true - label: "Step 2a: Bring the DUT into a state so StateValue is FALSE." - PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000 verification: | Manual operation disabled: true - label: "Step 2b: TH reads the StateValue attribute from the DUT." - PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000 verification: | ./chip-tool booleanstate read state-value 1 1 @@ -54,13 +54,13 @@ tests: disabled: true - label: "Step 3a: Bring the DUT into a state so StateValue is TRUE." - PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000 verification: | Manual operation disabled: true - label: "Step 3b: TH reads the StateValue attribute from the DUT." - PICS: BOOL.M.ManuallyControlled && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.A0000 verification: | ./chip-tool booleanstate read state-value 1 1 @@ -71,7 +71,7 @@ tests: disabled: true - label: "Step 4a: Set up subscription to StateChange event." - PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 verification: | This event is not supported in all clusters app, so there are no reference logs. @@ -84,13 +84,13 @@ tests: disabled: true - label: "Step 4b: Bring the DUT into a state so StateValue is FALSE." - PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 verification: | Verify the StateValue value is FALSE On TH(chip-tool), if the state-change event is generated disabled: true - label: "Step 4c: TH reads the StateValue attribute from the DUT." - PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 verification: | This event is not supported in all clusters app, so there are no reference logs. @@ -100,13 +100,13 @@ tests: disabled: true - label: "Step 4d: Bring the DUT into a state so StateValue is TRUE." - PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 verification: | Verify the StateValue value is TRUE On TH(chip-tool), if the state-change event is generated disabled: true - label: "Step 4e: TH reads the StateValue attribute from the DUT." - PICS: BOOL.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 + PICS: BOOL.S.M.ManuallyControlled && BOOL.S.E00 && BOOL.S.A0000 verification: | booleanstate read state-value 1 1 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml index 8ef0e6cf2e13e7..4f26a7153f362a 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_8.yaml @@ -147,15 +147,16 @@ tests: verification: | On TH_CR2 send the below command - Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers + Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers ./chip-tool pairing onnetwork 2 20202021 --commissioner-name beta verify you got the following message in the TH_CR2(CHIP-TOOL) log - CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33 - CHIP:TOO: Secure Pairing Failed - CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout + [1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown + [1700552012.724405][27528:27528] CHIP:DL: BLE shutdown + [1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown + [1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout disabled: true - label: @@ -268,13 +269,14 @@ tests: verification: | On TH_CR3 send the below command - Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers + Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers ./chip-tool pairing onnetwork 3 20202021 --commissioner-name gamma - verify you got the following message in the TH_CR3(Chip-tool) log + Verify you got the following message in the TH_CR3(Chip-tool) log - CHIP:SC: PASESession timed out while waiting for a response from the peer. Expected message type was 33 - CHIP:TOO: Secure Pairing Failed - CHIP:TOO: Pairing Failure: ../../third_party/connectedhomeip/src/protocols/secure_channel/PASESession.cpp:324: CHIP Error 0x00000032: Timeout + [1700552012.724377][27528:27528] CHIP:DL: Inet Layer shutdown + [1700552012.724405][27528:27528] CHIP:DL: BLE shutdown + [1700552012.724445][27528:27528] CHIP:DL: System Layer shutdown + [1700552012.725294][27528:27528] CHIP:TOO: Run command failure: ../../examples/chip-tool/commands/common/CHIPCommand.cpp:589: CHIP Error 0x00000032: Timeout disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml index 5b4e7a489a613f..1b172f32636cab 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml @@ -29,16 +29,11 @@ config: TEST_EVENT_TRIGGER_KEY: type: int64u defaultValue: "0x0000000000000003" + payload: + type: char_string + defaultValue: "MT:-24J0AFN00KA0648G00" tests: - - label: "Wait for the commissioned device to be retrieved" - cluster: "DelayCommands" - command: "WaitForCommissionee" - arguments: - values: - - name: "nodeId" - value: nodeId - - label: "Step 1a: Reset Devices to factory defaults" PICS: PICS_SDK_CI_ONLY cluster: "SystemCommands" @@ -57,6 +52,16 @@ tests: - name: "expectedValue" value: "y" + - label: "Step 1a: TH starts a commissioning process with DUT" + cluster: "CommissionerCommands" + command: "PairWithCode" + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + - label: "Step 1b: Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" @@ -393,6 +398,7 @@ tests: minValue: 0x0 maxValue: 0xFFFFFFFE + #Issue: https://github.com/project-chip/connectedhomeip/issues/29580 - label: "Wait for 2 hours and 5 minutes." PICS: DGGEN.S.A0003 cluster: "DelayCommands" @@ -432,6 +438,16 @@ tests: - name: "expectedValue" value: "y" + - label: "Step 10b: TH starts a commissioning process with DUT" + cluster: "CommissionerCommands" + command: "PairWithCode" + arguments: + values: + - name: "nodeId" + value: nodeId + - name: "payload" + value: payload + - label: "Wait for the commissioned device to be retrieved" cluster: "DelayCommands" command: "WaitForCommissionee" @@ -451,6 +467,7 @@ tests: constraints: type: int32u + #Issue: https://github.com/project-chip/connectedhomeip/issues/29580 - label: "Wait for 1 hour 5 minutes." PICS: DGGEN.S.A0003 cluster: "DelayCommands" diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml index 515b36078dbbb1..ff853e0c7af850 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_3_2.yaml @@ -42,7 +42,7 @@ tests: verification: | ./chip-tool doorlock lock-door 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Lock Door command with SUCCESS response on TH(lock-app) log: + Verify TH receives Lock Door command response on TH(lock-app) log: [1698646727.274715][11887:11887] CHIP:DMG: InvokeRequestMessage = [1698646727.274753][11887:11887] CHIP:DMG: { @@ -75,7 +75,7 @@ tests: verification: | ./chip-tool doorlock unlock-door 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Unlock Door command with SUCCESS response on TH(lock-app) log: + Verify TH receives Unlock Door command response on TH(lock-app) log: [1698646754.942170][11887:11887] CHIP:DMG: InvokeRequestMessage = [1698646754.942214][11887:11887] CHIP:DMG: { @@ -108,7 +108,7 @@ tests: verification: | ./chip-tool doorlock unlock-with-timeout 60 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Unlock with Timeout command with SUCCESS response on TH(lock-app) log: + Verify TH receives Unlock with Timeout command response on TH(lock-app) log: [1698646961.411111][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698646961.411145][11905:11905] CHIP:DMG: { @@ -142,7 +142,7 @@ tests: verification: | ./chip-tool doorlock set-user 0 1 xxx 6452 1 0 0 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Set user command with SUCCESS response on TH(lock-app) log: + Verify TH receives Set user command response on TH(lock-app) log: [1698646982.058610][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698646982.058637][11905:11905] CHIP:DMG: { @@ -253,7 +253,7 @@ tests: verification: | ./chip-tool doorlock clear-week-day-schedule 1 1 1 1 - Verify TH receives Clear Week Day Schedule command with SUCCESS response on TH(lock-app) log: + Verify TH receives Clear Week Day Schedule command response on TH(lock-app) log: [1698646775.513834][11887:11887] CHIP:DMG: InvokeRequestMessage = [1698646775.513862][11887:11887] CHIP:DMG: { @@ -288,7 +288,7 @@ tests: verification: | ./chip-tool doorlock set-year-day-schedule 1 1 1080 2100 1 1 - Verify TH receives Set Year Day Schedule command with SUCCESS response on TH(lock-app) log: + Verify TH receives Set Year Day Schedule command response on TH(lock-app) log: [1698646805.099727][11887:11887] CHIP:DMG: InvokeRequestMessage = [1698646805.099759][11887:11887] CHIP:DMG: { @@ -360,7 +360,7 @@ tests: verification: | ./chip-tool doorlock clear-year-day-schedule 1 1 1 1 - Verify TH receives Clear Year Day Schedule command with SUCCESS response on TH(lock-app) log: + Verify TH receives Clear Year Day Schedule command response on TH(lock-app) log: [1698647125.062059][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647125.062092][11905:11905] CHIP:DMG: { @@ -395,7 +395,7 @@ tests: verification: | ./chip-tool doorlock set-holiday-schedule 1 20 30 0 1 1 - Verify TH receives Set Holiday Day Schedule command with SUCCESS response on TH(lock-app) log: + Verify TH receives Set Holiday Day Schedule command response on TH(lock-app) log: [1698647147.130306][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647147.130327][11905:11905] CHIP:DMG: { @@ -466,7 +466,7 @@ tests: verification: | ./chip-tool doorlock clear-holiday-schedule 1 1 1 - Verify TH receives Clear Holiday Day Schedule command with SUCCESS response on TH(lock-app) log: + Verify TH receives Clear Holiday Day Schedule command response on TH(lock-app) log: [1698647186.638119][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647186.638155][11905:11905] CHIP:DMG: { @@ -500,7 +500,7 @@ tests: verification: | ./chip-tool doorlock set-user 0 2 xxx 6452 1 0 0 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Set User command with SUCCESS response on TH(lock-app) log: + Verify TH receives Set User command response on TH(lock-app) log: [1698647215.994171][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647215.994229][11905:11905] CHIP:DMG: { @@ -574,7 +574,7 @@ tests: verification: | ./chip-tool doorlock clear-user 2 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Clear User command with SUCCESS response on TH(lock-app) log: + Verify TH receives Clear User command response on TH(lock-app) log: [1698647262.792533][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647262.792569][11905:11905] CHIP:DMG: { @@ -691,7 +691,7 @@ tests: verification: | ./chip-tool doorlock clear-credential '{ "credentialType" : 1 , "credentialIndex" : 1 }' 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Clear Credential command with SUCCESS response on TH(lock-app) log: + Verify TH receives Clear Credential command response on TH(lock-app) log: [1698647366.030707][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647366.030759][11905:11905] CHIP:DMG: { @@ -729,7 +729,7 @@ tests: verification: | ./chip-tool doorlock clear-user 1 1 1 --timedInteractionTimeoutMs 1000 - Verify TH receives Clear User command with SUCCESS response on TH(lock-app) log: + Verify TH receives Clear User command response on TH(lock-app) log: [1698647393.727713][11905:11905] CHIP:DMG: InvokeRequestMessage = [1698647393.727764][11905:11905] CHIP:DMG: { diff --git a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml index 9cc0cd99ce620d..4c8c353439a308 100644 --- a/src/app/tests/suites/certification/Test_TC_G_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_G_2_2.yaml @@ -46,11 +46,12 @@ tests: - label: "Step 1a: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT on EP0 using a key that is pre-installed on the TH. - GroupKeySet fields are as follows: GroupKeySetID: 1 - GroupKeySecurityPolicy: TrustFirst (0) EpochKey0: - 0d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1: - 0d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2: - 0d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002" + GroupKeySet fields are as follows: GroupKeySetID: 1, + GroupKeySecurityPolicy: TrustFirst (0), EpochKey0: + d0d1d2d3d4d5d6d7d8d9dadbdcdddedf, EpochStartTime0: 1, EpochKey1: + d1d1d2d3d4d5d6d7d8d9dadbdcdddedf, EpochStartTime1: + 18446744073709551613, EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf, + EpochStartTime2: 18446744073709551614" verification: | ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0 @@ -1135,16 +1136,16 @@ tests: unicast with the following fields: GroupID as 0x0002" PICS: G.S.C01.Rsp && G.S.C01.Tx verification: | - ./chip-tool groups view-group 0x0001 1 0 + ./chip-tool groups view-group 0x0002 1 0 Verify the ViewGroupResponse with status as NOT_FOUND on the TH(Chip-tool) Log and below is the sample log provided for the raspi platform: - [1653559917.259920][3227:3232] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001 - [1653559917.259993][3227:3232] CHIP:TOO: ViewGroupResponse: { - [1653559917.260040][3227:3232] CHIP:TOO: status: 139 - [1653559917.260075][3227:3232] CHIP:TOO: groupId: 1 - [1653559917.260107][3227:3232] CHIP:TOO: groupName: - [1653559917.260138][3227:3232] CHIP:TOO: } + [1700468046.366768][31682:31684] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_0004 Command 0x0000_0001 + [1700468046.366826][31682:31684] CHIP:TOO: ViewGroupResponse: { + [1700468046.366841][31682:31684] CHIP:TOO: status: 139 + [1700468046.366853][31682:31684] CHIP:TOO: groupID: 2 + [1700468046.366863][31682:31684] CHIP:TOO: groupName: + [1700468046.366874][31682:31684] CHIP:TOO: } disabled: true - label: diff --git a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml index d0810179e9bcf5..c5a28ddcdfc0e1 100644 --- a/src/app/tests/suites/certification/Test_TC_G_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_G_2_3.yaml @@ -48,9 +48,10 @@ tests: cluster to DUT on EP0 using a key that is pre-installed on the TH. GroupKeySet fields are as follows: GroupKeySetID: 1 GroupKeySecurityPolicy: TrustFirst (0) EpochKey0: - d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 2220000 EpochKey1: - d1d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 2220001 EpochKey2: - d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: 2220002" + d0d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime0: 1 EpochKey1: + d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime1: 18446744073709551613 + EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf EpochStartTime2: + 18446744073709551614" verification: | ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 1,"groupKeySecurityPolicy": 0, "epochKey0":"d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 1,"epochKey1":"d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 18446744073709551613,"epochKey2":"d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 18446744073709551614 }' 1 0 diff --git a/src/app/tests/suites/certification/Test_TC_G_2_4.yaml b/src/app/tests/suites/certification/Test_TC_G_2_4.yaml index 39647c2df3c00d..2941e036caf848 100644 --- a/src/app/tests/suites/certification/Test_TC_G_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_G_2_4.yaml @@ -70,11 +70,11 @@ tests: GroupKeySetID: 1, GroupKeySecurityPolicy: 0, EpochKey0: "hex:d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime0: 2220000, + EpochStartTime0: 1, EpochKey1: "hex:d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime1: 2220001, + EpochStartTime1: 18446744073709551613, EpochKey2: "hex:d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", - EpochStartTime2: 2220002, + EpochStartTime2: 18446744073709551614, } - label: diff --git a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml index 4406ce4a66dbae..0794abc3046643 100644 --- a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml @@ -75,7 +75,16 @@ tests: type: list contains: [0, 1, 65528, 65529, 65531, 65532, 65533] - - label: "Step 5: Read the global attribute: AcceptedCommandList" + - label: "Step 5: Read EventList attribute from the DUT." + PICS: PICS_EVENT_LIST_ENABLED + command: "readAttribute" + attribute: "EventList" + response: + value: [] + constraints: + type: list + + - label: "Step 6a: Read the global attribute: AcceptedCommandList" command: "readAttribute" attribute: "AcceptedCommandList" response: @@ -84,7 +93,7 @@ tests: contains: [0] - label: - "Step 6: Read the optional command(TriggerEffect) in + "Step 6b: Read the optional command(TriggerEffect) in AcceptedCommandList" PICS: I.S.C40.Rsp command: "readAttribute" @@ -104,14 +113,13 @@ tests: # type: list # contains: [1] - - label: "Step 6: Read the global attribute: GeneratedCommandList" + - label: "Step 7: Read the global attribute: GeneratedCommandList" command: "readAttribute" attribute: "GeneratedCommandList" response: value: [] constraints: type: list - #Commenting out the step IdentifyQueryResponse (0x00) is not supported by Matter 1.0 #- label: # "Read the optional command(IdentifyQueryResponse) in @@ -123,13 +131,3 @@ tests: # value: [0] # constraints: # type: list - - #Manufacturer specific event IDs check not possible - - label: "Step 7: Read EventList attribute from the DUT." - PICS: PICS_EVENT_LIST_ENABLED - command: "readAttribute" - attribute: "EventList" - response: - value: [] - constraints: - type: list diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml index edcc8d93abeed1..a508ccefc14640 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_3.yaml @@ -389,18 +389,19 @@ tests: [1684167429.421129][29723:29723] CHIP:IN: Joined multicast group on interface wlp0s20f3 Verify the DSIZ flag is set to Group On TH(Reference app) log: - (Here in below log the value recived is 0X04 = 0100 (decimal) - Here the bit 2 is enabled then DSIZ flag is set to group) - - [1686317564.742205][7679:7679] CHIP:DMG: Header Flags = - [1686317564.742207][7679:7679] CHIP:DMG: { - [1686317564.742212][7679:7679] CHIP:DMG: Message (0x04) = - [1686317564.742214][7679:7679] CHIP:DMG: { - [1686317564.742217][7679:7679] CHIP:DMG: SourceNodeId = C831420E9B16886B - [1686317564.742219][7679:7679] CHIP:DMG: } - [1686317564.742224][7679:7679] CHIP:DMG: Exchange (0x03) = - [1686317564.742226][7679:7679] CHIP:DMG: { - [1686317564.742228][7679:7679] CHIP:DMG: Initiator = true - [1686317564.742231][7679:7679] CHIP:DMG: AckMsg = 48718950 - [1686317564.742233][7679:7679] CHIP:DMG: } - [1686317564.742237][7679:7679] CHIP:DMG: } + (Here in below log the value received is 0X06 = 0110 (binary) - Here the S Flag (1 bit, position 2) is enabled as SourceNodeID is present and DISZ has a value 2(10) as the Destination Node ID field is present as a 16-bit Group + [1700720496.175477][40754:40754] CHIP:DMG: Header Flags = + [1700720496.175481][40754:40754] CHIP:DMG: { + [1700720496.175485][40754:40754] CHIP:DMG: Security (0x01) = + [1700720496.175489][40754:40754] CHIP:DMG: { + [1700720496.175492][40754:40754] CHIP:DMG: } + [1700720496.175497][40754:40754] CHIP:DMG: Message (0x06) = + [1700720496.175500][40754:40754] CHIP:DMG: { + [1700720496.175505][40754:40754] CHIP:DMG: SourceNodeId = 000000000001B669 + [1700720496.175508][40754:40754] CHIP:DMG: DestinationGroupIdPresent = 0x0103 + [1700720496.175512][40754:40754] CHIP:DMG: } + [1700720496.175519][40754:40754] CHIP:DMG: Exchange (0x01) = + [1700720496.175523][40754:40754] CHIP:DMG: { + [1700720496.175525][40754:40754] CHIP:DMG: Initiator = true + [1700720496.175529][40754:40754] CHIP:DMG: } disabled: true diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml index 35e48f646d470a..fff00b744700c9 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_2.yaml @@ -63,7 +63,7 @@ tests: [1697604266.130640][7393:7395] CHIP:DMG: } disabled: true - - label: "Step 2b: Operator sets switch to first position" + - label: "Step 2b: Operator sets switch to first position (zero) on the DUT" PICS: SWTCH.S.F00 verification: | On Raspi platform to trigger the event, give the below command by opening an another terminal in DUT @@ -80,7 +80,7 @@ tests: [1697604377.955474][7384:7384] CHIP:EVL: LogEvent event number: 0x0000000000000006 priority: 1, endpoint id: 0x1 cluster id: 0x0000_003B event id: 0x0 Epoch timestamp: 0x0000018B411B1D63 disabled: true - - label: "Step 2c: Read CurrentPosition attribute" + - label: "Step 2c: TH reads the CurrentPosition attribute from the DUT" PICS: SWTCH.S.F00 verification: | switch read current-position 1 1 @@ -91,7 +91,7 @@ tests: [1646209289.746228][2617:2622] CHIP:TOO: CurrentPosition: 0 disabled: true - - label: "Step 2d: Operator sets switch to second position" + - label: "Step 2d: Operator sets switch to second position (one) on the DUT" PICS: SWTCH.S.F00 verification: | On Raspi platform to trigger the event give the below command by opening an another terminal in DUT @@ -119,7 +119,7 @@ tests: [1687257297.110349][17168:17170] CHIP:TOO: } disabled: true - - label: "Step 2e: Read CurrentPosition attribute" + - label: "Step 2e: TH reads CurrentPosition attribute from the DUT" PICS: SWTCH.S.F00 verification: | switch read current-position 1 1 @@ -132,7 +132,8 @@ tests: - label: "Step 2f: If NumberOfPositions>2 (see 2a of TC-SWTCH-2.1) : - Operator - sets switch to next position - Read CurrentPosition attribute" + sets switch to next position on the DUT - TH reads the CurrentPosition + attribute from the DUT" PICS: SWTCH.S.F00 verification: | If NumberOfPositions>2, then Set switch to next position Otherwise skip this step. @@ -179,7 +180,8 @@ tests: - label: "Step 2g: If NumberOfPositions>3 : - Repeat step 2f for NumberOfPositions-3 times - After each time Operator has set switch to - next position, - Read CurrentPosition attribute" + next position on the DUT, - TH reads CurrentPosition attribute from + the DUT" PICS: SWTCH.S.F00 verification: | If NumberOfPositions>3, then Set the switch to next position Otherwise skip this step. @@ -219,7 +221,7 @@ tests: [1687258513.235239][17561:17563] CHIP:TOO: } disabled: true - - label: "Step 2h: Operator returns switch to first position" + - label: "Step 2h: Operator returns switch to first position on the DUT" PICS: SWTCH.S.F00 verification: | On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event) @@ -248,7 +250,7 @@ tests: [1697606183.274373][7536:7538] CHIP:TOO: } disabled: true - - label: "Step 2i: Read CurrentPosition attribute" + - label: "Step 2i: TH reads the CurrentPosition attribute from the DUT" PICS: SWTCH.S.F00 verification: | switch read current-position 1 1 @@ -280,13 +282,13 @@ tests: [1697606330.207014][7536:7538] CHIP:DMG: } disabled: true - - label: "Step 3b: Operator does not operate switch" + - label: "Step 3b: Operator does not operate switch on the DUT" PICS: SWTCH.S.F01 verification: | no Matter messages disabled: true - - label: "Step 3c: Read CurrentPosition attribute" + - label: "Step 3c: TH reads the CurrentPosition attribute from the DUT" PICS: SWTCH.S.F01 verification: | switch read current-position 1 1 @@ -329,7 +331,7 @@ tests: [1697606630.390851][7536:7538] CHIP:TOO: } disabled: true - - label: "Step 3e: Read CurrentPosition attribute" + - label: "Step 3e: TH reads the CurrentPosition attribute from the DUT" PICS: SWTCH.S.F01 verification: | switch read current-position 1 1 @@ -340,7 +342,7 @@ tests: [1687847982.359195][19398:19400] CHIP:TOO: CurrentPosition: 1 disabled: true - - label: "Step 3f: Operator releases switch" + - label: "Step 3f: Operator releases switch on the DUT" PICS: SWTCH.S.F01 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -360,7 +362,7 @@ tests: [1697606778.141592][7384:7384] CHIP:EVL: LogEvent event number: 0x000000000000000D priority: 1, endpoint id: 0x1 cluster id: 0x0000_003B event id: 0x3 Epoch timestamp: 0x0000018B413FBD1D disabled: true - - label: "Step 3g: Read CurrentPosition attribute" + - label: "Step 3g: TH reads the CurrentPosition attribute from the DUT" PICS: SWTCH.S.F01 verification: | switch read current-position 1 1 @@ -404,13 +406,13 @@ tests: [1697607082.641233][7736:7738] CHIP:DMG: } disabled: true - - label: "Step 4b: Operator does not operate switch" + - label: "Step 4b: Operator does not operate switch on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F02 && !SWTCH.S.F03 verification: | no Matter messages disabled: true - - label: "Step 4c: Operator operates switch (press briefly)" + - label: "Step 4c: Operator operates switch (press briefly) on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F02 && !SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -442,7 +444,7 @@ tests: [1697607828.913054][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 4d: Operator releases switch" + - label: "Step 4d: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F02 && !SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -475,7 +477,7 @@ tests: - label: "Step 4e: Operator operates switch (keep pressed for long time, e.g. 5 - seconds)" + seconds) on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F02 && !SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -506,7 +508,7 @@ tests: [1697608164.378219][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 4f: Operator releases switch" + - label: "Step 4f: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F02 && !SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -594,13 +596,13 @@ tests: [1697608657.944751][7767:7769] CHIP:DMG: } disabled: true - - label: "Step 5b: Operator does not operate switch" + - label: "Step 5b: Operator does not operate switch on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F03 verification: | no Matter messages disabled: true - - label: "Step 5c: Operator operates switch (press briefly)" + - label: "Step 5c: Operator operates switch (press briefly) on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -631,7 +633,7 @@ tests: [1697608808.722385][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 5d: Operator releases switch" + - label: "Step 5d: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -664,7 +666,7 @@ tests: - label: "Step 5e: Operator operates switch (keep pressed for long time, e.g. 5 - seconds)" + seconds) on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -724,7 +726,7 @@ tests: [1697609316.967402][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 5f: Operator releases switch" + - label: "Step 5f: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F03 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -813,13 +815,13 @@ tests: [1697609646.344688][7767:7769] CHIP:DMG: } disabled: true - - label: "Step 6b: Operator does not operate switch" + - label: "Step 6b: Operator does not operate switch on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | no Matter messages for this step disabled: true - - label: "Step 6c: Operator operates switch (press briefly)" + - label: "Step 6c: Operator operates switch (press briefly) on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -850,7 +852,7 @@ tests: [1697609943.498325][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 6d: Operator releases switch" + - label: "Step 6d: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -910,7 +912,7 @@ tests: [1697610193.287285][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 6e: Operator operates switch (press briefly)" + - label: "Step 6e: Operator operates switch (press briefly) on the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -941,7 +943,7 @@ tests: [1697609943.498325][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 6f: Operator releases switch" + - label: "Step 6f: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -974,8 +976,8 @@ tests: disabled: true - label: - "Step 6g: Briefly after 6f, operator operates switch again (press - briefly)" + "Step 6g: Briefly after 6f, Operator operates switch again on the + DUT(press briefly)" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -1034,7 +1036,7 @@ tests: [1697610464.005872][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 6h: Operator releases switch" + - label: "Step 6h: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -1102,7 +1104,7 @@ tests: no Matter messages for this step disabled: true - - label: "Step 6j: Operator operates switch (press briefly)" + - label: "Step 6j: Operator operates switch (press briefly) on the DUT" PICS: "" verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -1133,7 +1135,7 @@ tests: [1697609943.498325][7767:7769] CHIP:TOO: } disabled: true - - label: "Step 6k: Operator releases switch" + - label: "Step 6k: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -1166,8 +1168,8 @@ tests: disabled: true - label: - "Step 6l: Briefly after 6k, operator operates switch again (press - briefly)" + "Step 6l: Briefly after 6k, operator operates switch again on the DUT + (press briefly)" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -1226,7 +1228,7 @@ tests: [1659695330.923385][3912:3918] CHIP:TOO: } disabled: true - - label: "Step 6m: Operator releases switch" + - label: "Step 6m: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -1316,7 +1318,7 @@ tests: [1659698336.786360][4081:4086] CHIP:TOO: } disabled: true - - label: "Step 6o: Operator releases switch" + - label: "Step 6o: Operator releases switch from the DUT" PICS: SWTCH.S.F01 && SWTCH.S.F04 verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml index 7a933ed6eaac04..3541d05d6183c5 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_3_2.yaml @@ -91,9 +91,9 @@ tests: disabled: true - label: - "Step 0g: FAIL the test - at least one of SWTCH.C.M.RA and - SWTCH.C.M.EV must be supported" - PICS: "!SWTCH.C.M.RA && !SWTCH.C.M.EV" + "Step 0g: FAIL the test - at least one of SWTCH.C.M.SwitchStatePolling + and SWTCH.C.M.SwitchStateEventing must be supported" + PICS: "!SWTCH.C.M.SwitchStatePolling && !SWTCH.C.M.SwitchStateEventing" verification: | no messages needed, TH checks consistency of PICS flags disabled: true @@ -185,7 +185,7 @@ tests: - label: "Step 1d: DUT sets up eventing (SwitchLatched) so it will receive events when the switch is operated." - PICS: SWTCH.C.F00 && SWTCH.C.M.EV + PICS: SWTCH.C.F00 && SWTCH.C.M.SwitchStateEventing verification: | On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event) @@ -219,7 +219,7 @@ tests: "Step 2a: TH simulates operation of the switch by changing state (attribute CurrentPosition) from 0 to 1 and back every 10 seconds (over a 1 minute period) DUT reads attribute CurrentPosition regularly" - PICS: SWTCH.C.F00 && SWTCH.C.M.RA + PICS: SWTCH.C.F00 && SWTCH.C.M.SwitchStatePolling verification: | On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event) @@ -319,7 +319,7 @@ tests: (attribute CurrentPosition) from 0 to 1 and back every 10 seconds (over a 1 minute period), and sending the event SwitchLatched (with field NewPosition reflecting the new state) on every change" - PICS: SWTCH.C.F00 && SWTCH.C.M.EV + PICS: SWTCH.C.F00 && SWTCH.C.M.SwitchStateEventing verification: | On Raspi platform to trigger the event give the below command by opening an another terminal in DUT (Below is the example command developed in all-clusters-app to generate the event, Vendor DUT should have capability to generate this event) @@ -482,7 +482,7 @@ tests: "Step 3d: DUT sets up eventing (InitialPress and ShortRelease; if SWTCH.C.F03(MSL) also LongPress and LongRelease) so it will receive events when the switch is operated" - PICS: SWTCH.C.F01 && SWTCH.C.M.EV + PICS: SWTCH.C.F01 && SWTCH.C.M.SwitchStateEventing verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -600,7 +600,7 @@ tests: CurrentPosition) from 0 to 1 wait 0.2 seconds change state (attribute CurrentPosition) from 1 to 0 wait 10 seconds DUT reads attribute CurrentPosition regularly" - PICS: SWTCH.C.F01 && SWTCH.C.M.RA + PICS: SWTCH.C.F01 && SWTCH.C.M.SwitchStatePolling verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -705,7 +705,7 @@ tests: field NewPosition=1) wait 0.2 seconds change state (attribute CurrentPosition) from 1 to 0, and send the event ShortRelease (with field PreviousPosition=1) wait 10 seconds" - PICS: SWTCH.C.F01 && SWTCH.C.M.EV + PICS: SWTCH.C.F01 && SWTCH.C.M.SwitchStateEventing verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. @@ -777,7 +777,7 @@ tests: NewPosition=1) wait 2 seconds change state (field CurrentPosition) from 1 to 0, and send the event LongRelease (with field PreviousPosition=1) wait 8 seconds" - PICS: SWTCH.C.F01 && SWTCH.C.F03 && SWTCH.C.M.EV + PICS: SWTCH.C.F01 && SWTCH.C.F03 && SWTCH.C.M.SwitchStateEventing verification: | Note : Please skip this step if LATCH SWITCH feature is implemented, because a device can support either a latching switch or a momentary switch. diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values index 77167aa6f46673..577bc287065a3d 100644 --- a/src/app/tests/suites/certification/ci-pics-values +++ b/src/app/tests/suites/certification/ci-pics-values @@ -707,8 +707,8 @@ SWTCH.C.F01=1 SWTCH.C.F02=1 SWTCH.C.F03=1 SWTCH.C.F04=1 -SWTCH.C.M.RA=1 -SWTCH.C.M.EV=1 +SWTCH.C.M.SwitchStatePolling=1 +SWTCH.C.M.SwitchStateEventing=1 SWTCH.C.AM-READ=0 SWTCH.C.AM-WRITE=0 SWTCH.C.AO-READ=0 @@ -1202,7 +1202,7 @@ ACT.C.C0b.Tx=0 # Boolean State Cluster BOOL.S=1 BOOL.S.A0000=1 -BOOL.M.ManuallyControlled=1 +BOOL.S.M.ManuallyControlled=1 BOOL.S.E00=0 BOOL.C=1 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 5ac773479b3c86..66ba73d3badbf2 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -6469,29 +6469,29 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { err = TestStep4ReadTheGlobalAttributeAttributeList_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: Read the global attribute: AcceptedCommandList\n"); - err = TestStep5ReadTheGlobalAttributeAcceptedCommandList_5(); - break; - case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6: Read the global attribute: GeneratedCommandList\n"); - err = TestStep6ReadTheGlobalAttributeGeneratedCommandList_6(); - break; - case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Step 7: Read the global attribute: EventList\n"); + ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: Read the global attribute: EventList\n"); if (ShouldSkip("BOOL.S.E00 && PICS_EVENT_LIST_ENABLED")) { NextTest(); return; } NextTest(); return; - case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: Read the global attribute: EventList\n"); + case 6: + ChipLogProgress(chipTool, " ***** Test Step 6 : Step 5: Read the global attribute: EventList\n"); if (ShouldSkip(" !BOOL.S.E00 && PICS_EVENT_LIST_ENABLED ")) { NextTest(); return; } NextTest(); return; + case 7: + ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6: Read the global attribute: AcceptedCommandList\n"); + err = TestStep6ReadTheGlobalAttributeAcceptedCommandList_7(); + break; + case 8: + ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: Read the global attribute: GeneratedCommandList\n"); + err = TestStep7ReadTheGlobalAttributeGeneratedCommandList_8(); + break; } if (CHIP_NO_ERROR != err) { @@ -6672,7 +6672,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep5ReadTheGlobalAttributeAcceptedCommandList_5() + CHIP_ERROR TestStep6ReadTheGlobalAttributeAcceptedCommandList_7() { MTRBaseDevice * device = GetDevice("alpha"); @@ -6681,9 +6681,9 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Error: %@", err); + NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Error: %@", err); } else { - NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Success"); + NSLog(@"Step 6: Read the global attribute: AcceptedCommandList: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -6700,7 +6700,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6ReadTheGlobalAttributeGeneratedCommandList_6() + CHIP_ERROR TestStep7ReadTheGlobalAttributeGeneratedCommandList_8() { MTRBaseDevice * device = GetDevice("alpha"); @@ -6709,9 +6709,9 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Error: %@", err); + NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err); } else { - NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Success"); + NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -57189,29 +57189,29 @@ class Test_TC_I_1_1 : public TestCommandBridge { err = TestStep4ThReadsAttributeListFromDut_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: Read the global attribute: AcceptedCommandList\n"); - err = TestStep5ReadTheGlobalAttributeAcceptedCommandList_5(); - break; - case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6: Read the optional command(TriggerEffect) in AcceptedCommandList\n"); - if (ShouldSkip("I.S.C40.Rsp")) { + ChipLogProgress(chipTool, " ***** Test Step 5 : Step 5: Read EventList attribute from the DUT.\n"); + if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) { NextTest(); return; } - err = TestStep6ReadTheOptionalCommandTriggerEffectInAcceptedCommandList_6(); + NextTest(); + return; + case 6: + ChipLogProgress(chipTool, " ***** Test Step 6 : Step 6a: Read the global attribute: AcceptedCommandList\n"); + err = TestStep6aReadTheGlobalAttributeAcceptedCommandList_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6: Read the global attribute: GeneratedCommandList\n"); - err = TestStep6ReadTheGlobalAttributeGeneratedCommandList_7(); - break; - case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: Read EventList attribute from the DUT.\n"); - if (ShouldSkip("PICS_EVENT_LIST_ENABLED")) { + ChipLogProgress(chipTool, " ***** Test Step 7 : Step 6b: Read the optional command(TriggerEffect) in AcceptedCommandList\n"); + if (ShouldSkip("I.S.C40.Rsp")) { NextTest(); return; } - NextTest(); - return; + err = TestStep6bReadTheOptionalCommandTriggerEffectInAcceptedCommandList_7(); + break; + case 8: + ChipLogProgress(chipTool, " ***** Test Step 8 : Step 7: Read the global attribute: GeneratedCommandList\n"); + err = TestStep7ReadTheGlobalAttributeGeneratedCommandList_8(); + break; } if (CHIP_NO_ERROR != err) { @@ -57393,7 +57393,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep5ReadTheGlobalAttributeAcceptedCommandList_5() + CHIP_ERROR TestStep6aReadTheGlobalAttributeAcceptedCommandList_6() { MTRBaseDevice * device = GetDevice("alpha"); @@ -57402,9 +57402,9 @@ class Test_TC_I_1_1 : public TestCommandBridge { [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Error: %@", err); + NSLog(@"Step 6a: Read the global attribute: AcceptedCommandList: Error: %@", err); } else { - NSLog(@"Step 5: Read the global attribute: AcceptedCommandList: Success"); + NSLog(@"Step 6a: Read the global attribute: AcceptedCommandList: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -57418,7 +57418,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6ReadTheOptionalCommandTriggerEffectInAcceptedCommandList_6() + CHIP_ERROR TestStep6bReadTheOptionalCommandTriggerEffectInAcceptedCommandList_7() { MTRBaseDevice * device = GetDevice("alpha"); @@ -57427,9 +57427,9 @@ class Test_TC_I_1_1 : public TestCommandBridge { [cluster readAttributeAcceptedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 6: Read the optional command(TriggerEffect) in AcceptedCommandList: Error: %@", err); + NSLog(@"Step 6b: Read the optional command(TriggerEffect) in AcceptedCommandList: Error: %@", err); } else { - NSLog(@"Step 6: Read the optional command(TriggerEffect) in AcceptedCommandList: Success"); + NSLog(@"Step 6b: Read the optional command(TriggerEffect) in AcceptedCommandList: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); @@ -57443,7 +57443,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestStep6ReadTheGlobalAttributeGeneratedCommandList_7() + CHIP_ERROR TestStep7ReadTheGlobalAttributeGeneratedCommandList_8() { MTRBaseDevice * device = GetDevice("alpha"); @@ -57452,9 +57452,9 @@ class Test_TC_I_1_1 : public TestCommandBridge { [cluster readAttributeGeneratedCommandListWithCompletion:^(NSArray * _Nullable value, NSError * _Nullable err) { if (err != nil) { - NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Error: %@", err); + NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Error: %@", err); } else { - NSLog(@"Step 6: Read the global attribute: GeneratedCommandList: Success"); + NSLog(@"Step 7: Read the global attribute: GeneratedCommandList: Success"); } VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));