From 537113475acf3c7354c0581c5977e9e8b53d782f Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Tue, 17 Jan 2023 18:43:31 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20some=20typos=20in=20src/app/tests/suites/?= =?UTF-8?q?certification/Test=5FTC=5FCADMIN=5F1=E2=80=A6=20(#24471)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix some typos in src/app/tests/suites/certification/Test_TC_CADMIN_1_*.yaml * Update generated tests content --- .../certification/Test_TC_CADMIN_1_11.yaml | 44 +++++------- .../certification/Test_TC_CADMIN_1_13.yaml | 48 ++++++------- .../certification/Test_TC_CADMIN_1_15.yaml | 34 ++++----- .../certification/Test_TC_CADMIN_1_16.yaml | 22 +++--- .../certification/Test_TC_CADMIN_1_21.yaml | 4 -- .../certification/Test_TC_CADMIN_1_22.yaml | 12 ++-- .../certification/Test_TC_CADMIN_1_23.yaml | 4 -- .../certification/Test_TC_CADMIN_1_24.yaml | 12 ++-- .../certification/Test_TC_CADMIN_1_3.yaml | 22 +++--- .../certification/Test_TC_CADMIN_1_4.yaml | 10 +-- .../certification/Test_TC_CADMIN_1_5.yaml | 30 ++++---- .../certification/Test_TC_CADMIN_1_9.yaml | 6 +- .../chip-tool/zap-generated/test/Commands.h | 72 +++++++++++++++++++ 13 files changed, 179 insertions(+), 141 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml index 01b4346d7dd741..8854f10aaf290c 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_11.yaml @@ -79,11 +79,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" #Check for DNS-SD advertisement CM is not possible in YAML @@ -148,11 +148,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR2 starts a commissioning process with DUT_CE" @@ -188,11 +188,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: @@ -209,11 +209,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: FAILURE @@ -228,9 +228,9 @@ tests: response: value: [ - { Label: "", nodeId: nodeId }, - { Label: "", nodeId: nodeId3 }, - { Label: "", nodeID: nodeId2 }, + { Label: "", NodeId: nodeId }, + { Label: "", NodeId: nodeId3 }, + { Label: "", NodeId: nodeId2 }, ] constraints: type: list @@ -256,8 +256,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator #Check for DNS-SD advertisement CM is not possible in YAML - label: "Verify that the DNS-SD advertisement shows CM=1" @@ -294,8 +292,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator response: error: FAILURE clusterError: 2 @@ -319,9 +315,9 @@ tests: response: value: [ - { Label: "", nodeId: nodeId }, - { Label: "", nodeId: nodeId3 }, - { Label: "", nodeID: nodeId2 }, + { Label: "", NodeId: nodeId }, + { Label: "", NodeId: nodeId3 }, + { Label: "", NodeId: nodeId2 }, ] constraints: type: list @@ -335,8 +331,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "Before the expiration of PIXIT.CADMIN.CwDuration seconds that was set @@ -351,8 +345,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator response: error: FAILURE clusterError: 2 diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml index 942bebf92c6f7c..7c1841955ed161 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml @@ -83,8 +83,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR1 reads WindowStatus attribute from DUT_CE" cluster: "AdministratorCommissioning" @@ -238,8 +236,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR2 starts a commissioning process with DUT_CE" identity: "beta" @@ -271,8 +267,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR1 opens a 2nd commissioning window on DUT_CE" identity: "alpha" @@ -286,11 +280,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: FAILURE @@ -306,9 +300,9 @@ tests: response: value: [ - { Label: "", nodeId: nodeId }, - { Label: "", nodeId: nodeId2 }, - { Label: "", nodeID: nodeId3 }, + { Label: "", NodeId: nodeId }, + { Label: "", NodeId: nodeId2 }, + { Label: "", NodeId: nodeId3 }, ] constraints: type: list @@ -333,11 +327,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR1 reads WindowStatus attribute from DUT_CE" @@ -388,11 +382,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: FAILURE @@ -408,9 +402,9 @@ tests: response: value: [ - { Label: "", nodeId: nodeId }, - { Label: "", nodeId: nodeId2 }, - { Label: "", nodeID: nodeId3 }, + { Label: "", NodeId: nodeId }, + { Label: "", NodeId: nodeId2 }, + { Label: "", NodeId: nodeId3 }, ] constraints: type: list @@ -435,11 +429,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR2 opens a 2nd commissioning window on DUT_CE using ECM" @@ -454,11 +448,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: FAILURE diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml index 2ca257d2b6bb8d..17f77d3a3274ec 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml @@ -79,11 +79,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR2 starts a commissioning process with DUT_CE" @@ -120,11 +120,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR3 Commissions with DUT_CE" @@ -159,9 +159,9 @@ tests: response: value: [ - { Label: "", FabricIndex: 1, nodeId: nodeId }, - { Label: "", FabricIndex: 2, nodeId: nodeId2 }, - { Label: "", FabricIndex: 3, nodeID: nodeId3 }, + { Label: "", FabricIndex: 1, NodeId: nodeId }, + { Label: "", FabricIndex: 2, NodeId: nodeId2 }, + { Label: "", FabricIndex: 3, NodeId: nodeId3 }, ] constraints: type: list @@ -222,8 +222,8 @@ tests: response: value: [ - { Label: "", FabricIndex: 1, nodeId: nodeId }, - { Label: "", FabricIndex: 3, nodeID: nodeId3 }, + { Label: "", FabricIndex: 1, NodeId: nodeId }, + { Label: "", FabricIndex: 3, NodeId: nodeId3 }, ] constraints: type: list @@ -270,11 +270,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR2 starts a commissioning process with DUT_CE" @@ -309,9 +309,9 @@ tests: response: value: [ - { Label: "", FabricIndex: 1, nodeId: nodeId }, - { Label: "", FabricIndex: 4, nodeId: nodeId2 }, - { Label: "", FabricIndex: 3, nodeID: nodeId3 }, + { Label: "", FabricIndex: 1, NodeId: nodeId }, + { Label: "", FabricIndex: 4, NodeId: nodeId2 }, + { Label: "", FabricIndex: 3, NodeId: nodeId3 }, ] constraints: type: list diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml index 9e2a503373925c..eed27eb63d6548 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_16.yaml @@ -75,8 +75,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR2 starts a commissioning process with DUT_CE" identity: "beta" @@ -110,8 +108,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR3 Commissions with DUT_CE" PICS: CADMIN.S @@ -145,9 +141,9 @@ tests: response: value: [ - { Label: "", FabricIndex: 1, nodeId: nodeId }, - { Label: "", FabricIndex: 2, nodeId: nodeId2 }, - { Label: "", FabricIndex: 3, nodeID: nodeId3 }, + { Label: "", FabricIndex: 1, NodeId: nodeId }, + { Label: "", FabricIndex: 2, NodeId: nodeId2 }, + { Label: "", FabricIndex: 3, NodeId: nodeId3 }, ] constraints: type: list @@ -208,8 +204,8 @@ tests: response: value: [ - { Label: "", FabricIndex: 1, nodeId: nodeId }, - { Label: "", FabricIndex: 3, nodeID: nodeId3 }, + { Label: "", FabricIndex: 1, NodeId: nodeId }, + { Label: "", FabricIndex: 3, NodeId: nodeId3 }, ] constraints: type: list @@ -224,8 +220,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR2 starts a commissioning process with DUT_CE" identity: "beta" @@ -259,9 +253,9 @@ tests: response: value: [ - { Label: "", FabricIndex: 1, nodeId: nodeId }, - { Label: "", FabricIndex: 4, nodeId: nodeId2 }, - { Label: "", FabricIndex: 3, nodeID: nodeId3 }, + { Label: "", FabricIndex: 1, NodeId: nodeId }, + { Label: "", FabricIndex: 4, NodeId: nodeId2 }, + { Label: "", FabricIndex: 3, NodeId: nodeId3 }, ] constraints: type: list diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml index 3b49df915b30db..bf406e89eef9b5 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_21.yaml @@ -66,8 +66,6 @@ tests: values: - name: "CommissioningTimeout" value: 900 - - name: "discriminator" - value: discriminator - label: "Wait for commissioning Window to 901 seconds" cluster: "DelayCommands" @@ -95,8 +93,6 @@ tests: values: - name: "CommissioningTimeout" value: 901 - - name: "discriminator" - value: discriminator response: error: INVALID_COMMAND diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml index 84e037d2b82867..bf49318f426879 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_22.yaml @@ -70,11 +70,11 @@ tests: value: 900 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "Wait for commissioning Window to 901 seconds" @@ -105,11 +105,11 @@ tests: value: 901 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: INVALID_COMMAND diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml index f014b0272aabe3..af87d1682cadd6 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_23.yaml @@ -66,8 +66,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "Wait for commissioning Window to 181 seconds" cluster: "DelayCommands" @@ -95,8 +93,6 @@ tests: values: - name: "CommissioningTimeout" value: 179 - - name: "discriminator" - value: discriminator response: error: INVALID_COMMAND diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml index 5a2b03b10de03f..6fea52d25582a4 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_24.yaml @@ -70,11 +70,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "Wait for commissioning Window to 181 seconds" @@ -105,11 +105,11 @@ tests: value: 179 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: INVALID_COMMAND diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml index 8a820898be43c4..3538085ce68314 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml @@ -73,11 +73,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" #Check for DNS-SD advertisement CM is not possible in YAML @@ -187,7 +187,7 @@ tests: PICS: OPCREDS.S.A0001 fabricFiltered: false response: - value: [{ Label: "", nodeId: nodeId }, { Label: "", nodeId: nodeId2 }] + value: [{ Label: "", NodeId: nodeId }, { Label: "", NodeId: nodeId2 }] constraints: type: list @@ -199,7 +199,7 @@ tests: PICS: OPCREDS.S.A0001 fabricFiltered: false response: - value: [{ Label: "", nodeId: nodeId }, { Label: "", nodeId: nodeId2 }] + value: [{ Label: "", NodeId: nodeId }, { Label: "", NodeId: nodeId2 }] constraints: type: list @@ -263,11 +263,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "Wait for the commissioning window in step 13 to timeout" @@ -299,11 +299,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml index 5dfc34a509f2be..dd452dca5993f2 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml @@ -69,8 +69,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator #Check for DNS-SD advertisement CM is not possible in YAML - label: "Verify that the DNS-SD advertisement shows CM=1" @@ -176,7 +174,7 @@ tests: attribute: "Fabrics" fabricFiltered: false response: - value: [{ Label: "", nodeId: nodeId }, { Label: "", nodeId: nodeId2 }] + value: [{ Label: "", NodeId: nodeId }, { Label: "", NodeId: nodeId2 }] constraints: type: list @@ -188,7 +186,7 @@ tests: PICS: OPCREDS.S.A0001 fabricFiltered: false response: - value: [{ Label: "", nodeId: nodeId }, { Label: "", nodeId: nodeId2 }] + value: [{ Label: "", NodeId: nodeId }, { Label: "", NodeId: nodeId2 }] constraints: type: list @@ -250,8 +248,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "Wait for the commissioning window in step 13 to timeout" cluster: "DelayCommands" @@ -280,8 +276,6 @@ tests: values: - name: "CommissioningTimeout" value: 180 - - name: "discriminator" - value: discriminator - label: "TH_CR1 starts a commissioning process with DUT_CE before the timeout diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml index b8e661252cc609..d875e904cd0754 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml @@ -84,11 +84,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" #Check for DNS-SD advertisement CM is not possible in YAML @@ -146,11 +146,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR1 revokes the commissioning window on DUT_CE" @@ -210,11 +210,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: IncorrectPakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: FAILURE @@ -231,11 +231,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" - label: "TH_CR1 opens another commissioning window on DUT_CE using ECM" @@ -249,11 +249,11 @@ tests: value: 180 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" response: error: FAILURE diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml index f1b77997567ffb..271bff73b81104 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml @@ -84,11 +84,11 @@ tests: value: 900 - name: "PAKEPasscodeVerifier" value: PakeVerifier - - name: "discriminator" + - name: "Discriminator" value: discriminator - - name: "iterations" + - name: "Iterations" value: 1000 - - name: "salt" + - name: "Salt" value: "SPAKE2P Key Salt" #Check for DNS-SD advertisement CM is not possible in YAML diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 4e0836a8e5318b..dc87f0924aa18c 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -97278,10 +97278,16 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); } @@ -97318,10 +97324,16 @@ class Test_TC_CADMIN_1_11Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); } @@ -97859,12 +97871,18 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[1].fabricIndex", iter_0.GetValue().fabricIndex, 2U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[2].fabricIndex", iter_0.GetValue().fabricIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); @@ -97896,9 +97914,13 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[1].fabricIndex", iter_0.GetValue().fabricIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); @@ -97931,12 +97953,18 @@ class Test_TC_CADMIN_1_15Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[1].fabricIndex", iter_0.GetValue().fabricIndex, 4U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[2].fabricIndex", iter_0.GetValue().fabricIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); @@ -98274,12 +98302,18 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[1].fabricIndex", iter_0.GetValue().fabricIndex, 2U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[2].fabricIndex", iter_0.GetValue().fabricIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); @@ -98311,9 +98345,13 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[1].fabricIndex", iter_0.GetValue().fabricIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); @@ -98342,12 +98380,18 @@ class Test_TC_CADMIN_1_16Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[0].fabricIndex", iter_0.GetValue().fabricIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[1].fabricIndex", iter_0.GetValue().fabricIndex, 4U)); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckValue("fabrics[2].fabricIndex", iter_0.GetValue().fabricIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); @@ -99304,8 +99348,12 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); } @@ -99322,8 +99370,12 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); } @@ -99718,8 +99770,12 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); } @@ -99736,8 +99792,12 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); } @@ -101772,10 +101832,16 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); } @@ -101816,10 +101882,16 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand { auto iter_0 = value.begin(); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 0)); + VerifyOrReturn(CheckValue("fabrics[0].nodeId", iter_0.GetValue().nodeId, + mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL)); VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 1)); + VerifyOrReturn(CheckValue("fabrics[1].nodeId", iter_0.GetValue().nodeId, + mNodeId2.HasValue() ? mNodeId2.Value() : 51966ULL)); VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNextListItemDecodes("fabrics", iter_0, 2)); + VerifyOrReturn(CheckValue("fabrics[2].nodeId", iter_0.GetValue().nodeId, + mNodeId3.HasValue() ? mNodeId3.Value() : 12586990ULL)); VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); }