From 09109c5069f7cc2185e5486d603314f02c00c90d Mon Sep 17 00:00:00 2001 From: manjunath-grl <102359958+manjunath-grl@users.noreply.github.com> Date: Fri, 19 Jan 2024 22:54:30 +0530 Subject: [PATCH] YAML script issue fix Dec 12 (#30951) * Fixes issue: 77, 78, 79 TC-BINFO-2.1 TC-BRBINFO-2.1 TC-SC-5.1 TC-SC-5.2 * Modified OO-1.1 as per testplan ClusterRevision value to 5. * Modified BINFO-2.1 PICS * Disable the BINFO-2.1 tests in chip-repl * Fixes issue 80 and tolerance issue in CC-3.2 script. * Fixes issue 82 Modifed tests TC-CNET-4.5 TC-CNET-4.11 --- scripts/tests/chiptest/__init__.py | 1 + src/app/tests/suites/certification/PICS.yaml | 6 ++ .../certification/Test_TC_BINFO_2_1.yaml | 85 ++++++++++++++++++- .../certification/Test_TC_BRBINFO_2_1.yaml | 32 +++++++ .../suites/certification/Test_TC_CC_3_2.yaml | 16 ++-- .../suites/certification/Test_TC_CC_3_3.yaml | 2 +- .../certification/Test_TC_CNET_4_11.yaml | 4 +- .../certification/Test_TC_CNET_4_5.yaml | 2 +- .../suites/certification/Test_TC_OO_1_1.yaml | 3 +- .../suites/certification/Test_TC_SC_5_1.yaml | 37 +++++--- .../suites/certification/Test_TC_SC_5_2.yaml | 46 +++++----- .../tests/suites/certification/ci-pics-values | 2 + .../zap-generated/test/Commands.h | 22 ++--- 13 files changed, 203 insertions(+), 55 deletions(-) diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py index 6e52020cb9a9ee..1adf7de8efe3d8 100644 --- a/scripts/tests/chiptest/__init__.py +++ b/scripts/tests/chiptest/__init__.py @@ -199,6 +199,7 @@ def _GetChipReplUnsupportedTests() -> Set[str]: "Test_TC_ACL_2_5.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884 "Test_TC_ACL_2_6.yaml", # chip-repl does not support LastReceivedEventNumber : https://github.com/project-chip/connectedhomeip/issues/28884 "Test_TC_RVCCLEANM_3_3.yaml", # chip-repl does not support EqualityCommands pseudo-cluster + "Test_TC_BINFO_2_1.yaml", # chip-repl does not support EqualityCommands pseudo-cluster } diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml index 16aad6fe3e8d37..66e789fa246914 100644 --- a/src/app/tests/suites/certification/PICS.yaml +++ b/src/app/tests/suites/certification/PICS.yaml @@ -2006,6 +2006,12 @@ PICS: - label: "Does the DUT(server) support the ProductAppearance attribute?" id: BINFO.S.A0014 + - label: "Does the DUT(server) support the SpecificationVersion attribute?" + id: BINFO.S.A0015 + + - label: "Does the DUT(server) support the MaxPathsPerInvoke attribute?" + id: BINFO.S.A0016 + ##### - label: "Does the DUT(server) support the NOC list attribute?" id: OPCREDS.S.A0000 diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml index b3f1cea227d689..7f445619a90cc8 100644 --- a/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml @@ -11,7 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default name: 11.2.1. [TC-BINFO-2.1] Attributes [DUT-Server] @@ -720,3 +719,87 @@ tests: attribute: "ProductAppearance" response: value: ProductAppearancevalue + + - label: "Step 62: TH reads SpecificationVersion from the DUT." + PICS: BINFO.S.A0015 + command: "readAttribute" + attribute: "SpecificationVersion" + response: + saveAs: SpecificationVersionValue + + - label: + "Step 62: If the SpecificationVersion value is absent or zero this + step cannot be verified, move on to the next step" + PICS: BINFO.S.A0015 + cluster: "EqualityCommands" + command: "UnsignedNumberEquals" + arguments: + values: + - name: "Value1" + value: SpecificationVersionValue + - name: "Value2" + value: null + response: + - values: + - name: "Equals" + saveAs: IsExpectedValue + + - label: + "Step 62: SpecificationVersion value should in the inclusive range of + (0 to 4294967295) and the initial 7 bits are set to zero." + runIf: "!IsExpectedValue" + PICS: BINFO.S.A0015 + command: "readAttribute" + attribute: "SpecificationVersion" + response: + value: SpecificationVersionValue + constraints: + minValue: 0 + maxValue: 4294967295 + hasMasksClear: [0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40] + + - label: + "Step 63: TH sends Write request message to DUT to change the value of + SpecificationVersion to '0x0103AAF1'." + PICS: BINFO.S.A0015 + command: "writeAttribute" + attribute: "SpecificationVersion" + arguments: + value: "0x0103AAF1" + response: + error: UNSUPPORTED_WRITE + + - label: "Step 64: TH reads SpecificationVersion attribute from DUT" + PICS: BINFO.S.A0015 + command: "readAttribute" + attribute: "SpecificationVersion" + response: + value: SpecificationVersionValue + + - label: "Step 65: TH reads MaxPathsPerInvoke from the DUT." + PICS: BINFO.S.A0016 + command: "readAttribute" + attribute: "MaxPathsPerInvoke" + response: + saveAs: MaxPathsPerInvokeValue + constraints: + minValue: 1 + maxValue: 65535 + + - label: + "Step 66: TH sends Write request message to DUT to change + MaxPathsPerInvoke to a different value." + PICS: BINFO.S.A0016 + command: "writeAttribute" + attribute: "MaxPathsPerInvoke" + arguments: + value: 12345 + response: + error: UNSUPPORTED_WRITE + + - label: "Step 67: TH reads MaxPathsPerInvoke attribute from DUT" + PICS: BINFO.S.A0016 + command: "readAttribute" + attribute: "MaxPathsPerInvoke" + response: + value: MaxPathsPerInvokeValue diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml index 221cd35b5ed526..a0b87e6c3897b9 100644 --- a/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BRBINFO_2_1.yaml @@ -619,3 +619,35 @@ tests: attribute: "ProductAppearance" response: value: ProductAppearancevalue + + - label: + "Step 62: TH reads attribute ID 0x0015 from the DUT (matches in ID to + CapabilityMinima in the parent cluster, but is absent on the + BridgedDeviceBasicInformation cluster)." + PICS: BRBINFO.S + cluster: "AnyCommands" + command: "ReadById" + arguments: + values: + - name: "ClusterId" + value: BRBINFO.ClusterId + - name: "AttributeId" + value: 0x0015 + response: + error: UNSUPPORTED_ATTRIBUTE + + - label: + "Step 63: TH reads attribute ID 0x0016 from the DUT (matches in ID to + CapabilityMinima in the parent cluster, but is absent on the + BridgedDeviceBasicInformation cluster)." + PICS: BRBINFO.S + cluster: "AnyCommands" + command: "ReadById" + arguments: + values: + - name: "ClusterId" + value: BRBINFO.ClusterId + - name: "AttributeId" + value: 0x0016 + response: + error: UNSUPPORTED_ATTRIBUTE 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 f27e9dc762ead0..0c21f1a6ffcfb1 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 @@ -128,14 +128,16 @@ tests: - name: "ms" value: 10000 + #Tolerance to be computed from the range + #Start value 200, expected value 45, 200 - 45 = 155, 155 % 15 = 23 , So 45+/-23 - label: "Step 2d: TH reads CurrentHue attribute from DUT" PICS: CC.S.F00 && CC.S.A0000 command: "readAttribute" attribute: "CurrentHue" response: constraints: - minValue: 38 - maxValue: 52 + minValue: 22 + maxValue: 68 - label: "Wait 10s" PICS: CC.S.F00 @@ -162,14 +164,16 @@ tests: - name: "OptionsOverride" value: 0 + #Tolerance to be computed from the range + #Start value 200, expected value 95, 200 - 95 = 155, 105 % 15 = 16 , So 95+/-16 - label: "Step 2f: TH reads CurrentHue attribute from DUT" PICS: CC.S.F00 && CC.S.A0000 command: "readAttribute" attribute: "CurrentHue" response: constraints: - minValue: 80 - maxValue: 110 + minValue: 79 + maxValue: 111 - label: "Wait 2s" PICS: CC.S.F00 @@ -186,8 +190,8 @@ tests: attribute: "CurrentHue" response: constraints: - minValue: 80 - maxValue: 110 + minValue: 79 + maxValue: 111 - label: "Step 3a: TH sends MoveToHue command to DUT with Hue=60, 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 9bf07a69c99e66..53175d974716ea 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 @@ -150,7 +150,7 @@ tests: #Multiple range not supported in YAML: https://github.com/project-chip/connectedhomeip/issues/23197 - label: "Step 2e: TH reads CurrentHue attribute from DUT" - PICS: CC.S.F00 && CC.S.A0000 PICS_SKIP_SAMPLE_APP + PICS: CC.S.F00 && CC.S.A0000 && PICS_SKIP_SAMPLE_APP verification: | ./chip-tool colorcontrol read current-hue 1 1 diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml index 3b67d6c9955190..01981b364919bf 100644 --- a/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_CNET_4_11.yaml @@ -151,7 +151,7 @@ tests: value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID - name: "Credentials" value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS - - name: "breadcrumb" + - name: "Breadcrumb" value: 1 response: values: @@ -332,7 +332,7 @@ tests: value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_SSID - name: "Credentials" value: PIXIT.CNET.WIFI_2ND_ACCESSPOINT_CREDENTIALS - - name: "breadcrumb" + - name: "Breadcrumb" value: 1 response: values: diff --git a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml index 3d5a732fae831b..23753cfd6eb56d 100644 --- a/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_CNET_4_5.yaml @@ -79,7 +79,7 @@ tests: value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_SSID - name: "Credentials" value: PIXIT.CNET.WIFI_1ST_ACCESSPOINT_CREDENTIALS - - name: "breadcrumb" + - name: "Breadcrumb" value: 1 response: error: FAILSAFE_REQUIRED diff --git a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml index 13ab0235c84c4a..22b7f897ef59a5 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml @@ -37,10 +37,9 @@ tests: command: "readAttribute" attribute: "ClusterRevision" response: + value: 5 constraints: type: int16u - minValue: 5 - maxValue: 6 - label: "Step 3a: TH reads from the DUT the FeatureMap attribute." command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml index 091e22f1674e50..aa4d7044479590 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_1.yaml @@ -11,14 +11,14 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default name: 26.1.1. [TC-SC-5.1] Adding member to a group - TH as Admin and DUT as Group Member PICS: - - MCORE.ROLE.COMMISSIONEE + - GRPKEY.S + - G.S config: nodeId: 0x12344321 @@ -85,6 +85,7 @@ tests: 00000000000000000000000000000001 4)EpochStartTime0: 111 5)EpochKey1: 00000000000000000000000000000002 6)EpochStartTime1: 222 7)EpochKey2: 00000000000000000000000000000003 8)EpochStartTime2: 333" + PICS: GRPKEY.S.C00.Rsp cluster: "Group Key Management" command: "KeySetWrite" arguments: @@ -111,6 +112,7 @@ tests: d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1: 18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf 8)EpochStartTime2: 18446744073709551614" + PICS: GRPKEY.S.C00.Rsp cluster: "Group Key Management" command: "KeySetWrite" arguments: @@ -132,7 +134,8 @@ tests: "Step 3: TH binds GroupId 0x0103 with GroupKeySetID 0x01a3 in the GroupKeyMap attribute list on GroupKeyManagement cluster by writing the GroupKeyMap attribute with one entry as follows: List item 1: - a)GroupId: 0x0103 b)GroupKeySetId: 0x01a3" + 1)GroupId: 0x0103 2)GroupKeySetId: 0x01a3" + PICS: GRPKEY.S.A0000 cluster: "Group Key Management" command: "writeAttribute" attribute: "GroupKeyMap" @@ -142,12 +145,14 @@ tests: - label: "Step 4: TH sends RemoveAllGroups command to the DUT on PIXIT.G.ENDPOINT " + PICS: G.S.C04.Rsp endpoint: Groups.Endpoint command: "RemoveAllGroups" - label: "Step 5: TH sends AddGroup Command to DUT on PIXIT.G.ENDPOINT with the - the following settings : 1)GroupID: 0x0103 2)GroupName: 'Test Group'" + the following settings 1)GroupID: 0x0103 2)GroupName: 'Test Group'" + PICS: G.S.C00.Rsp endpoint: Groups.Endpoint command: "AddGroup" arguments: @@ -160,7 +165,7 @@ tests: - label: "Step 6a: TH sends ViewGroup command with the GroupID to the Group cluster on the DUT on PIXIT.G.ENDPOINT" - PICS: G.S.F00 + PICS: G.S.F00 && G.S.C01.Rsp endpoint: Groups.Endpoint command: "ViewGroup" arguments: @@ -179,7 +184,7 @@ tests: - label: "Step 6b: TH sends ViewGroup command with the GroupID to the Group cluster on the DUT on PIXIT.G.ENDPOINT" - PICS: "!(G.S.F00)" + PICS: " !G.S.F00 && G.S.C01.Rsp " endpoint: Groups.Endpoint command: "ViewGroup" arguments: @@ -198,6 +203,7 @@ tests: - label: "Step 7: TH sends KeySetRead command to GroupKeyManagement cluster with GroupKeySetID as 0x01a3" + PICS: GRPKEY.S.C01.Rsp cluster: "Group Key Management" command: "KeySetRead" arguments: @@ -222,6 +228,7 @@ tests: - label: "Step 8: TH reads GroupKeyMap Attribute from the GroupKeyManagement cluster from DUT" + PICS: GRPKEY.S.A0000 cluster: "Group Key Management" command: "readAttribute" attribute: "GroupKeyMap" @@ -230,9 +237,9 @@ tests: - label: "Step 9a: TH reads GroupTable attribute from GroupKeyManagement - cluster on DUT using a fabric-filtered read" + cluster on DUT using a fabric-filtered read." cluster: "Group Key Management" - PICS: G.S.F00 + PICS: G.S.F00 && GRPKEY.S.A0001 command: "readAttribute" attribute: "GroupTable" response: @@ -249,7 +256,7 @@ tests: "Step 9b: TH reads GroupTable attribute from GroupKeyManagement cluster on DUT using a fabric-filtered read" cluster: "Group Key Management" - PICS: " !G.S.F00 " + PICS: " !G.S.F00 && GRPKEY.S.A0001 " command: "readAttribute" attribute: "GroupTable" response: @@ -260,6 +267,7 @@ tests: "Step 10: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a3" + PICS: GRPKEY.S.C03.Rsp cluster: "Group Key Management" command: "KeySetRemove" arguments: @@ -272,6 +280,7 @@ tests: the corresponding entries in the GroupKeyMap by Reading the GroupKeyMap attribute from the GroupKeyManagement cluster using a fabric-filtered read." + PICS: GRPKEY.S.A0000 cluster: "Group Key Management" command: "readAttribute" attribute: "GroupKeyMap" @@ -279,8 +288,9 @@ tests: value: [] - label: - "Step 12: TH cleans up the groups by sending the RemoveAllGroups - command to the DUT on PIXIT.G.ENDPOINT" + "Step 12: TH cleans up groups using RemoveAllGroups command to the DUT + on PIXIT.G.ENDPOINT" + PICS: G.S.C04.Rsp endpoint: Groups.Endpoint command: "RemoveAllGroups" @@ -288,6 +298,7 @@ tests: "Step 13: TH reads verifies the group has been removed by reading the GroupTable attribute from GroupKeyManagement cluster on DUT using a fabric-filtered read." + PICS: GRPKEY.S.A0001 cluster: "Group Key Management" command: "readAttribute" attribute: "GroupTable" @@ -298,8 +309,8 @@ tests: "Step 14: TH writes the ACL attribute in the Access Control cluster to remove Operate privileges for group 0x0103 and maintain the current administrative privileges for the TH. The following access control - list shall be used : List item 1 (TH admin): a)Privilege: Administer - (5) b)AuthMode: CASE (2) c)Subjects: TH node id ([N1]) d)Targets: all + list shall be used: List item 1 (TH admin): 1)Privilege: Administer + (5) 2)AuthMode: CASE (2) 3)Subjects: TH node id ([N1]) 4)Targets: all (null)" cluster: "Access Control" command: "writeAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml index 83a3dd76adb12e..b558b0b9111446 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_5_2.yaml @@ -46,11 +46,11 @@ tests: "Step 1: TH writes the ACL attribute in the Access Control cluster to add Manage privileges for group 0x0103 and maintain the current administrative privileges for the TH. The following access control - list shall be used : List item 1 (TH admin): a)Privilege: Administer - (5) b)AuthMode: CASE (2) c)Subjects: TH node id ([N1]) d)Targets: all - (null) List item 2 (group operate access): a)Privilege: Manage (4) - b)AuthMode: Group (3) c)Subjects: group 0x0103 ([0x0103]) d)Targets: - all (null) " + list shall be used: List item 1 (TH admin): 1)Privilege: Administer + (5) 2)AuthMode: CASE (2) 3)Subjects: TH node id ([N1]) 4)Targets: all + (null) List item 2 (group operate access): 1)Privilege: Manage (4) + 2)AuthMode: Group (3) 3)Subjects: group 0x0103 ([0x0103]) 4)Targets: + all (null)" cluster: "Access Control" command: "writeAttribute" attribute: "ACL" @@ -76,11 +76,13 @@ tests: - label: "Step 2: TH sends KeySetWrite command in the GroupKeyManagement cluster to DUT using a key that is pre-installed on the TH. - GroupKeySet fields are as follows : a)GroupKeySetID: 0x01a3 - b)GroupKeySecurityPolicy: TrustFirst (0) c)EpochStartTime0:1 - d)EpochKey1:d1d1d2d3d4d5d6d7d8d9dadbdcdddedf e)EpochStartTime1: - 18446744073709551613 f)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf - g)EpochStartTime2: 18446744073709551614 " + GroupKeySet fields are as follows: 1)GroupKeySetID: 0x01a3 + 2)GroupKeySecurityPolicy: TrustFirst (0) 3)EpochKey0: + d0d1d2d3d4d5d6d7d8d9dadbdcdddedf 4)EpochStartTime0:1 5)EpochKey1: + d1d1d2d3d4d5d6d7d8d9dadbdcdddedf 6)EpochStartTime1: + 18446744073709551613 7)EpochKey2: d2d1d2d3d4d5d6d7d8d9dadbdcdddedf + 8)EpochStartTime2: 18446744073709551614" + PICS: GRPKEY.S.C00.Rsp cluster: "Group Key Management" command: "KeySetWrite" arguments: @@ -101,9 +103,10 @@ tests: - label: "Step 3: TH binds GroupId 0x0103 and 0x0101 with GroupKeySetID 0x01a3 in the GroupKeyMap attribute list on GroupKeyManagement cluster by - writing the GroupKeyMap attribute with 2 entries as follows : List - item 1 : a)GroupId: 0x0103 b)GroupKeySetId: 0x01a3 List item 2: - a)GroupId: 0x0101 b)GroupKeySetId: 0x01a3" + writing the GroupKeyMap attribute with 2 entries as follows: List item + 1: 1)GroupId: 0x0103 2)GroupKeySetId: 0x01a3 List item 2: 1)GroupId: + 0x0101 2)GroupKeySetId: 0x01a3" + PICS: GRPKEY.S.A0000 cluster: "Group Key Management" command: "writeAttribute" attribute: "GroupKeyMap" @@ -117,6 +120,7 @@ tests: - label: "Step 4: TH cleans up the groups by sending the RemoveAllGroups command to the DUT on PIXIT.G.ENDPOINT" + PICS: G.S.C04.Rsp endpoint: Groups.Endpoint command: "RemoveAllGroups" @@ -124,6 +128,7 @@ tests: "Step 5: TH sends AddGroup Command to DUT on PIXIT.G.ENDPOINT with the the following settings 1)GroupID: 0x0103 2)GroupName: 'Test Group 0103'" + PICS: G.S.C00.Rsp endpoint: Groups.Endpoint command: "AddGroup" arguments: @@ -143,6 +148,7 @@ tests: "Step 6: TH sends a AddGroup Command to the Groups cluster with the GroupID field set to 0x0101 and the GroupName set to an 'Test Group 0101'. The command is sent as a group command using GroupID 0x0103" + PICS: G.S.C00.Rsp groupId: 0x0103 command: "AddGroup" arguments: @@ -176,8 +182,8 @@ tests: - label: "Step 7: TH sends a ViewGroup Command to the Groups cluster on Endpoint PIXIT.G.ENDPOINT over CASE with the GroupID set to 0x0101 to - confirm that the AddGroup command from step 6 was successful " - PICS: G.S.F00 + confirm that the AddGroup command from step 6 was successful" + PICS: G.S.F00 && G.S.C01.Rsp endpoint: Groups.Endpoint command: "ViewGroup" arguments: @@ -197,7 +203,7 @@ tests: "Step 8: TH sends a ViewGroup Command to the Groups cluster on Endpoint PIXIT.G.ENDPOINT over CASE with the GroupID set to 0x0101 to confirm that the AddGroup command from step 6 was successful " - PICS: "!(G.S.F00)" + PICS: " !G.S.F00 && G.S.C01.Rsp " endpoint: Groups.Endpoint command: "ViewGroup" arguments: @@ -217,6 +223,7 @@ tests: "Step 9: TH removes the Group key set that was added by sending a KeySetRemove command to the GroupKeyManagement cluster with the GroupKeySetID field set to 0x01a3" + PICS: GRPKEY.S.C03.Rsp cluster: "Group Key Management" command: "KeySetRemove" arguments: @@ -227,6 +234,7 @@ tests: - label: "Step 10: TH cleans up the groups by sending the RemoveAllGroups command to the DUT on PIXIT.G.ENDPOINT" + PICS: G.S.C04.Rsp endpoint: Groups.Endpoint command: "RemoveAllGroups" @@ -234,9 +242,9 @@ tests: "Step 11: TH writes the ACL attribute in the Access Control cluster to remove Manage privileges for group 0x0103 and maintain the current administrative privileges for the TH. The following access control - list shall be used : List item 1 (TH admin): a)Privilege: Administer - (5) b)AuthMode: CASE (2) c)Subjects: TH node id ([N1]) d)Targets: - all (null)" + list shall be used: List item 1 (TH admin): 1)Privilege: Administer + (5) 2)AuthMode: CASE (2) 3)Subjects: TH node id ([N1]) 4)Targets: all + (null)" cluster: "Access Control" command: "writeAttribute" attribute: "ACL" diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values index 1dcd7edc09597a..b4b352611fe8ac 100644 --- a/src/app/tests/suites/certification/ci-pics-values +++ b/src/app/tests/suites/certification/ci-pics-values @@ -1645,6 +1645,8 @@ BINFO.S.A0011=0 BINFO.S.A0012=1 BINFO.S.A0013=1 BINFO.S.A0014=1 +BINFO.S.A0015=1 +BINFO.S.A0016=1 # Events BINFO.S.E00=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 f1221333410d6b..4dbde80e2d603b 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -13563,8 +13563,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 38U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 52U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 22U)); + VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 68U)); NextTest(); }]; @@ -13628,8 +13628,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 80U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 110U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 79U)); + VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 111U)); NextTest(); }]; @@ -13661,8 +13661,8 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 80U)); - VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 110U)); + VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 79U)); + VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 111U)); NextTest(); }]; @@ -14145,7 +14145,7 @@ class Test_TC_CC_3_3 : public TestCommandBridge { break; case 11: ChipLogProgress(chipTool, " ***** Test Step 11 : Step 2e: TH reads CurrentHue attribute from DUT\n"); - if (ShouldSkip("CC.S.F00 && CC.S.A0000 PICS_SKIP_SAMPLE_APP")) { + if (ShouldSkip("CC.S.F00 && CC.S.A0000 && PICS_SKIP_SAMPLE_APP")) { NextTest(); return; } @@ -87149,10 +87149,12 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); - VerifyOrReturn(CheckConstraintMinValue("clusterRevision", [value unsignedShortValue], 5U)); - VerifyOrReturn(CheckConstraintMaxValue("clusterRevision", [value unsignedShortValue], 6U)); + { + id actualValue = value; + VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U)); + } + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }];