From 73931009b4fc92a75bf34e7cb77e623295259e58 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 9 Mar 2022 03:34:26 -0500 Subject: [PATCH] Regen to fix CI failures (#15990) Former-commit-id: 9bee828b52e401c4f6f1eea76df1af5d6732beb1 --- .../zap-generated/test/Commands.h | 130 +++++++++- .../chip-tool/zap-generated/test/Commands.h | 224 ++++++++++++++++++ 2 files changed, 345 insertions(+), 9 deletions(-) diff --git a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h index 5eb1bd9e2e6c3b..6611ee287ae9c1 100644 --- a/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool-darwin/zap-generated/test/Commands.h @@ -56130,12 +56130,24 @@ class TestBinding : public TestCommandBridge { err = TestWriteInvalidBindingTable_3(); break; case 4: - ChipLogProgress(chipTool, " ***** Test Step 4 : Write binding table\n"); - err = TestWriteBindingTable_4(); + ChipLogProgress(chipTool, " ***** Test Step 4 : Write binding table (endpoint 1)\n"); + err = TestWriteBindingTableEndpoint1_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Read binding table\n"); - err = TestReadBindingTable_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : Read binding table (endpoint 1)\n"); + err = TestReadBindingTableEndpoint1_5(); + break; + case 6: + ChipLogProgress(chipTool, " ***** Test Step 6 : Write binding table (endpoint 0)\n"); + err = TestWriteBindingTableEndpoint0_6(); + break; + case 7: + ChipLogProgress(chipTool, " ***** Test Step 7 : Read binding table (endpoint 0)\n"); + err = TestReadBindingTableEndpoint0_7(); + break; + case 8: + ChipLogProgress(chipTool, " ***** Test Step 8 : Verify endpoint 1 not changed\n"); + err = TestVerifyEndpoint1NotChanged_8(); break; } @@ -56152,7 +56164,7 @@ class TestBinding : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 6; + const uint16_t mTestCount = 9; chip::Optional mNodeId; chip::Optional mCluster; @@ -56245,7 +56257,7 @@ class TestBinding : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteBindingTable_4() + CHIP_ERROR TestWriteBindingTableEndpoint1_4() { CHIPDevice * device = GetConnectedDevice(); CHIPTestBinding * cluster = [[CHIPTestBinding alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -56273,7 +56285,7 @@ class TestBinding : public TestCommandBridge { } [cluster writeAttributeBindingWithValue:bindingArgument completionHandler:^(NSError * _Nullable err) { - NSLog(@"Write binding table Error: %@", err); + NSLog(@"Write binding table (endpoint 1) Error: %@", err); VerifyOrReturn(CheckValue("status", err, 0)); @@ -56283,7 +56295,107 @@ class TestBinding : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBindingTable_5() + CHIP_ERROR TestReadBindingTableEndpoint1_5() + { + CHIPDevice * device = GetConnectedDevice(); + CHIPTestBinding * cluster = [[CHIPTestBinding alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = [NSNumber numberWithBool:true]; + [cluster + readAttributeBindingWithParams:params + completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read binding table (endpoint 1) Error: %@", err); + + VerifyOrReturn(CheckValue("status", err, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("Binding", [actualValue count], static_cast(3))); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); + VerifyOrReturn(CheckValue("Group", ((CHIPBindingClusterTargetStruct *) actualValue[0]).group, 1U)); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[1]).fabricIndex, 1)); + VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[1]).node, 1ULL)); + VerifyOrReturn( + CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[1]).endpoint, 1U)); + VerifyOrReturn( + CheckValue("Cluster", ((CHIPBindingClusterTargetStruct *) actualValue[1]).cluster, 6UL)); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[2]).fabricIndex, 1)); + VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[2]).node, 2ULL)); + VerifyOrReturn( + CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[2]).endpoint, 1U)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWriteBindingTableEndpoint0_6() + { + CHIPDevice * device = GetConnectedDevice(); + CHIPTestBinding * cluster = [[CHIPTestBinding alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + id bindingArgument; + { + NSMutableArray * temp_0 = [[NSMutableArray alloc] init]; + temp_0[0] = [[CHIPBindingClusterTargetStruct alloc] init]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).fabricIndex = [NSNumber numberWithUnsignedChar:0]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).node = [NSNumber numberWithUnsignedLongLong:3ULL]; + ((CHIPBindingClusterTargetStruct *) temp_0[0]).endpoint = [NSNumber numberWithUnsignedShort:1U]; + + bindingArgument = temp_0; + } + [cluster writeAttributeBindingWithValue:bindingArgument + completionHandler:^(NSError * _Nullable err) { + NSLog(@"Write binding table (endpoint 0) Error: %@", err); + + VerifyOrReturn(CheckValue("status", err, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadBindingTableEndpoint0_7() + { + CHIPDevice * device = GetConnectedDevice(); + CHIPTestBinding * cluster = [[CHIPTestBinding alloc] initWithDevice:device endpoint:0 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + CHIPReadParams * params = [[CHIPReadParams alloc] init]; + params.fabricFiltered = [NSNumber numberWithBool:true]; + [cluster + readAttributeBindingWithParams:params + completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read binding table (endpoint 0) Error: %@", err); + + VerifyOrReturn(CheckValue("status", err, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("Binding", [actualValue count], static_cast(1))); + VerifyOrReturn( + CheckValue("FabricIndex", ((CHIPBindingClusterTargetStruct *) actualValue[0]).fabricIndex, 1)); + VerifyOrReturn(CheckValue("Node", ((CHIPBindingClusterTargetStruct *) actualValue[0]).node, 3ULL)); + VerifyOrReturn( + CheckValue("Endpoint", ((CHIPBindingClusterTargetStruct *) actualValue[0]).endpoint, 1U)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestVerifyEndpoint1NotChanged_8() { CHIPDevice * device = GetConnectedDevice(); CHIPTestBinding * cluster = [[CHIPTestBinding alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -56294,7 +56406,7 @@ class TestBinding : public TestCommandBridge { [cluster readAttributeBindingWithParams:params completionHandler:^(NSArray * _Nullable value, NSError * _Nullable err) { - NSLog(@"Read binding table Error: %@", err); + NSLog(@"Verify endpoint 1 not changed Error: %@", err); VerifyOrReturn(CheckValue("status", err, 0)); diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 622e648d6c6c4a..021a9f8bb6627e 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -105230,6 +105230,7 @@ class Test_TC_DD_3_11Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DD_3_11Suite() {} @@ -105268,6 +105269,11 @@ class Test_TC_DD_3_11Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -105275,6 +105281,7 @@ class Test_TC_DD_3_11Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -105298,6 +105305,7 @@ class Test_TC_DD_3_12Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DD_3_12Suite() {} @@ -105336,6 +105344,11 @@ class Test_TC_DD_3_12Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -105343,6 +105356,7 @@ class Test_TC_DD_3_12Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -105366,6 +105380,7 @@ class Test_TC_DD_3_13Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DD_3_13Suite() {} @@ -105404,6 +105419,11 @@ class Test_TC_DD_3_13Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -105411,6 +105431,7 @@ class Test_TC_DD_3_13Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -105434,6 +105455,7 @@ class Test_TC_DD_3_14Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DD_3_14Suite() {} @@ -105472,6 +105494,11 @@ class Test_TC_DD_3_14Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -105479,6 +105506,7 @@ class Test_TC_DD_3_14Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -107721,6 +107749,11 @@ class Test_TC_DM_2_3Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -107728,6 +107761,7 @@ class Test_TC_DM_2_3Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -107751,6 +107785,7 @@ class Test_TC_DM_2_4Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DM_2_4Suite() {} @@ -107789,6 +107824,11 @@ class Test_TC_DM_2_4Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -107796,6 +107836,7 @@ class Test_TC_DM_2_4Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -107819,6 +107860,7 @@ class Test_TC_DM_3_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DM_3_2Suite() {} @@ -107857,6 +107899,11 @@ class Test_TC_DM_3_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -107864,6 +107911,7 @@ class Test_TC_DM_3_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -107887,6 +107935,7 @@ class Test_TC_DM_3_4Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_DM_3_4Suite() {} @@ -108636,6 +108685,7 @@ class Test_TC_GENDIAG_1_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_GENDIAG_1_2Suite() {} @@ -108674,6 +108724,11 @@ class Test_TC_GENDIAG_1_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -108681,6 +108736,7 @@ class Test_TC_GENDIAG_1_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -108704,6 +108760,7 @@ class Test_TC_GENDIAG_2_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_GENDIAG_2_1Suite() {} @@ -108742,6 +108799,11 @@ class Test_TC_GENDIAG_2_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -108749,6 +108811,7 @@ class Test_TC_GENDIAG_2_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -108772,6 +108835,7 @@ class Test_TC_I_2_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_I_2_2Suite() {} @@ -108810,6 +108874,11 @@ class Test_TC_I_2_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -108817,6 +108886,7 @@ class Test_TC_I_2_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -108840,6 +108910,7 @@ class Test_TC_I_2_3Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_I_2_3Suite() {} @@ -108878,6 +108949,11 @@ class Test_TC_I_2_3Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -108885,6 +108961,7 @@ class Test_TC_I_2_3Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -108908,6 +108985,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_ILL_2_1Suite() {} @@ -108946,6 +109024,11 @@ class Test_TC_ILL_2_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -108953,6 +109036,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -108976,6 +109060,7 @@ class Test_TC_ILL_2_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_ILL_2_2Suite() {} @@ -109014,6 +109099,11 @@ class Test_TC_ILL_2_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109021,6 +109111,7 @@ class Test_TC_ILL_2_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109044,6 +109135,7 @@ class Test_TC_IDM_1_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_1_1Suite() {} @@ -109082,6 +109174,11 @@ class Test_TC_IDM_1_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109089,6 +109186,7 @@ class Test_TC_IDM_1_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109112,6 +109210,7 @@ class Test_TC_IDM_1_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_1_2Suite() {} @@ -109150,6 +109249,11 @@ class Test_TC_IDM_1_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109157,6 +109261,7 @@ class Test_TC_IDM_1_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109180,6 +109285,7 @@ class Test_TC_IDM_2_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_2_1Suite() {} @@ -109218,6 +109324,11 @@ class Test_TC_IDM_2_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109225,6 +109336,7 @@ class Test_TC_IDM_2_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109248,6 +109360,7 @@ class Test_TC_IDM_2_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_2_2Suite() {} @@ -109286,6 +109399,11 @@ class Test_TC_IDM_2_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109293,6 +109411,7 @@ class Test_TC_IDM_2_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109316,6 +109435,7 @@ class Test_TC_IDM_3_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_3_1Suite() {} @@ -109354,6 +109474,11 @@ class Test_TC_IDM_3_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109361,6 +109486,7 @@ class Test_TC_IDM_3_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109384,6 +109510,7 @@ class Test_TC_IDM_3_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_3_2Suite() {} @@ -109422,6 +109549,11 @@ class Test_TC_IDM_3_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109429,6 +109561,7 @@ class Test_TC_IDM_3_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109452,6 +109585,7 @@ class Test_TC_IDM_4_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_4_1Suite() {} @@ -109490,6 +109624,11 @@ class Test_TC_IDM_4_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109497,6 +109636,7 @@ class Test_TC_IDM_4_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109520,6 +109660,7 @@ class Test_TC_IDM_4_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_4_2Suite() {} @@ -109558,6 +109699,11 @@ class Test_TC_IDM_4_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109565,6 +109711,7 @@ class Test_TC_IDM_4_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109588,6 +109735,7 @@ class Test_TC_IDM_5_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_5_1Suite() {} @@ -109626,6 +109774,11 @@ class Test_TC_IDM_5_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109633,6 +109786,7 @@ class Test_TC_IDM_5_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109656,6 +109810,7 @@ class Test_TC_IDM_5_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_5_2Suite() {} @@ -109694,6 +109849,11 @@ class Test_TC_IDM_5_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109701,6 +109861,7 @@ class Test_TC_IDM_5_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109724,6 +109885,7 @@ class Test_TC_IDM_6_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_6_1Suite() {} @@ -109762,6 +109924,11 @@ class Test_TC_IDM_6_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109769,6 +109936,7 @@ class Test_TC_IDM_6_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109792,6 +109960,7 @@ class Test_TC_IDM_6_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_6_2Suite() {} @@ -109830,6 +109999,11 @@ class Test_TC_IDM_6_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109837,6 +110011,7 @@ class Test_TC_IDM_6_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109860,6 +110035,7 @@ class Test_TC_IDM_6_3Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_6_3Suite() {} @@ -109898,6 +110074,11 @@ class Test_TC_IDM_6_3Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109905,6 +110086,7 @@ class Test_TC_IDM_6_3Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109928,6 +110110,7 @@ class Test_TC_IDM_6_4Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_IDM_6_4Suite() {} @@ -109966,6 +110149,11 @@ class Test_TC_IDM_6_4Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -109973,6 +110161,7 @@ class Test_TC_IDM_6_4Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -109996,6 +110185,7 @@ class Test_TC_MC_3_12Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_MC_3_12Suite() {} @@ -110034,6 +110224,11 @@ class Test_TC_MC_3_12Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -110041,6 +110236,7 @@ class Test_TC_MC_3_12Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -110064,6 +110260,7 @@ class Test_TC_MC_3_13Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_MC_3_13Suite() {} @@ -110102,6 +110299,11 @@ class Test_TC_MC_3_13Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -110109,6 +110311,7 @@ class Test_TC_MC_3_13Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -110132,6 +110335,7 @@ class Test_TC_MC_4_1Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_MC_4_1Suite() {} @@ -110170,6 +110374,11 @@ class Test_TC_MC_4_1Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -110177,6 +110386,7 @@ class Test_TC_MC_4_1Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -110200,6 +110410,7 @@ class Test_TC_MC_8_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_MC_8_2Suite() {} @@ -110238,6 +110449,11 @@ class Test_TC_MC_8_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -110245,6 +110461,7 @@ class Test_TC_MC_8_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override { @@ -110268,6 +110485,7 @@ class Test_TC_MC_9_2Suite : public TestCommand AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); } ~Test_TC_MC_9_2Suite() {} @@ -110306,6 +110524,11 @@ class Test_TC_MC_9_2Suite : public TestCommand } } + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + private: std::atomic_uint16_t mTestIndex; const uint16_t mTestCount = 0; @@ -110313,6 +110536,7 @@ class Test_TC_MC_9_2Suite : public TestCommand chip::Optional mNodeId; chip::Optional mCluster; chip::Optional mEndpoint; + chip::Optional mTimeout; void OnDiscoveryCommandsResults(const DiscoveryCommandResult & value) override {