From 0e391e5768a4e6a8fc0d2ca2a2756a46bdc62821 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 30 Mar 2022 01:16:27 -0400 Subject: [PATCH] Fix ZAP codegen, Linux REPL CI, YAML tests. (#16808) --- .../Matter - Multi Fabric Commissioning.ipynb | 2 +- .../suites/certification/Test_TC_MF_1_4.yaml | 2 +- .../python/test/test_scripts/base.py | 2 +- .../chip-tool/zap-generated/test/Commands.h | 284 ++++++++++++------ 4 files changed, 188 insertions(+), 102 deletions(-) diff --git a/docs/guides/repl/Matter - Multi Fabric Commissioning.ipynb b/docs/guides/repl/Matter - Multi Fabric Commissioning.ipynb index 9b07eb813e7700..d987196f2b1dbf 100644 --- a/docs/guides/repl/Matter - Multi Fabric Commissioning.ipynb +++ b/docs/guides/repl/Matter - Multi Fabric Commissioning.ipynb @@ -607,7 +607,7 @@ "metadata": {}, "outputs": [], "source": [ - "await devCtrl.SendCommand(2, 0, Clusters.AdministratorCommissioning.Commands.OpenBasicCommissioningWindow(100))" + "await devCtrl.SendCommand(2, 0, Clusters.AdministratorCommissioning.Commands.OpenBasicCommissioningWindow(180))" ] }, { diff --git a/src/app/tests/suites/certification/Test_TC_MF_1_4.yaml b/src/app/tests/suites/certification/Test_TC_MF_1_4.yaml index 6a64358874ad6f..aca477f19bdd23 100644 --- a/src/app/tests/suites/certification/Test_TC_MF_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_MF_1_4.yaml @@ -51,7 +51,7 @@ tests: arguments: values: - name: "CommissioningTimeout" - value: 120 + value: 180 - label: "TH_CR1 writes the Basic Information Clusters NodeLabel mandatory diff --git a/src/controller/python/test/test_scripts/base.py b/src/controller/python/test/test_scripts/base.py index b1dd8bd8dd6365..1accff6e1be042 100644 --- a/src/controller/python/test/test_scripts/base.py +++ b/src/controller/python/test/test_scripts/base.py @@ -249,7 +249,7 @@ def TestUsedTestCommissioner(self): async def TestMultiFabric(self, ip: str, setuppin: int, nodeid: int): self.logger.info("Opening Commissioning Window") - await self.devCtrl.SendCommand(nodeid, 0, Clusters.AdministratorCommissioning.Commands.OpenBasicCommissioningWindow(100), timedRequestTimeoutMs=10000) + await self.devCtrl.SendCommand(nodeid, 0, Clusters.AdministratorCommissioning.Commands.OpenBasicCommissioningWindow(180), timedRequestTimeoutMs=10000) self.logger.info("Creating 2nd Fabric Admin") self.fabricAdmin2 = chip.FabricAdmin.FabricAdmin( diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 702717ae3ddfc4..44fac80f1ce2ed 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -33068,7 +33068,7 @@ class Test_TC_MF_1_4Suite : public TestCommand using RequestType = chip::app::Clusters::AdministratorCommissioning::Commands::OpenBasicCommissioningWindow::Type; RequestType request; - request.commissioningTimeout = 120U; + request.commissioningTimeout = 180U; auto success = [](void * context, const typename RequestType::ResponseType & data) { (static_cast(context))->OnSuccessResponse_2(); @@ -112973,60 +112973,68 @@ class Test_TC_MF_1_3Suite : public TestCommand err = TestThCr1StartsACommissioningProcessWithDutCe_1(); break; case 2: - ChipLogProgress(chipTool, " ***** Test Step 2 : Open Commissioning Window\n"); - err = TestOpenCommissioningWindow_2(); + ChipLogProgress(chipTool, " ***** Test Step 2 : Open Commissioning Window with too-short timeout\n"); + err = TestOpenCommissioningWindowWithTooShortTimeout_2(); break; case 3: - ChipLogProgress( - chipTool, - " ***** Test Step 3 : TH_CR1 writes the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); - err = TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_3(); + ChipLogProgress(chipTool, " ***** Test Step 3 : Open Commissioning Window with too-long timeout\n"); + err = TestOpenCommissioningWindowWithTooLongTimeout_3(); break; case 4: - ChipLogProgress( - chipTool, - " ***** Test Step 4 : TH_CR1 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); - err = TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : Open Commissioning Window\n"); + err = TestOpenCommissioningWindow_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Commission from beta\n"); - err = TestCommissionFromBeta_5(); + ChipLogProgress( + chipTool, + " ***** Test Step 5 : TH_CR1 writes the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); + err = TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : TH_CR2 starts a commissioning process with DUT_CE\n"); - err = TestThCr2StartsACommissioningProcessWithDutCe_6(); + ChipLogProgress( + chipTool, + " ***** Test Step 6 : TH_CR1 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); + err = TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Query fabrics list\n"); - err = TestQueryFabricsList_7(); + ChipLogProgress(chipTool, " ***** Test Step 7 : Commission from beta\n"); + err = TestCommissionFromBeta_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Query fabrics list\n"); - err = TestQueryFabricsList_8(); + ChipLogProgress(chipTool, " ***** Test Step 8 : TH_CR2 starts a commissioning process with DUT_CE\n"); + err = TestThCr2StartsACommissioningProcessWithDutCe_8(); break; case 9: + ChipLogProgress(chipTool, " ***** Test Step 9 : Query fabrics list\n"); + err = TestQueryFabricsList_9(); + break; + case 10: + ChipLogProgress(chipTool, " ***** Test Step 10 : Query fabrics list\n"); + err = TestQueryFabricsList_10(); + break; + case 11: ChipLogProgress( chipTool, - " ***** Test Step 9 : TH_CR1 writes the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); - err = TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_9(); + " ***** Test Step 11 : TH_CR1 writes the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); + err = TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_11(); break; - case 10: + case 12: ChipLogProgress( chipTool, - " ***** Test Step 10 : TH_CR1 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); - err = TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_10(); + " ***** Test Step 12 : TH_CR1 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); + err = TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_12(); break; - case 11: + case 13: ChipLogProgress( chipTool, - " ***** Test Step 11 : TH_CR2 writes the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); - err = TestThCr2WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_11(); + " ***** Test Step 13 : TH_CR2 writes the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); + err = TestThCr2WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_13(); break; - case 12: + case 14: ChipLogProgress( chipTool, - " ***** Test Step 12 : TH_CR2 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); - err = TestThCr2ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_12(); + " ***** Test Step 14 : TH_CR2 reads the Basic Information Clusters NodeLabel mandatory attribute of DUT_CE\n"); + err = TestThCr2ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_14(); break; } @@ -113044,7 +113052,7 @@ class Test_TC_MF_1_3Suite : public TestCommand private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 13; + const uint16_t mTestCount = 15; chip::Optional mNodeId; chip::Optional mNodeId2; @@ -113061,81 +113069,81 @@ class Test_TC_MF_1_3Suite : public TestCommand NextTest(); } - static void OnFailureCallback_3(void * context, CHIP_ERROR error) + static void OnFailureCallback_5(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_3(error); + (static_cast(context))->OnFailureResponse_5(error); } - static void OnSuccessCallback_3(void * context) { (static_cast(context))->OnSuccessResponse_3(); } + static void OnSuccessCallback_5(void * context) { (static_cast(context))->OnSuccessResponse_5(); } - static void OnFailureCallback_4(void * context, CHIP_ERROR error) + static void OnFailureCallback_6(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_4(error); + (static_cast(context))->OnFailureResponse_6(error); } - static void OnSuccessCallback_4(void * context, chip::CharSpan nodeLabel) + static void OnSuccessCallback_6(void * context, chip::CharSpan nodeLabel) { - (static_cast(context))->OnSuccessResponse_4(nodeLabel); + (static_cast(context))->OnSuccessResponse_6(nodeLabel); } - static void OnFailureCallback_7(void * context, CHIP_ERROR error) + static void OnFailureCallback_9(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_7(error); + (static_cast(context))->OnFailureResponse_9(error); } static void - OnSuccessCallback_7(void * context, + OnSuccessCallback_9(void * context, const chip::app::DataModel::DecodableList< chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabrics) { - (static_cast(context))->OnSuccessResponse_7(fabrics); + (static_cast(context))->OnSuccessResponse_9(fabrics); } - static void OnFailureCallback_8(void * context, CHIP_ERROR error) + static void OnFailureCallback_10(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_8(error); + (static_cast(context))->OnFailureResponse_10(error); } static void - OnSuccessCallback_8(void * context, - const chip::app::DataModel::DecodableList< - chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabrics) + OnSuccessCallback_10(void * context, + const chip::app::DataModel::DecodableList< + chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabrics) { - (static_cast(context))->OnSuccessResponse_8(fabrics); + (static_cast(context))->OnSuccessResponse_10(fabrics); } - static void OnFailureCallback_9(void * context, CHIP_ERROR error) + static void OnFailureCallback_11(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_9(error); + (static_cast(context))->OnFailureResponse_11(error); } - static void OnSuccessCallback_9(void * context) { (static_cast(context))->OnSuccessResponse_9(); } + static void OnSuccessCallback_11(void * context) { (static_cast(context))->OnSuccessResponse_11(); } - static void OnFailureCallback_10(void * context, CHIP_ERROR error) + static void OnFailureCallback_12(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_10(error); + (static_cast(context))->OnFailureResponse_12(error); } - static void OnSuccessCallback_10(void * context, chip::CharSpan nodeLabel) + static void OnSuccessCallback_12(void * context, chip::CharSpan nodeLabel) { - (static_cast(context))->OnSuccessResponse_10(nodeLabel); + (static_cast(context))->OnSuccessResponse_12(nodeLabel); } - static void OnFailureCallback_11(void * context, CHIP_ERROR error) + static void OnFailureCallback_13(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_11(error); + (static_cast(context))->OnFailureResponse_13(error); } - static void OnSuccessCallback_11(void * context) { (static_cast(context))->OnSuccessResponse_11(); } + static void OnSuccessCallback_13(void * context) { (static_cast(context))->OnSuccessResponse_13(); } - static void OnFailureCallback_12(void * context, CHIP_ERROR error) + static void OnFailureCallback_14(void * context, CHIP_ERROR error) { - (static_cast(context))->OnFailureResponse_12(error); + (static_cast(context))->OnFailureResponse_14(error); } - static void OnSuccessCallback_12(void * context, chip::CharSpan nodeLabel) + static void OnSuccessCallback_14(void * context, chip::CharSpan nodeLabel) { - (static_cast(context))->OnSuccessResponse_12(nodeLabel); + (static_cast(context))->OnSuccessResponse_14(nodeLabel); } // @@ -113154,7 +113162,7 @@ class Test_TC_MF_1_3Suite : public TestCommand return WaitForCommissionee(1); } - CHIP_ERROR TestOpenCommissioningWindow_2() + CHIP_ERROR TestOpenCommissioningWindowWithTooShortTimeout_2() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; using RequestType = chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type; @@ -113185,14 +113193,92 @@ class Test_TC_MF_1_3Suite : public TestCommand } void OnFailureResponse_2(CHIP_ERROR error) + { + chip::app::StatusIB status(error); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); + NextTest(); + } + + void OnSuccessResponse_2() { ThrowSuccessResponse(); } + + CHIP_ERROR TestOpenCommissioningWindowWithTooLongTimeout_3() + { + const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; + using RequestType = chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type; + + RequestType request; + request.commissioningTimeout = 1000U; + request.PAKEVerifier = chip::ByteSpan( + chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326" + "\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + 97); + request.discriminator = 3840U; + request.iterations = 1000UL; + request.salt = chip::ByteSpan(chip::Uint8::from_const_char("SPAKE2P Key Saltgarbage: not in length on purpose"), 16); + + auto success = [](void * context, const typename RequestType::ResponseType & data) { + (static_cast(context))->OnSuccessResponse_3(); + }; + + auto failure = [](void * context, CHIP_ERROR error) { + (static_cast(context))->OnFailureResponse_3(error); + }; + + ReturnErrorOnFailure( + chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request, 10000)); + return CHIP_NO_ERROR; + } + + void OnFailureResponse_3(CHIP_ERROR error) + { + chip::app::StatusIB status(error); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); + NextTest(); + } + + void OnSuccessResponse_3() { ThrowSuccessResponse(); } + + CHIP_ERROR TestOpenCommissioningWindow_4() + { + const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; + using RequestType = chip::app::Clusters::AdministratorCommissioning::Commands::OpenCommissioningWindow::Type; + + RequestType request; + request.commissioningTimeout = 180U; + request.PAKEVerifier = chip::ByteSpan( + chip::Uint8::from_const_char("\006\307V\337\374\327\042e4R\241-\315\224]\214T\332+\017<\275\033M\303\361\255\262#" + "\256\262k\004|\322L\226\206o\227\233\035\203\354P\342\264\2560\315\362\375\263+" + "\330\242\021\2707\334\224\355\315V\364\321Cw\031\020v\277\305\235\231\267\3350S\357\326" + "\360,D4\362\275\322z\244\371\316\247\015s\216Lgarbage: not in length on purpose"), + 97); + request.discriminator = 3840U; + request.iterations = 1000UL; + request.salt = chip::ByteSpan(chip::Uint8::from_const_char("SPAKE2P Key Saltgarbage: not in length on purpose"), 16); + + auto success = [](void * context, const typename RequestType::ResponseType & data) { + (static_cast(context))->OnSuccessResponse_4(); + }; + + auto failure = [](void * context, CHIP_ERROR error) { + (static_cast(context))->OnFailureResponse_4(error); + }; + + ReturnErrorOnFailure( + chip::Controller::InvokeCommand(mDevices[kIdentityAlpha], this, success, failure, endpoint, request, 10000)); + return CHIP_NO_ERROR; + } + + void OnFailureResponse_4(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_2() { NextTest(); } + void OnSuccessResponse_4() { NextTest(); } - CHIP_ERROR TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_3() + CHIP_ERROR TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_5() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::BasicClusterTest cluster; @@ -113202,36 +113288,36 @@ class Test_TC_MF_1_3Suite : public TestCommand nodeLabelArgument = chip::Span("chiptestgarbage: not in length on purpose", 8); ReturnErrorOnFailure(cluster.WriteAttribute( - nodeLabelArgument, this, OnSuccessCallback_3, OnFailureCallback_3)); + nodeLabelArgument, this, OnSuccessCallback_5, OnFailureCallback_5)); return CHIP_NO_ERROR; } - void OnFailureResponse_3(CHIP_ERROR error) + void OnFailureResponse_5(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_3() { NextTest(); } + void OnSuccessResponse_5() { NextTest(); } - CHIP_ERROR TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_4() + CHIP_ERROR TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_6() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_4, OnFailureCallback_4, true)); + this, OnSuccessCallback_6, OnFailureCallback_6, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_4(CHIP_ERROR error) + void OnFailureResponse_6(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_4(chip::CharSpan nodeLabel) + void OnSuccessResponse_6(chip::CharSpan nodeLabel) { VerifyOrReturn(CheckValueAsString("nodeLabel", nodeLabel, chip::CharSpan("chiptest", 8))); VerifyOrReturn(CheckConstraintType("nodeLabel", "", "string")); @@ -113239,36 +113325,36 @@ class Test_TC_MF_1_3Suite : public TestCommand NextTest(); } - CHIP_ERROR TestCommissionFromBeta_5() + CHIP_ERROR TestCommissionFromBeta_7() { SetIdentity(kIdentityBeta); return PairWithQRCode(1, mPayload.HasValue() ? mPayload.Value() : chip::CharSpan::fromCharString("MT:0000000000I31506010")); } - CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_6() + CHIP_ERROR TestThCr2StartsACommissioningProcessWithDutCe_8() { SetIdentity(kIdentityBeta); return WaitForCommissionee(1); } - CHIP_ERROR TestQueryFabricsList_7() + CHIP_ERROR TestQueryFabricsList_9() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_7, OnFailureCallback_7, true)); + this, OnSuccessCallback_9, OnFailureCallback_9, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_7(CHIP_ERROR error) + void OnFailureResponse_9(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_7(const chip::app::DataModel::DecodableList< + void OnSuccessResponse_9(const chip::app::DataModel::DecodableList< chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabrics) { { @@ -113281,25 +113367,25 @@ class Test_TC_MF_1_3Suite : public TestCommand NextTest(); } - CHIP_ERROR TestQueryFabricsList_8() + CHIP_ERROR TestQueryFabricsList_10() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::OperationalCredentialsClusterTest cluster; cluster.Associate(mDevices[kIdentityBeta], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_8, OnFailureCallback_8, false)); + this, OnSuccessCallback_10, OnFailureCallback_10, false)); return CHIP_NO_ERROR; } - void OnFailureResponse_8(CHIP_ERROR error) + void OnFailureResponse_10(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_8(const chip::app::DataModel::DecodableList< - chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabrics) + void OnSuccessResponse_10(const chip::app::DataModel::DecodableList< + chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> & fabrics) { { auto iter_0 = fabrics.begin(); @@ -113313,7 +113399,7 @@ class Test_TC_MF_1_3Suite : public TestCommand NextTest(); } - CHIP_ERROR TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_9() + CHIP_ERROR TestThCr1WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_11() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::BasicClusterTest cluster; @@ -113323,36 +113409,36 @@ class Test_TC_MF_1_3Suite : public TestCommand nodeLabelArgument = chip::Span("chiptest1garbage: not in length on purpose", 9); ReturnErrorOnFailure(cluster.WriteAttribute( - nodeLabelArgument, this, OnSuccessCallback_9, OnFailureCallback_9)); + nodeLabelArgument, this, OnSuccessCallback_11, OnFailureCallback_11)); return CHIP_NO_ERROR; } - void OnFailureResponse_9(CHIP_ERROR error) + void OnFailureResponse_11(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_9() { NextTest(); } + void OnSuccessResponse_11() { NextTest(); } - CHIP_ERROR TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_10() + CHIP_ERROR TestThCr1ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_12() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityAlpha], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_10, OnFailureCallback_10, true)); + this, OnSuccessCallback_12, OnFailureCallback_12, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_10(CHIP_ERROR error) + void OnFailureResponse_12(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_10(chip::CharSpan nodeLabel) + void OnSuccessResponse_12(chip::CharSpan nodeLabel) { VerifyOrReturn(CheckValueAsString("nodeLabel", nodeLabel, chip::CharSpan("chiptest1", 9))); VerifyOrReturn(CheckConstraintType("nodeLabel", "", "string")); @@ -113360,7 +113446,7 @@ class Test_TC_MF_1_3Suite : public TestCommand NextTest(); } - CHIP_ERROR TestThCr2WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_11() + CHIP_ERROR TestThCr2WritesTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_13() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::BasicClusterTest cluster; @@ -113370,36 +113456,36 @@ class Test_TC_MF_1_3Suite : public TestCommand nodeLabelArgument = chip::Span("chiptest2garbage: not in length on purpose", 9); ReturnErrorOnFailure(cluster.WriteAttribute( - nodeLabelArgument, this, OnSuccessCallback_11, OnFailureCallback_11)); + nodeLabelArgument, this, OnSuccessCallback_13, OnFailureCallback_13)); return CHIP_NO_ERROR; } - void OnFailureResponse_11(CHIP_ERROR error) + void OnFailureResponse_13(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_11() { NextTest(); } + void OnSuccessResponse_13() { NextTest(); } - CHIP_ERROR TestThCr2ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_12() + CHIP_ERROR TestThCr2ReadsTheBasicInformationClustersNodeLabelMandatoryAttributeOfDutCe_14() { const chip::EndpointId endpoint = mEndpoint.HasValue() ? mEndpoint.Value() : 0; chip::Controller::BasicClusterTest cluster; cluster.Associate(mDevices[kIdentityBeta], endpoint); ReturnErrorOnFailure(cluster.ReadAttribute( - this, OnSuccessCallback_12, OnFailureCallback_12, true)); + this, OnSuccessCallback_14, OnFailureCallback_14, true)); return CHIP_NO_ERROR; } - void OnFailureResponse_12(CHIP_ERROR error) + void OnFailureResponse_14(CHIP_ERROR error) { chip::app::StatusIB status(error); ThrowFailureResponse(); } - void OnSuccessResponse_12(chip::CharSpan nodeLabel) + void OnSuccessResponse_14(chip::CharSpan nodeLabel) { VerifyOrReturn(CheckValueAsString("nodeLabel", nodeLabel, chip::CharSpan("chiptest2", 9))); VerifyOrReturn(CheckConstraintType("nodeLabel", "", "string"));