From 1179348aa94a30a547bf722ab3b9dab6bd0d88e8 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Wed, 1 Feb 2023 18:29:43 +0100 Subject: [PATCH] Fix some typos related to the readEvent command in Test_TC_ACL_2_7.yaml, Test_TC_ACL_2_8.yaml and Test_TC_ACL_2_10.yaml (#24780) * Fix some typos related to the readEvent command in Test_TC_ACL_2_7.yaml and Test_TC_ACL_2_8.yaml * Update generated tests content --- .../certification/Test_TC_ACL_2_10.yaml | 40 +++++++++---------- .../suites/certification/Test_TC_ACL_2_7.yaml | 32 +++++++-------- .../suites/certification/Test_TC_ACL_2_8.yaml | 24 +++++------ .../chip-tool/zap-generated/test/Commands.h | 31 ++++++++++++++ 4 files changed, 77 insertions(+), 50 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml index b340eaad4a8280..4a1891a97f549f 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml @@ -112,15 +112,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [3333], Targets: null, FabricIndex: TH1FabricIndex, @@ -137,15 +137,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId, 2222], Targets: null, FabricIndex: TH2FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [4444], Targets: null, FabricIndex: TH2FabricIndex, @@ -217,15 +217,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [3333], Targets: null, FabricIndex: TH1FabricIndex, @@ -252,15 +252,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId, 2222], Targets: null, FabricIndex: TH2FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [4444], Targets: null, FabricIndex: TH2FabricIndex, @@ -311,15 +311,15 @@ tests: value: [ { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, }, { - Privilege: "3", - AuthMode: "3", + Privilege: 3, + AuthMode: 3, Subjects: [3333], Targets: null, FabricIndex: TH1FabricIndex, diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml index 10388d8833bda9..08ae87141f2185 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml @@ -144,16 +144,14 @@ tests: event: "AccessControlExtensionChanged" response: value: - [ - { - AdminNodeID: TH1CommissionerNodeId, - AdminPasscodeID: null, - ChangeType: 1, - LatestValue: - { Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }, - }, + { + AdminNodeID: TH1CommissionerNodeId, + AdminPasscodeID: null, + ChangeType: 1, + LatestValue: + { Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }, FabricIndex: TH1FabricIndex, - ] + } - label: "Step 11:TH2 reads DUT Endpoint 0 AccessControl cluster @@ -164,13 +162,11 @@ tests: event: "AccessControlExtensionChanged" response: value: - [ - { - AdminNodeID: TH2CommissionerNodeId, - AdminPasscodeID: null, - ChangeType: 1, - LatestValue: - { Data: D_OK_SINGLE, FabricIndex: TH2FabricIndex }, - }, + { + AdminNodeID: TH2CommissionerNodeId, + AdminPasscodeID: null, + ChangeType: 1, + LatestValue: + { Data: D_OK_SINGLE, FabricIndex: TH2FabricIndex }, FabricIndex: TH2FabricIndex, - ] + } diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml index 2df5382e156e70..77fe085a0d0fc2 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_8.yaml @@ -172,8 +172,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId], Targets: null, FabricIndex: TH1FabricIndex, @@ -188,8 +188,8 @@ tests: ChangeType: 2, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId], Targets: null, FabricIndex: TH1FabricIndex, @@ -204,8 +204,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH1CommissionerNodeId, 1111], Targets: null, FabricIndex: TH1FabricIndex, @@ -229,8 +229,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId], Targets: null, FabricIndex: TH2FabricIndex, @@ -245,8 +245,8 @@ tests: ChangeType: 2, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId], Targets: null, FabricIndex: TH2FabricIndex, @@ -261,8 +261,8 @@ tests: ChangeType: 1, LatestValue: { - Privilege: "5", - AuthMode: "2", + Privilege: 5, + AuthMode: 2, Subjects: [TH2CommissionerNodeId, 2222], Targets: null, FabricIndex: TH2FabricIndex, diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 7b06be89ef5f12..c080b69ddde697 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -5818,6 +5818,18 @@ class Test_TC_ACL_2_7Suite : public TestCommand { chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.adminNodeID", value.adminNodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.adminNodeID.Value()", value.adminNodeID.Value(), + mTH1CommissionerNodeId.HasValue() ? mTH1CommissionerNodeId.Value() : 112233ULL)); + VerifyOrReturn(CheckValueNull("accessControlExtensionChanged.adminPasscodeID", value.adminPasscodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.changeType", value.changeType, 1U)); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.latestValue", value.latestValue)); + VerifyOrReturn(CheckValueAsString( + "accessControlExtensionChanged.latestValue.Value().data", value.latestValue.Value().data, + mDOkEmpty.HasValue() ? mDOkEmpty.Value() : chip::ByteSpan(chip::Uint8::from_const_char("\x17\x18"), 2))); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.latestValue.Value().fabricIndex", + value.latestValue.Value().fabricIndex, TH1FabricIndex)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.fabricIndex", value.fabricIndex, TH1FabricIndex)); } mTestSubStepIndex++; break; @@ -5834,6 +5846,25 @@ class Test_TC_ACL_2_7Suite : public TestCommand { chip::app::Clusters::AccessControl::Events::AccessControlExtensionChanged::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.adminNodeID", value.adminNodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.adminNodeID.Value()", value.adminNodeID.Value(), + mTH2CommissionerNodeId.HasValue() ? mTH2CommissionerNodeId.Value() : 112233ULL)); + VerifyOrReturn(CheckValueNull("accessControlExtensionChanged.adminPasscodeID", value.adminPasscodeID)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.changeType", value.changeType, 1U)); + VerifyOrReturn(CheckValueNonNull("accessControlExtensionChanged.latestValue", value.latestValue)); + VerifyOrReturn(CheckValueAsString( + "accessControlExtensionChanged.latestValue.Value().data", value.latestValue.Value().data, + mDOkSingle.HasValue() + ? mDOkSingle.Value() + : chip::ByteSpan(chip::Uint8::from_const_char( + "\x17\xD0\x00\x00\xF1\xFF\x01\x00\x3D\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64" + "\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65" + "\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63" + "\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18"), + 71))); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.latestValue.Value().fabricIndex", + value.latestValue.Value().fabricIndex, TH2FabricIndex)); + VerifyOrReturn(CheckValue("accessControlExtensionChanged.fabricIndex", value.fabricIndex, TH2FabricIndex)); } mTestSubStepIndex++; break;