From 3cbd574055b00c7b8b346533c00ab8a148f234b7 Mon Sep 17 00:00:00 2001 From: Vivien Nicolas Date: Wed, 6 Jul 2022 14:34:06 +0200 Subject: [PATCH] Update generated code --- .../chip-tool/zap-generated/test/Commands.h | 1356 ++++------------- .../zap-generated/test/Commands.h | 303 +++- 2 files changed, 572 insertions(+), 1087 deletions(-) diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index c3bd19a940089b..faac6f21e02ad4 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -2624,7 +2624,6 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - FeatureMapValue = value; } break; @@ -25795,7 +25794,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintIsUpperCase("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintIsHexString("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintMinLength("value.instanceName", value.instanceName.size(), 16)); @@ -25879,7 +25877,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("vendorId", value.vendorId, mVendorId.HasValue() ? mVendorId.Value() : 65521U)); } shouldContinue = true; @@ -25894,7 +25891,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("productId", value.productId, mProductId.HasValue() ? mProductId.Value() : 32769U)); } shouldContinue = true; @@ -25904,7 +25900,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - if (value.mrpRetryIntervalIdle.HasValue()) { VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalIdle.Value()", value.mrpRetryIntervalIdle.Value(), @@ -25918,7 +25913,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - if (value.mrpRetryIntervalActive.HasValue()) { VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalActive.Value()", @@ -25932,7 +25926,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("commissioningMode", value.commissioningMode, 1U)); } shouldContinue = true; @@ -25942,7 +25935,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("deviceType", value.deviceType, mDeviceType.HasValue() ? mDeviceType.Value() : 5U)); VerifyOrReturn(CheckConstraintMaxValue("value.deviceType", value.deviceType, 999U)); } @@ -25953,7 +25945,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxLength("value.deviceName", value.deviceName.size(), 32)); } shouldContinue = true; @@ -25963,7 +25954,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxValue("value.rotatingIdLen", value.rotatingIdLen, 100ULL)); } shouldContinue = true; @@ -25973,7 +25963,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintNotValue("value.pairingHint", value.pairingHint, 0U)); } shouldContinue = true; @@ -25983,7 +25972,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxLength("value.pairingInstruction", value.pairingInstruction.size(), 128)); } shouldContinue = true; @@ -25993,7 +25981,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value.numIPs", value.numIPs, 1U)); } shouldContinue = true; @@ -26018,7 +26005,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintIsUpperCase("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintIsHexString("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintMinLength("value.instanceName", value.instanceName.size(), 16)); @@ -26096,7 +26082,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("vendorId", value.vendorId, mVendorId.HasValue() ? mVendorId.Value() : 65521U)); } shouldContinue = true; @@ -26111,7 +26096,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("productId", value.productId, mProductId.HasValue() ? mProductId.Value() : 32769U)); } shouldContinue = true; @@ -26121,7 +26105,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - if (value.mrpRetryIntervalIdle.HasValue()) { VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalIdle.Value()", value.mrpRetryIntervalIdle.Value(), @@ -26135,7 +26118,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - if (value.mrpRetryIntervalActive.HasValue()) { VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalActive.Value()", @@ -26149,7 +26131,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("commissioningMode", value.commissioningMode, 1U)); } shouldContinue = true; @@ -26159,7 +26140,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("deviceType", value.deviceType, mDeviceType.HasValue() ? mDeviceType.Value() : 5U)); VerifyOrReturn(CheckConstraintMaxValue("value.deviceType", value.deviceType, 999U)); } @@ -26170,7 +26150,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxLength("value.deviceName", value.deviceName.size(), 32)); } shouldContinue = true; @@ -26180,7 +26159,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxValue("value.rotatingIdLen", value.rotatingIdLen, 100ULL)); } shouldContinue = true; @@ -26190,7 +26168,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintNotValue("value.pairingHint", value.pairingHint, 0U)); } shouldContinue = true; @@ -26200,7 +26177,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxLength("value.pairingInstruction", value.pairingInstruction.size(), 128)); } shouldContinue = true; @@ -26210,7 +26186,6 @@ class Test_TC_SC_4_2Suite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value.numIPs", value.numIPs, 1U)); } shouldContinue = true; @@ -36494,7 +36469,6 @@ class Test_TC_WNCV_4_5Suite : public TestCommand chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintNotValue("value", value, 0U)); - attrCurrentPositionLiftPercent100ths = value; } break; @@ -36504,7 +36478,6 @@ class Test_TC_WNCV_4_5Suite : public TestCommand chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckConstraintNotValue("value", value, 0U)); - attrCurrentPositionTiltPercent100ths = value; } break; @@ -36783,7 +36756,6 @@ class TV_TargetNavigatorClusterSuite : public TestCommand chip::app::Clusters::TargetNavigator::Commands::NavigateTargetResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37073,7 +37045,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueAsString("data", value.data, chip::ByteSpan(chip::Uint8::from_const_char("data"), 4))); } break; @@ -37083,7 +37054,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueAsString("data", value.data, chip::ByteSpan(chip::Uint8::from_const_char("data"), 4))); } break; @@ -37093,7 +37063,6 @@ class TV_ApplicationLauncherClusterSuite : public TestCommand chip::app::Clusters::ApplicationLauncher::Commands::LauncherResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueAsString("data", value.data, chip::ByteSpan(chip::Uint8::from_const_char("data"), 4))); } break; @@ -37745,7 +37714,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37756,7 +37724,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37767,7 +37734,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37778,7 +37744,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37789,7 +37754,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37800,7 +37764,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37811,7 +37774,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37822,7 +37784,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37833,7 +37794,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37855,7 +37815,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -37877,7 +37836,6 @@ class TV_MediaPlaybackClusterSuite : public TestCommand chip::app::Clusters::MediaPlayback::Commands::PlaybackResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -38213,7 +38171,6 @@ class TV_ChannelClusterSuite : public TestCommand chip::app::Clusters::Channel::Commands::ChangeChannelResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("data response", 13))); } @@ -38446,7 +38403,6 @@ class TV_ContentLauncherClusterSuite : public TestCommand chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("exampleData", 11))); } @@ -38457,7 +38413,6 @@ class TV_ContentLauncherClusterSuite : public TestCommand chip::app::Clusters::ContentLauncher::Commands::LaunchResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("data", value.data)); VerifyOrReturn(CheckValueAsString("data.Value()", value.data.Value(), chip::CharSpan("exampleData", 11))); } @@ -39897,7 +39852,6 @@ class TestClusterSuite : public TestCommand chip::app::Clusters::TestCluster::Commands::TestEnumsResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("arg1", value.arg1, 20003U)); - VerifyOrReturn(CheckValue("arg2", value.arg2, 101U)); } break; @@ -40138,13 +40092,10 @@ class TestClusterSuite : public TestCommand chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("wasPresent", value.wasPresent, true)); - VerifyOrReturn(CheckValuePresent("wasNull", value.wasNull)); VerifyOrReturn(CheckValue("wasNull.Value()", value.wasNull.Value(), false)); - VerifyOrReturn(CheckValuePresent("value", value.value)); VerifyOrReturn(CheckValue("value.Value()", value.value.Value(), 5U)); - VerifyOrReturn(CheckValuePresent("originalValue", value.originalValue)); VerifyOrReturn(CheckValueNonNull("originalValue.Value()", value.originalValue.Value())); VerifyOrReturn(CheckValue("originalValue.Value().Value()", value.originalValue.Value().Value(), 5U)); @@ -40225,7 +40176,6 @@ class TestClusterSuite : public TestCommand chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNull("nullableBoolean", value)); - booValueNull = value; } break; @@ -40271,7 +40221,6 @@ class TestClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("nullableBitmap8", value)); VerifyOrReturn(CheckValue("nullableBitmap8.Value()", value.Value(), 254U)); - nullableValue254 = value; } break; @@ -41277,7 +41226,6 @@ class TestClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("nullableEnumAttr", value)); VerifyOrReturn(CheckValue("nullableEnumAttr.Value()", value.Value(), 254U)); - nullableEnumAttr254 = value; } break; @@ -41321,7 +41269,6 @@ class TestClusterSuite : public TestCommand VerifyOrReturn(CheckValueNonNull("nullableOctetString", value)); VerifyOrReturn(CheckValueAsString("nullableOctetString.Value()", value.Value(), chip::ByteSpan(chip::Uint8::from_const_char("TestValue"), 9))); - if (value.IsNull()) { nullableOctetStrTestValue.SetNull(); @@ -41389,7 +41336,6 @@ class TestClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("nullableCharString", value)); VerifyOrReturn(CheckValueAsString("nullableCharString.Value()", value.Value(), chip::CharSpan("☉T☉", 7))); - if (value.IsNull()) { nullableCharStringSave.SetNull(); @@ -46157,10 +46103,8 @@ class TestClusterComplexTypesSuite : public TestCommand chip::app::Clusters::TestCluster::Commands::TestNullableOptionalResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("wasPresent", value.wasPresent, true)); - VerifyOrReturn(CheckValuePresent("wasNull", value.wasNull)); VerifyOrReturn(CheckValue("wasNull.Value()", value.wasNull.Value(), true)); - VerifyOrReturn(CheckValuePresent("originalValue", value.originalValue)); VerifyOrReturn(CheckValueNull("originalValue.Value()", value.originalValue.Value())); } @@ -46449,7 +46393,7 @@ class TestClusterComplexTypesSuite : public TestCommand class TestConstraintsSuite : public TestCommand { public: - TestConstraintsSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", 26, credsIssuerConfig) + TestConstraintsSuite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("TestConstraints", 32, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -46513,8 +46457,56 @@ class TestConstraintsSuite : public TestCommand break; case 5: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::BitMask value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("bitmap32", value, 0UL)); + } break; case 6: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 7: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::BitMask value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("bitmap32", value, 5UL)); + VerifyOrReturn(CheckConstraintHasMasksClear("value", value, 2UL)); + } + break; + case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::BitMask value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("bitmap32", value, 5UL)); + VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 1UL)); + } + break; + case 9: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::BitMask value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("bitmap32", value, 5UL)); + VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 4UL)); + } + break; + case 10: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::BitMask value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("bitmap32", value, 5UL)); + VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 1UL)); + VerifyOrReturn(CheckConstraintHasMasksSet("value", value, 4UL)); + } + break; + case 11: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 12: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint32_t value; @@ -46522,7 +46514,7 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintMinValue("value", value, 5UL)); } break; - case 7: + case 13: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint32_t value; @@ -46530,7 +46522,7 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintMaxValue("value", value, 5UL)); } break; - case 8: + case 14: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { uint32_t value; @@ -46538,13 +46530,13 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintNotValue("value", value, 6UL)); } break; - case 9: + case 15: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 10: + case 16: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 11: + case 17: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46552,7 +46544,7 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintMinLength("value", value.size(), 5)); } break; - case 12: + case 18: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46560,7 +46552,7 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintMaxLength("value", value.size(), 20)); } break; - case 13: + case 19: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46568,7 +46560,7 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintStartsWith("value", value, "**")); } break; - case 14: + case 20: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46576,10 +46568,10 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintEndsWith("value", value, "**")); } break; - case 15: + case 21: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 16: + case 22: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46588,10 +46580,10 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintIsLowerCase("value", value, true)); } break; - case 17: + case 23: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 18: + case 24: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46600,10 +46592,10 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintIsLowerCase("value", value, false)); } break; - case 19: + case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 20: + case 26: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46612,10 +46604,10 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintIsLowerCase("value", value, false)); } break; - case 21: + case 27: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 22: + case 28: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46623,10 +46615,10 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintIsHexString("value", value, false)); } break; - case 23: + case 29: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 24: + case 30: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::CharSpan value; @@ -46634,7 +46626,7 @@ class TestConstraintsSuite : public TestCommand VerifyOrReturn(CheckConstraintIsHexString("value", value, true)); } break; - case 25: + case 31: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; default: @@ -46696,131 +46688,164 @@ class TestConstraintsSuite : public TestCommand chip::NullOptional, chip::NullOptional); } case 5: { - LogStep(5, "Write attribute INT32U Value"); + LogStep(5, "Read attribute BITMAP32 Default Value"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, true, + chip::NullOptional); + } + case 6: { + LogStep(6, "Write attribute BITMAP32 with MaskVal1 and MaskVal3"); + ListFreer listFreer; + chip::BitMask value; + value = static_cast>(5UL); + return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, value, + chip::NullOptional, chip::NullOptional); + } + case 7: { + LogStep(7, "Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal2 is not set"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, true, + chip::NullOptional); + } + case 8: { + LogStep(8, "Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal1 is set"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, true, + chip::NullOptional); + } + case 9: { + LogStep(9, "Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal3 is set"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, true, + chip::NullOptional); + } + case 10: { + LogStep(10, "Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure Maskval1 and MaskVal3 are set"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Bitmap32::Id, true, + chip::NullOptional); + } + case 11: { + LogStep(11, "Write attribute INT32U Value"); ListFreer listFreer; uint32_t value; value = 5UL; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, value, chip::NullOptional, chip::NullOptional); } - case 6: { - LogStep(6, "Read attribute INT32U Value MinValue Constraints"); + case 12: { + LogStep(12, "Read attribute INT32U Value MinValue Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, true, chip::NullOptional); } - case 7: { - LogStep(7, "Read attribute INT32U Value MaxValue Constraints"); + case 13: { + LogStep(13, "Read attribute INT32U Value MaxValue Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, true, chip::NullOptional); } - case 8: { - LogStep(8, "Read attribute INT32U Value NotValue Constraints"); + case 14: { + LogStep(14, "Read attribute INT32U Value NotValue Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, true, chip::NullOptional); } - case 9: { - LogStep(9, "Write attribute INT32U Value Back to Default Value"); + case 15: { + LogStep(15, "Write attribute INT32U Value Back to Default Value"); ListFreer listFreer; uint32_t value; value = 0UL; return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::Int32u::Id, value, chip::NullOptional, chip::NullOptional); } - case 10: { - LogStep(10, "Write attribute CHAR_STRING Value"); + case 16: { + LogStep(16, "Write attribute CHAR_STRING Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("** Test **garbage: not in length on purpose", 10); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value, chip::NullOptional, chip::NullOptional); } - case 11: { - LogStep(11, "Read attribute CHAR_STRING Value MinLength Constraints"); + case 17: { + LogStep(17, "Read attribute CHAR_STRING Value MinLength Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 12: { - LogStep(12, "Read attribute CHAR_STRING Value MaxLength Constraints"); + case 18: { + LogStep(18, "Read attribute CHAR_STRING Value MaxLength Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 13: { - LogStep(13, "Read attribute CHAR_STRING Value StartsWith Constraints"); + case 19: { + LogStep(19, "Read attribute CHAR_STRING Value StartsWith Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 14: { - LogStep(14, "Read attribute CHAR_STRING Value EndsWith Constraints"); + case 20: { + LogStep(20, "Read attribute CHAR_STRING Value EndsWith Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 15: { - LogStep(15, "Write attribute CHAR_STRING Value"); + case 21: { + LogStep(21, "Write attribute CHAR_STRING Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("lowercasegarbage: not in length on purpose", 9); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value, chip::NullOptional, chip::NullOptional); } - case 16: { - LogStep(16, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints"); + case 22: { + LogStep(22, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 17: { - LogStep(17, "Write attribute CHAR_STRING Value"); + case 23: { + LogStep(23, "Write attribute CHAR_STRING Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("UPPERCASEgarbage: not in length on purpose", 9); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value, chip::NullOptional, chip::NullOptional); } - case 18: { - LogStep(18, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints"); + case 24: { + LogStep(24, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 19: { - LogStep(19, "Write attribute CHAR_STRING Value"); + case 25: { + LogStep(25, "Write attribute CHAR_STRING Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("lowUPPERgarbage: not in length on purpose", 8); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value, chip::NullOptional, chip::NullOptional); } - case 20: { - LogStep(20, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints"); + case 26: { + LogStep(26, "Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 21: { - LogStep(21, "Write attribute CHAR_STRING Value"); + case 27: { + LogStep(27, "Write attribute CHAR_STRING Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("ABCDEF012Vgarbage: not in length on purpose", 10); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value, chip::NullOptional, chip::NullOptional); } - case 22: { - LogStep(22, "Read attribute CHAR_STRING Value isHexString Constraints"); + case 28: { + LogStep(28, "Read attribute CHAR_STRING Value isHexString Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 23: { - LogStep(23, "Write attribute CHAR_STRING Value"); + case 29: { + LogStep(29, "Write attribute CHAR_STRING Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("ABCDEF0123garbage: not in length on purpose", 10); return WriteAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, value, chip::NullOptional, chip::NullOptional); } - case 24: { - LogStep(24, "Read attribute CHAR_STRING Value isHexString Constraints"); + case 30: { + LogStep(30, "Read attribute CHAR_STRING Value isHexString Constraints"); return ReadAttribute(kIdentityAlpha, GetEndpoint(1), TestCluster::Id, TestCluster::Attributes::CharString::Id, true, chip::NullOptional); } - case 25: { - LogStep(25, "Write attribute CHAR_STRING Value Back to Default Value"); + case 31: { + LogStep(31, "Write attribute CHAR_STRING Value Back to Default Value"); ListFreer listFreer; chip::CharSpan value; value = chip::Span("garbage: not in length on purpose", 0); @@ -46973,7 +46998,6 @@ class TestEventsSuite : public TestCommand { chip::app::Clusters::TestCluster::Commands::TestEmitTestEventResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - eventNumber = value.value; } break; @@ -47307,7 +47331,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintIsUpperCase("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintIsHexString("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintMinLength("value.instanceName", value.instanceName.size(), 16)); @@ -47359,7 +47382,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("longDiscriminator", value.longDiscriminator, mDiscriminator.HasValue() ? mDiscriminator.Value() : 3840U)); VerifyOrReturn(CheckConstraintMinValue("value.longDiscriminator", value.longDiscriminator, 0U)); @@ -47372,7 +47394,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("vendorId", value.vendorId, mVendorId.HasValue() ? mVendorId.Value() : 65521U)); } shouldContinue = true; @@ -47387,7 +47408,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("productId", value.productId, mProductId.HasValue() ? mProductId.Value() : 32769U)); } shouldContinue = true; @@ -47397,7 +47417,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - if (value.mrpRetryIntervalIdle.HasValue()) { VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalIdle.Value()", value.mrpRetryIntervalIdle.Value(), @@ -47411,7 +47430,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - if (value.mrpRetryIntervalActive.HasValue()) { VerifyOrReturn(CheckConstraintMaxValue("value.mrpRetryIntervalActive.Value()", @@ -47425,7 +47443,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("commissioningMode", value.commissioningMode, 1U)); } shouldContinue = true; @@ -47435,7 +47452,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxLength("value.deviceName", value.deviceName.size(), 32)); } shouldContinue = true; @@ -47445,7 +47461,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxValue("value.rotatingIdLen", value.rotatingIdLen, 100ULL)); } shouldContinue = true; @@ -47455,7 +47470,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintNotValue("value.pairingHint", value.pairingHint, 0U)); } shouldContinue = true; @@ -47465,7 +47479,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMaxLength("value.pairingInstruction", value.pairingInstruction.size(), 128)); } shouldContinue = true; @@ -47475,7 +47488,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintMinValue("value.numIPs", value.numIPs, 1U)); } shouldContinue = true; @@ -47500,7 +47512,6 @@ class TestDiscoverySuite : public TestCommand { chip::app::Clusters::DiscoveryCommands::Commands::DiscoveryCommandResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintIsUpperCase("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintIsHexString("value.instanceName", value.instanceName, true)); VerifyOrReturn(CheckConstraintMinLength("value.instanceName", value.instanceName.size(), 16)); @@ -47914,7 +47925,6 @@ class TestSaveAsSuite : public TestCommand chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("returnValue", value.returnValue, 20U)); - TestAddArgumentDefaultValue = value.returnValue; } break; @@ -47940,7 +47950,6 @@ class TestSaveAsSuite : public TestCommand bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("boolean", value, 0)); - readAttributeBooleanDefaultValue = value; } break; @@ -47972,7 +47981,6 @@ class TestSaveAsSuite : public TestCommand chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("bitmap8", value, 0U)); - readAttributeBitmap8DefaultValue = value; } break; @@ -48004,7 +48012,6 @@ class TestSaveAsSuite : public TestCommand chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("bitmap16", value, 0U)); - readAttributeBitmap16DefaultValue = value; } break; @@ -48036,7 +48043,6 @@ class TestSaveAsSuite : public TestCommand chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("bitmap32", value, 0UL)); - readAttributeBitmap32DefaultValue = value; } break; @@ -48068,7 +48074,6 @@ class TestSaveAsSuite : public TestCommand chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("bitmap64", value, 0ULL)); - readAttributeBitmap64DefaultValue = value; } break; @@ -48100,7 +48105,6 @@ class TestSaveAsSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int8u", value, 0U)); - readAttributeInt8uDefaultValue = value; } break; @@ -48132,7 +48136,6 @@ class TestSaveAsSuite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int16u", value, 0U)); - readAttributeInt16uDefaultValue = value; } break; @@ -48164,7 +48167,6 @@ class TestSaveAsSuite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int32u", value, 0UL)); - readAttributeInt32uDefaultValue = value; } break; @@ -48196,7 +48198,6 @@ class TestSaveAsSuite : public TestCommand uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int64u", value, 0ULL)); - readAttributeInt64uDefaultValue = value; } break; @@ -48228,7 +48229,6 @@ class TestSaveAsSuite : public TestCommand int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int8s", value, 0)); - readAttributeInt8sDefaultValue = value; } break; @@ -48260,7 +48260,6 @@ class TestSaveAsSuite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int16s", value, 0)); - readAttributeInt16sDefaultValue = value; } break; @@ -48292,7 +48291,6 @@ class TestSaveAsSuite : public TestCommand int32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int32s", value, 0L)); - readAttributeInt32sDefaultValue = value; } break; @@ -48324,7 +48322,6 @@ class TestSaveAsSuite : public TestCommand int64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("int64s", value, 0LL)); - readAttributeInt64sDefaultValue = value; } break; @@ -48356,7 +48353,6 @@ class TestSaveAsSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enum8", value, 0U)); - readAttributeEnum8DefaultValue = value; } break; @@ -48388,7 +48384,6 @@ class TestSaveAsSuite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enum16", value, 0U)); - readAttributeEnum16DefaultValue = value; } break; @@ -48420,7 +48415,6 @@ class TestSaveAsSuite : public TestCommand uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("epochUs", value, 0ULL)); - readAttributeEpochUSDefaultValue = value; } break; @@ -48452,7 +48446,6 @@ class TestSaveAsSuite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("epochS", value, 0UL)); - readAttributeEpochSDefaultValue = value; } break; @@ -48484,7 +48477,6 @@ class TestSaveAsSuite : public TestCommand chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("vendorId", value, 0U)); - readAttributeVendorIdDefaultValue = value; } break; @@ -48516,7 +48508,6 @@ class TestSaveAsSuite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("charString", value, chip::CharSpan("", 0))); - if (readAttributeCharStringDefaultValueBuffer != nullptr) { chip::Platform::MemoryFree(readAttributeCharStringDefaultValueBuffer); @@ -48544,7 +48535,6 @@ class TestSaveAsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("charString", value, chip::CharSpan("NotDefault", 10))); VerifyOrReturn(CheckConstraintNotValue("value", value, readAttributeCharStringDefaultValue)); - if (readAttributeCharStringNotDefaultValueBuffer != nullptr) { chip::Platform::MemoryFree(readAttributeCharStringNotDefaultValueBuffer); @@ -48583,7 +48573,6 @@ class TestSaveAsSuite : public TestCommand chip::ByteSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("octetString", value, chip::ByteSpan(chip::Uint8::from_const_char(""), 0))); - if (readAttributeOctetStringDefaultValueBuffer != nullptr) { chip::Platform::MemoryFree(readAttributeOctetStringDefaultValueBuffer); @@ -48612,7 +48601,6 @@ class TestSaveAsSuite : public TestCommand VerifyOrReturn( CheckValueAsString("octetString", value, chip::ByteSpan(chip::Uint8::from_const_char("NotDefault"), 10))); VerifyOrReturn(CheckConstraintNotValue("value", value, readAttributeOctetStringDefaultValue)); - if (readAttributeOctetStringNotDefaultValueBuffer != nullptr) { chip::Platform::MemoryFree(readAttributeOctetStringNotDefaultValueBuffer); @@ -49416,7 +49404,6 @@ class TestConfigVariablesSuite : public TestCommand chip::app::Clusters::TestCluster::Commands::TestAddArgumentsResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("returnValue", value.returnValue, 20U)); - TestAddArgumentDefaultValue = value.returnValue; } break; @@ -50667,7 +50654,6 @@ class TestOperationalCredentialsClusterSuite : public TestCommand chip::app::Clusters::OperationalCredentials::Commands::NOCResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("statusCode", value.statusCode, 0U)); - VerifyOrReturn(CheckValuePresent("fabricIndex", value.fabricIndex)); VerifyOrReturn(CheckValue("fabricIndex.Value()", value.fabricIndex.Value(), ourFabricIndex)); } @@ -50900,7 +50886,6 @@ class TestModeSelectClusterSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentMode", value, 4U)); - currentModeBeforeToggle = value; } break; @@ -50934,7 +50919,6 @@ class TestModeSelectClusterSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("onMode", value)); VerifyOrReturn(CheckValue("onMode.Value()", value.Value(), 7U)); - OnModeValue = value; } break; @@ -52836,7 +52820,6 @@ class TestMultiAdminSuite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("", 0))); - if (readFromAlphaBuffer != nullptr) { chip::Platform::MemoryFree(readFromAlphaBuffer); @@ -53531,23 +53514,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53557,7 +53531,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfTotalUsersSupported", value, 10U)); - NumberOfTotalUsersSupported = value; } break; @@ -53576,29 +53549,20 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53614,29 +53578,20 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53649,30 +53604,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53685,30 +53631,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53721,30 +53658,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 6U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53757,30 +53685,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("new_user", 8))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 305441741UL)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 3U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 6U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 2U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53793,30 +53712,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user", 9))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 466460832UL)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 1U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53829,30 +53739,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("test_user2", 10))); - VerifyOrReturn(CheckValueNonNull("userUniqueId", value.userUniqueId)); VerifyOrReturn(CheckValue("userUniqueId.Value()", value.userUniqueId.Value(), 12648430UL)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 2U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53865,29 +53766,20 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, NumberOfTotalUsersSupported)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("last_user", 9))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -53906,23 +53798,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex)); VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } @@ -53936,29 +53819,20 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex)); VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } @@ -53978,23 +53852,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54004,23 +53869,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, NumberOfTotalUsersSupported)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54030,7 +53886,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfPINUsersSupported", value, 10U)); - NumberOfPINUsersSupported = value; } break; @@ -54040,13 +53895,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54062,10 +53913,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -54076,21 +53925,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -54099,13 +53942,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 1)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54115,16 +53955,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, true)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54134,9 +53970,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -54147,9 +53981,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54159,7 +53991,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfRFIDUsersSupported", value, 10U)); - NumberOfRFIDUsersSupported = value; } break; @@ -54175,13 +54006,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54191,9 +54018,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -54204,21 +54029,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -54230,13 +54049,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 2)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54246,16 +54062,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, true)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54265,9 +54077,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -54278,9 +54088,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54290,9 +54098,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54303,9 +54109,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54316,9 +54120,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54329,9 +54131,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54342,9 +54142,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54355,9 +54153,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54368,9 +54164,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54381,9 +54175,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 2U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54394,9 +54186,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 2U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54407,9 +54197,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -54420,10 +54208,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 2U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54434,9 +54220,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 2U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54447,9 +54231,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54460,21 +54242,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -54489,13 +54265,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 4U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 3)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex)); VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } @@ -54506,9 +54279,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U)); } @@ -54519,21 +54290,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -54551,13 +54316,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[3].credentialIndex", iter_1.GetValue().credentialIndex, 5U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 4)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex)); VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } @@ -54571,13 +54333,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -54588,21 +54346,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -54617,13 +54369,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 5U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 3)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextUserIndex", value.nextUserIndex)); VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } @@ -54637,13 +54386,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -54654,23 +54399,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54680,10 +54416,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 2U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -54697,13 +54431,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54714,13 +54444,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54731,13 +54457,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -54748,21 +54470,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -54771,13 +54487,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 5U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 1)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54787,23 +54500,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54813,10 +54517,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 2U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -54827,10 +54529,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 3U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -54841,10 +54541,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 4U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 7U)); } @@ -54858,13 +54556,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54874,13 +54568,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54890,13 +54580,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -54906,23 +54592,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54932,23 +54609,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54958,23 +54626,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 3U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -54984,23 +54643,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 4U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -55010,9 +54660,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -55022,10 +54670,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -55035,21 +54681,15 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNonNull("userName", value.userName)); VerifyOrReturn(CheckValueAsString("userName.Value()", value.userName.Value(), chip::CharSpan("", 0))); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNonNull("userStatus", value.userStatus)); VerifyOrReturn(CheckValue("userStatus.Value()", value.userStatus.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("userType", value.userType)); VerifyOrReturn(CheckValue("userType.Value()", value.userType.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentialRule", value.credentialRule)); VerifyOrReturn(CheckValue("credentialRule.Value()", value.credentialRule.Value(), 0U)); - VerifyOrReturn(CheckValueNonNull("credentials", value.credentials)); { auto iter_1 = value.credentials.Value().begin(); @@ -55058,13 +54698,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 0U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 1)); } - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -55074,16 +54711,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, true)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValue("creatorFabricIndex.Value()", value.creatorFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValue("lastModifiedFabricIndex.Value()", value.lastModifiedFabricIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -55093,9 +54726,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -55126,23 +54757,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValueNull("userName", value.userName)); - VerifyOrReturn(CheckValueNull("userUniqueId", value.userUniqueId)); - VerifyOrReturn(CheckValueNull("userStatus", value.userStatus)); - VerifyOrReturn(CheckValueNull("userType", value.userType)); - VerifyOrReturn(CheckValueNull("credentialRule", value.credentialRule)); - VerifyOrReturn(CheckValueNull("credentials", value.credentials)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; @@ -55152,13 +54774,9 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("credentialExists", value.credentialExists, false)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); - VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; @@ -55168,10 +54786,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -55182,9 +54798,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -55195,9 +54809,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } @@ -55208,9 +54820,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } @@ -55221,9 +54831,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U)); } @@ -55234,9 +54842,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 137U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 7U)); } @@ -56930,10 +56536,8 @@ class DL_LockUnlockSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -57225,10 +56829,8 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -57239,7 +56841,6 @@ class DL_SchedulesSuite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfTotalUsersSupported", value, 10U)); - NumberOfTotalUsersSupported = value; } break; @@ -57249,7 +56850,6 @@ class DL_SchedulesSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfWeekDaySchedulesSupportedPerUser", value, 10U)); - NumberOfWeekDaySchedulesSupportedPerUser = value; } break; @@ -57259,7 +56859,6 @@ class DL_SchedulesSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfYearDaySchedulesSupportedPerUser", value, 10U)); - NumberOfYearDaySchedulesSupportedPerUser = value; } break; @@ -57269,7 +56868,6 @@ class DL_SchedulesSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfHolidaySchedulesSupported", value, 10U)); - NumberOfHolidaySchedulesSupported = value; } break; @@ -57321,9 +56919,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57333,9 +56929,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 0U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57346,9 +56940,7 @@ class DL_SchedulesSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, static_cast(NumberOfWeekDaySchedulesSupportedPerUser + 1))); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57358,9 +56950,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 0U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57370,9 +56960,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, static_cast(NumberOfTotalUsersSupported + 1))); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57382,9 +56970,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57412,9 +56998,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57424,9 +57008,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 0U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57437,9 +57019,7 @@ class DL_SchedulesSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, static_cast(NumberOfYearDaySchedulesSupportedPerUser + 1))); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57449,9 +57029,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 0U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57461,9 +57039,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, static_cast(NumberOfTotalUsersSupported + 1))); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57473,9 +57049,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57497,7 +57071,6 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57507,7 +57080,6 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 0U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57518,7 +57090,6 @@ class DL_SchedulesSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn( CheckValue("holidayIndex", value.holidayIndex, static_cast(NumberOfHolidaySchedulesSupported + 1))); - VerifyOrReturn(CheckValue("status", value.status, 133U)); } break; @@ -57531,15 +57102,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -57553,23 +57120,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 15U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 16U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 18U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0U)); } @@ -57583,14 +57143,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); } @@ -57616,23 +57172,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 15U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 16U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 18U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0U)); } @@ -57643,14 +57192,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); } @@ -57661,15 +57206,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -57695,23 +57236,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 15U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 16U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 18U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0U)); } @@ -57722,14 +57256,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); } @@ -57740,15 +57270,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -57765,23 +57291,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 15U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 16U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 18U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 0U)); } @@ -57792,14 +57311,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); } @@ -57810,15 +57325,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -57832,23 +57343,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 2U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59U)); } @@ -57862,14 +57366,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL)); } @@ -57883,15 +57383,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 123456UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 1234567UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 1U)); } @@ -57905,9 +57401,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57920,9 +57414,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -57932,14 +57424,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); } @@ -57950,14 +57438,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL)); } @@ -57968,15 +57452,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -57987,15 +57467,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 123456UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 1234567UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 1U)); } @@ -58012,9 +57488,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58027,9 +57501,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58039,23 +57511,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 2U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59U)); } @@ -58075,23 +57540,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59U)); } @@ -58105,14 +57563,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 4U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL)); } @@ -58126,23 +57580,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 4U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 64U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59U)); } @@ -58156,14 +57603,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 55555UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 7777777UL)); } @@ -58177,9 +57620,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58189,9 +57630,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 4U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58201,9 +57640,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 4U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58213,9 +57650,7 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58225,15 +57660,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -58244,15 +57675,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 123456UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 1234567UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 1U)); } @@ -58266,15 +57693,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, NumberOfHolidaySchedulesSupported)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 1UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 100UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 4U)); } @@ -58285,10 +57708,8 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -58308,15 +57729,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 12345UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 12345689UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 0U)); } @@ -58327,7 +57744,6 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58337,15 +57753,11 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, NumberOfHolidaySchedulesSupported)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 1UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 100UL)); - VerifyOrReturn(CheckValuePresent("operatingMode", value.operatingMode)); VerifyOrReturn(CheckValue("operatingMode.Value()", value.operatingMode.Value(), 4U)); } @@ -58356,23 +57768,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59U)); } @@ -58383,14 +57788,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL)); } @@ -58404,7 +57805,6 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58414,7 +57814,6 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58424,7 +57823,6 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetHolidayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("holidayIndex", value.holidayIndex, NumberOfHolidaySchedulesSupported)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); } break; @@ -58434,23 +57832,16 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("daysMask", value.daysMask)); VerifyOrReturn(CheckValue("daysMask.Value()", value.daysMask.Value(), 1U)); - VerifyOrReturn(CheckValuePresent("startHour", value.startHour)); VerifyOrReturn(CheckValue("startHour.Value()", value.startHour.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("startMinute", value.startMinute)); VerifyOrReturn(CheckValue("startMinute.Value()", value.startMinute.Value(), 0U)); - VerifyOrReturn(CheckValuePresent("endHour", value.endHour)); VerifyOrReturn(CheckValue("endHour.Value()", value.endHour.Value(), 23U)); - VerifyOrReturn(CheckValuePresent("endMinute", value.endMinute)); VerifyOrReturn(CheckValue("endMinute.Value()", value.endMinute.Value(), 59U)); } @@ -58461,14 +57852,10 @@ class DL_SchedulesSuite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 1U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 9000UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 888888888UL)); } @@ -60050,10 +59437,8 @@ class Test_TC_DLRK_2_2Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -60329,203 +59714,199 @@ class Test_TC_DLRK_2_3Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); - } - break; - case 2: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 3: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 4: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - case 5: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - { - uint32_t value; - VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("autoRelockTime", value, 10UL)); - } - break; - case 6: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - case 7: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - { - chip::app::DataModel::Nullable value; - VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValueNonNull("lockState", value)); - VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 1U)); - } - break; - case 8: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - break; - default: - LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); - } - - if (shouldContinue) - { - ContinueOnChipMainThread(CHIP_NO_ERROR); - } - } - - CHIP_ERROR DoTestStep(uint16_t testIndex) override - { - using namespace chip::app::Clusters; - switch (testIndex) - { - case 0: { - LogStep(0, "Wait for the commissioned device to be retrieved"); - ListFreer listFreer; - chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; - value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; - return WaitForCommissionee(kIdentityAlpha, value); - } - case 1: { - LogStep(1, "Create new PIN credential and lock/unlock user"); - ListFreer listFreer; - chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; - value.operationType = static_cast(0); - - value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 1U; - - value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); - value.userIndex.SetNull(); - value.userStatus.SetNull(); - value.userType.SetNull(); - return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, - chip::Optional(10000), chip::NullOptional - - ); - } - case 2: { - LogStep(2, "Precondition: Door is in locked state"); - ListFreer listFreer; - chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); - return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, - chip::Optional(10000), chip::NullOptional - - ); - } - case 3: { - LogStep(3, "TH writes AutoRelockTime attribute value as 10 seconds on the DUT"); - ListFreer listFreer; - uint32_t value; - value = 10UL; - return WriteAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::AutoRelockTime::Id, value, - chip::NullOptional, chip::NullOptional); - } - case 4: { - LogStep(4, "TH sends the unlock Door command to the DUT with valid PINCode"); - ListFreer listFreer; - chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; - value.pinCode.Emplace(); - value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); - return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, - chip::Optional(10000), chip::NullOptional - - ); - } - case 5: { - LogStep(5, "TH reads AutoRelockTime attribute from DUT"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::AutoRelockTime::Id, true, - chip::NullOptional); - } - case 6: { - LogStep(6, "Wait 10000ms"); - ListFreer listFreer; - chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; - value.ms = 10000UL; - return WaitForMs(kIdentityAlpha, value); - } - case 7: { - LogStep(7, "TH reads LockState attribute"); - return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true, - chip::NullOptional); - } - case 8: { - LogStep(8, "Clean the created credential"); - ListFreer listFreer; - chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; - value.credential.SetNonNull(); - - value.credential.Value().credentialType = static_cast(1); - value.credential.Value().credentialIndex = 1U; - - return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, - chip::Optional(10000), chip::NullOptional - - ); - } - } - return CHIP_NO_ERROR; - } -}; - -class Test_TC_DLRK_2_4Suite : public TestCommand -{ -public: - Test_TC_DLRK_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLRK_2_4", 8, credsIssuerConfig) - { - AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); - AddArgument("cluster", &mCluster); - AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); - AddArgument("timeout", 0, UINT16_MAX, &mTimeout); - } - - ~Test_TC_DLRK_2_4Suite() {} - - chip::System::Clock::Timeout GetWaitDuration() const override - { - return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); - } - -private: - chip::Optional mNodeId; - chip::Optional mCluster; - chip::Optional mEndpoint; - chip::Optional mTimeout; - - chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } - - // - // Tests methods - // - - void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override - { - bool shouldContinue = false; - - switch (mTestIndex - 1) - { - case 0: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - shouldContinue = true; - break; - case 1: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); - { - chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; - VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); + VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); + } + break; + case 2: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 3: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 4: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 5: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + uint32_t value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("autoRelockTime", value, 10UL)); + } + break; + case 6: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + shouldContinue = true; + break; + case 7: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::DataModel::Nullable value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValueNonNull("lockState", value)); + VerifyOrReturn(CheckValue("lockState.Value()", value.Value(), 1U)); + } + break; + case 8: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + default: + LogErrorOnFailure(ContinueOnChipMainThread(CHIP_ERROR_INVALID_ARGUMENT)); + } + + if (shouldContinue) + { + ContinueOnChipMainThread(CHIP_NO_ERROR); + } + } + + CHIP_ERROR DoTestStep(uint16_t testIndex) override + { + using namespace chip::app::Clusters; + switch (testIndex) + { + case 0: { + LogStep(0, "Wait for the commissioned device to be retrieved"); + ListFreer listFreer; + chip::app::Clusters::DelayCommands::Commands::WaitForCommissionee::Type value; + value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; + return WaitForCommissionee(kIdentityAlpha, value); + } + case 1: { + LogStep(1, "Create new PIN credential and lock/unlock user"); + ListFreer listFreer; + chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; + value.operationType = static_cast(0); + + value.credential.credentialType = static_cast(1); + value.credential.credentialIndex = 1U; + + value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + value.userIndex.SetNull(); + value.userStatus.SetNull(); + value.userType.SetNull(); + return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::SetCredential::Id, value, + chip::Optional(10000), chip::NullOptional + + ); + } + case 2: { + LogStep(2, "Precondition: Door is in locked state"); + ListFreer listFreer; + chip::app::Clusters::DoorLock::Commands::LockDoor::Type value; + value.pinCode.Emplace(); + value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::LockDoor::Id, value, + chip::Optional(10000), chip::NullOptional + + ); + } + case 3: { + LogStep(3, "TH writes AutoRelockTime attribute value as 10 seconds on the DUT"); + ListFreer listFreer; + uint32_t value; + value = 10UL; + return WriteAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::AutoRelockTime::Id, value, + chip::NullOptional, chip::NullOptional); + } + case 4: { + LogStep(4, "TH sends the unlock Door command to the DUT with valid PINCode"); + ListFreer listFreer; + chip::app::Clusters::DoorLock::Commands::UnlockDoor::Type value; + value.pinCode.Emplace(); + value.pinCode.Value() = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); + return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::UnlockDoor::Id, value, + chip::Optional(10000), chip::NullOptional + + ); + } + case 5: { + LogStep(5, "TH reads AutoRelockTime attribute from DUT"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::AutoRelockTime::Id, true, + chip::NullOptional); + } + case 6: { + LogStep(6, "Wait 10000ms"); + ListFreer listFreer; + chip::app::Clusters::DelayCommands::Commands::WaitForMs::Type value; + value.ms = 10000UL; + return WaitForMs(kIdentityAlpha, value); + } + case 7: { + LogStep(7, "TH reads LockState attribute"); + return ReadAttribute(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Attributes::LockState::Id, true, + chip::NullOptional); + } + case 8: { + LogStep(8, "Clean the created credential"); + ListFreer listFreer; + chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; + value.credential.SetNonNull(); + + value.credential.Value().credentialType = static_cast(1); + value.credential.Value().credentialIndex = 1U; + + return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, + chip::Optional(10000), chip::NullOptional + + ); + } + } + return CHIP_NO_ERROR; + } +}; + +class Test_TC_DLRK_2_4Suite : public TestCommand +{ +public: + Test_TC_DLRK_2_4Suite(CredentialIssuerCommands * credsIssuerConfig) : TestCommand("Test_TC_DLRK_2_4", 8, credsIssuerConfig) + { + AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); + AddArgument("cluster", &mCluster); + AddArgument("endpoint", 0, UINT16_MAX, &mEndpoint); + AddArgument("timeout", 0, UINT16_MAX, &mTimeout); + } + + ~Test_TC_DLRK_2_4Suite() {} + + chip::System::Clock::Timeout GetWaitDuration() const override + { + return chip::System::Clock::Seconds16(mTimeout.ValueOr(kTimeoutInSeconds)); + } + +private: + chip::Optional mNodeId; + chip::Optional mCluster; + chip::Optional mEndpoint; + chip::Optional mTimeout; + chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } + + // + // Tests methods + // + + void OnResponse(const chip::app::StatusIB & status, chip::TLV::TLVReader * data) override + { + bool shouldContinue = false; + + switch (mTestIndex - 1) + { + case 0: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + shouldContinue = true; + break; + case 1: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; + VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); + VerifyOrReturn(CheckValue("status", value.status, 0U)); + VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); + VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -60702,10 +60083,8 @@ class Test_TC_DLRK_2_5Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -60716,7 +60095,6 @@ class Test_TC_DLRK_2_5Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfWeekDaySchedulesSupportedPerUser", value, 10U)); - NumberOfWeekDaySchedulesSupportedPerUser = value; } break; @@ -60726,7 +60104,6 @@ class Test_TC_DLRK_2_5Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfTotalUsersSupported", value, 10U)); - NumberOfTotalUsersSupported = value; } break; @@ -60741,7 +60118,6 @@ class Test_TC_DLRK_2_5Suite : public TestCommand VerifyOrReturn(CheckConstraintMinValue("value.weekDayIndex", value.weekDayIndex, 1U)); VerifyOrReturn(CheckConstraintMinValue("value.userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckConstraintHasValue("value.daysMask", value.daysMask, true)); VerifyOrReturn(CheckConstraintMinValue("value.daysMask.Value()", value.daysMask.Value(), 0U)); VerifyOrReturn(CheckConstraintMaxValue("value.daysMask.Value()", value.daysMask.Value(), 6U)); @@ -60768,19 +60144,12 @@ class Test_TC_DLRK_2_5Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 0U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckConstraintHasValue("value.daysMask", value.daysMask, false)); - VerifyOrReturn(CheckConstraintHasValue("value.startHour", value.startHour, false)); - VerifyOrReturn(CheckConstraintHasValue("value.startMinute", value.startMinute, false)); - VerifyOrReturn(CheckConstraintHasValue("value.endHour", value.endHour, false)); - VerifyOrReturn(CheckConstraintHasValue("value.endMinute", value.endMinute, false)); } break; @@ -60793,19 +60162,12 @@ class Test_TC_DLRK_2_5Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetWeekDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("weekDayIndex", value.weekDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 1U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckConstraintHasValue("value.daysMask", value.daysMask, false)); - VerifyOrReturn(CheckConstraintHasValue("value.startHour", value.startHour, false)); - VerifyOrReturn(CheckConstraintHasValue("value.startMinute", value.startMinute, false)); - VerifyOrReturn(CheckConstraintHasValue("value.endHour", value.endHour, false)); - VerifyOrReturn(CheckConstraintHasValue("value.endMinute", value.endMinute, false)); } break; @@ -60989,10 +60351,8 @@ class Test_TC_DLRK_2_7Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } @@ -61003,10 +60363,8 @@ class Test_TC_DLRK_2_7Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 2U)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } @@ -61017,7 +60375,6 @@ class Test_TC_DLRK_2_7Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfYearDaySchedulesSupportedPerUser", value, 10U)); - NumberOfYearDaySchedulesSupportedPerUser = value; } break; @@ -61027,7 +60384,6 @@ class Test_TC_DLRK_2_7Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfTotalUsersSupported", value, 10U)); - NumberOfTotalUsersSupported = value; } break; @@ -61042,7 +60398,6 @@ class Test_TC_DLRK_2_7Suite : public TestCommand VerifyOrReturn(CheckConstraintMinValue("value.yearDayIndex", value.yearDayIndex, 1U)); VerifyOrReturn(CheckConstraintMinValue("value.userIndex", value.userIndex, 1U)); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckConstraintHasValue("value.localStartTime", value.localStartTime, true)); VerifyOrReturn(CheckConstraintType("value.localStartTime.Value()", "", "epoch-s")); VerifyOrReturn(CheckConstraintHasValue("value.localEndTime", value.localEndTime, true)); @@ -61058,13 +60413,9 @@ class Test_TC_DLRK_2_7Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 21U)); - VerifyOrReturn(CheckValue("status", value.status, 133U)); - VerifyOrReturn(CheckConstraintHasValue("value.localStartTime", value.localStartTime, false)); - VerifyOrReturn(CheckConstraintHasValue("value.localEndTime", value.localEndTime, false)); } break; @@ -61074,13 +60425,9 @@ class Test_TC_DLRK_2_7Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 10U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 5U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckConstraintHasValue("value.localStartTime", value.localStartTime, false)); - VerifyOrReturn(CheckConstraintHasValue("value.localEndTime", value.localEndTime, false)); } break; @@ -61090,13 +60437,9 @@ class Test_TC_DLRK_2_7Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckConstraintHasValue("value.localStartTime", value.localStartTime, false)); - VerifyOrReturn(CheckConstraintHasValue("value.localEndTime", value.localEndTime, false)); } break; @@ -61109,14 +60452,10 @@ class Test_TC_DLRK_2_7Suite : public TestCommand chip::app::Clusters::DoorLock::Commands::GetYearDayScheduleResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("yearDayIndex", value.yearDayIndex, 2U)); - VerifyOrReturn(CheckValue("userIndex", value.userIndex, 2U)); - VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValuePresent("localStartTime", value.localStartTime)); VerifyOrReturn(CheckValue("localStartTime.Value()", value.localStartTime.Value(), 10UL)); - VerifyOrReturn(CheckValuePresent("localEndTime", value.localEndTime)); VerifyOrReturn(CheckValue("localEndTime.Value()", value.localEndTime.Value(), 20UL)); } @@ -61336,7 +60675,6 @@ class Test_TC_DLRK_2_9Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfTotalUsersSupported", value, 10U)); - NumberOfTotalUsersSupported = value; } break; @@ -61419,7 +60757,6 @@ class Test_TC_DLRK_2_9Suite : public TestCommand { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); } break; @@ -61788,7 +61125,6 @@ class TestGroupMessagingSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 257U)); } break; @@ -61798,7 +61134,6 @@ class TestGroupMessagingSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 258U)); } break; @@ -61898,7 +61233,6 @@ class TestGroupMessagingSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 257U)); } break; @@ -61908,7 +61242,6 @@ class TestGroupMessagingSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 258U)); } break; @@ -62545,7 +61878,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 135U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 0U)); } break; @@ -62555,7 +61887,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 1U)); } break; @@ -62565,7 +61896,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 1U)); } break; @@ -62575,9 +61905,7 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 1U)); - VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8))); } break; @@ -62587,7 +61915,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U)); } break; @@ -62597,7 +61924,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNull("capacity", value.capacity)); - { auto iter_0 = value.groupList.begin(); VerifyOrReturn(CheckNextListItemDecodes("groupList", iter_0, 0)); @@ -62612,7 +61938,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U)); } break; @@ -62622,9 +61947,7 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 1U)); - VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8))); } break; @@ -62634,7 +61957,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 135U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 0U)); } break; @@ -62644,7 +61966,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 4U)); } break; @@ -62654,9 +61975,7 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 1U)); - VerifyOrReturn(CheckValueAsString("groupName", value.groupName, chip::CharSpan("Group #1", 8))); } break; @@ -62666,7 +61985,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U)); } break; @@ -62676,7 +61994,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNull("capacity", value.capacity)); - { auto iter_0 = value.groupList.begin(); VerifyOrReturn(CheckNextListItemDecodes("groupList", iter_0, 0)); @@ -62694,7 +62011,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 1U)); } break; @@ -62704,7 +62020,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 4369U)); } break; @@ -62714,7 +62029,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::ViewGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 139U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 32767U)); } break; @@ -62724,7 +62038,6 @@ class TestGroupsClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::GetGroupMembershipResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNull("capacity", value.capacity)); - { auto iter_0 = value.groupList.begin(); VerifyOrReturn(CheckNoMoreListItems("groupList", iter_0, 0)); @@ -63020,7 +62333,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 257U)); } break; @@ -63030,7 +62342,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 258U)); } break; @@ -63146,7 +62457,6 @@ class TestGroupKeyManagementClusterSuite : public TestCommand chip::app::Clusters::Groups::Commands::RemoveGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 257U)); } break; @@ -65622,7 +64932,6 @@ class TestGroupDemoConfigSuite : public TestCommand chip::app::Clusters::Groups::Commands::AddGroupResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 0U)); - VerifyOrReturn(CheckValue("groupId", value.groupId, 257U)); } break; @@ -78856,7 +78165,6 @@ class Test_TC_OCC_3_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("occupancy", value, 0U)); - OccupancyValue = value; } break; diff --git a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h index 4d498a43c0ef49..9c09f3661edf46 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -76961,91 +76961,120 @@ class TestConstraints : public TestCommandBridge { err = TestWriteAttributeListBackToDefaultValue_4(); break; case 5: - ChipLogProgress(chipTool, " ***** Test Step 5 : Write attribute INT32U Value\n"); - err = TestWriteAttributeInt32uValue_5(); + ChipLogProgress(chipTool, " ***** Test Step 5 : Read attribute BITMAP32 Default Value\n"); + err = TestReadAttributeBitmap32DefaultValue_5(); break; case 6: - ChipLogProgress(chipTool, " ***** Test Step 6 : Read attribute INT32U Value MinValue Constraints\n"); - err = TestReadAttributeInt32uValueMinValueConstraints_6(); + ChipLogProgress(chipTool, " ***** Test Step 6 : Write attribute BITMAP32 with MaskVal1 and MaskVal3\n"); + err = TestWriteAttributeBitmap32WithMaskVal1AndMaskVal3_6(); break; case 7: - ChipLogProgress(chipTool, " ***** Test Step 7 : Read attribute INT32U Value MaxValue Constraints\n"); - err = TestReadAttributeInt32uValueMaxValueConstraints_7(); + ChipLogProgress(chipTool, + " ***** Test Step 7 : Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal2 is not set\n"); + err = TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskVal2IsNotSet_7(); break; case 8: - ChipLogProgress(chipTool, " ***** Test Step 8 : Read attribute INT32U Value NotValue Constraints\n"); - err = TestReadAttributeInt32uValueNotValueConstraints_8(); + ChipLogProgress( + chipTool, " ***** Test Step 8 : Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal1 is set\n"); + err = TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskVal1IsSet_8(); break; case 9: - ChipLogProgress(chipTool, " ***** Test Step 9 : Write attribute INT32U Value Back to Default Value\n"); - err = TestWriteAttributeInt32uValueBackToDefaultValue_9(); + ChipLogProgress( + chipTool, " ***** Test Step 9 : Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal3 is set\n"); + err = TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskVal3IsSet_9(); break; case 10: - ChipLogProgress(chipTool, " ***** Test Step 10 : Write attribute CHAR_STRING Value\n"); - err = TestWriteAttributeCharStringValue_10(); + ChipLogProgress(chipTool, + " ***** Test Step 10 : Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure Maskval1 and MaskVal3 are " + "set\n"); + err = TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskval1AndMaskVal3AreSet_10(); break; case 11: - ChipLogProgress(chipTool, " ***** Test Step 11 : Read attribute CHAR_STRING Value MinLength Constraints\n"); - err = TestReadAttributeCharStringValueMinLengthConstraints_11(); + ChipLogProgress(chipTool, " ***** Test Step 11 : Write attribute INT32U Value\n"); + err = TestWriteAttributeInt32uValue_11(); break; case 12: - ChipLogProgress(chipTool, " ***** Test Step 12 : Read attribute CHAR_STRING Value MaxLength Constraints\n"); - err = TestReadAttributeCharStringValueMaxLengthConstraints_12(); + ChipLogProgress(chipTool, " ***** Test Step 12 : Read attribute INT32U Value MinValue Constraints\n"); + err = TestReadAttributeInt32uValueMinValueConstraints_12(); break; case 13: - ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute CHAR_STRING Value StartsWith Constraints\n"); - err = TestReadAttributeCharStringValueStartsWithConstraints_13(); + ChipLogProgress(chipTool, " ***** Test Step 13 : Read attribute INT32U Value MaxValue Constraints\n"); + err = TestReadAttributeInt32uValueMaxValueConstraints_13(); break; case 14: - ChipLogProgress(chipTool, " ***** Test Step 14 : Read attribute CHAR_STRING Value EndsWith Constraints\n"); - err = TestReadAttributeCharStringValueEndsWithConstraints_14(); + ChipLogProgress(chipTool, " ***** Test Step 14 : Read attribute INT32U Value NotValue Constraints\n"); + err = TestReadAttributeInt32uValueNotValueConstraints_14(); break; case 15: - ChipLogProgress(chipTool, " ***** Test Step 15 : Write attribute CHAR_STRING Value\n"); - err = TestWriteAttributeCharStringValue_15(); + ChipLogProgress(chipTool, " ***** Test Step 15 : Write attribute INT32U Value Back to Default Value\n"); + err = TestWriteAttributeInt32uValueBackToDefaultValue_15(); break; case 16: - ChipLogProgress( - chipTool, " ***** Test Step 16 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n"); - err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_16(); + ChipLogProgress(chipTool, " ***** Test Step 16 : Write attribute CHAR_STRING Value\n"); + err = TestWriteAttributeCharStringValue_16(); break; case 17: - ChipLogProgress(chipTool, " ***** Test Step 17 : Write attribute CHAR_STRING Value\n"); - err = TestWriteAttributeCharStringValue_17(); + ChipLogProgress(chipTool, " ***** Test Step 17 : Read attribute CHAR_STRING Value MinLength Constraints\n"); + err = TestReadAttributeCharStringValueMinLengthConstraints_17(); break; case 18: - ChipLogProgress( - chipTool, " ***** Test Step 18 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n"); - err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_18(); + ChipLogProgress(chipTool, " ***** Test Step 18 : Read attribute CHAR_STRING Value MaxLength Constraints\n"); + err = TestReadAttributeCharStringValueMaxLengthConstraints_18(); break; case 19: - ChipLogProgress(chipTool, " ***** Test Step 19 : Write attribute CHAR_STRING Value\n"); - err = TestWriteAttributeCharStringValue_19(); + ChipLogProgress(chipTool, " ***** Test Step 19 : Read attribute CHAR_STRING Value StartsWith Constraints\n"); + err = TestReadAttributeCharStringValueStartsWithConstraints_19(); break; case 20: - ChipLogProgress( - chipTool, " ***** Test Step 20 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n"); - err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_20(); + ChipLogProgress(chipTool, " ***** Test Step 20 : Read attribute CHAR_STRING Value EndsWith Constraints\n"); + err = TestReadAttributeCharStringValueEndsWithConstraints_20(); break; case 21: ChipLogProgress(chipTool, " ***** Test Step 21 : Write attribute CHAR_STRING Value\n"); err = TestWriteAttributeCharStringValue_21(); break; case 22: - ChipLogProgress(chipTool, " ***** Test Step 22 : Read attribute CHAR_STRING Value isHexString Constraints\n"); - err = TestReadAttributeCharStringValueIsHexStringConstraints_22(); + ChipLogProgress( + chipTool, " ***** Test Step 22 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n"); + err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_22(); break; case 23: ChipLogProgress(chipTool, " ***** Test Step 23 : Write attribute CHAR_STRING Value\n"); err = TestWriteAttributeCharStringValue_23(); break; case 24: - ChipLogProgress(chipTool, " ***** Test Step 24 : Read attribute CHAR_STRING Value isHexString Constraints\n"); - err = TestReadAttributeCharStringValueIsHexStringConstraints_24(); + ChipLogProgress( + chipTool, " ***** Test Step 24 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n"); + err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_24(); break; case 25: - ChipLogProgress(chipTool, " ***** Test Step 25 : Write attribute CHAR_STRING Value Back to Default Value\n"); - err = TestWriteAttributeCharStringValueBackToDefaultValue_25(); + ChipLogProgress(chipTool, " ***** Test Step 25 : Write attribute CHAR_STRING Value\n"); + err = TestWriteAttributeCharStringValue_25(); + break; + case 26: + ChipLogProgress( + chipTool, " ***** Test Step 26 : Read attribute CHAR_STRING Value isLowerCase/isUpperCase Constraints\n"); + err = TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_26(); + break; + case 27: + ChipLogProgress(chipTool, " ***** Test Step 27 : Write attribute CHAR_STRING Value\n"); + err = TestWriteAttributeCharStringValue_27(); + break; + case 28: + ChipLogProgress(chipTool, " ***** Test Step 28 : Read attribute CHAR_STRING Value isHexString Constraints\n"); + err = TestReadAttributeCharStringValueIsHexStringConstraints_28(); + break; + case 29: + ChipLogProgress(chipTool, " ***** Test Step 29 : Write attribute CHAR_STRING Value\n"); + err = TestWriteAttributeCharStringValue_29(); + break; + case 30: + ChipLogProgress(chipTool, " ***** Test Step 30 : Read attribute CHAR_STRING Value isHexString Constraints\n"); + err = TestReadAttributeCharStringValueIsHexStringConstraints_30(); + break; + case 31: + ChipLogProgress(chipTool, " ***** Test Step 31 : Write attribute CHAR_STRING Value Back to Default Value\n"); + err = TestWriteAttributeCharStringValueBackToDefaultValue_31(); break; } @@ -77136,6 +77165,24 @@ class TestConstraints : public TestCommandBridge { case 25: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 26: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 27: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 28: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 29: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 30: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 31: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -77149,7 +77196,7 @@ class TestConstraints : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 26; + const uint16_t mTestCount = 32; chip::Optional mNodeId; chip::Optional mCluster; @@ -77254,7 +77301,137 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeInt32uValue_5() + CHIP_ERROR TestReadAttributeBitmap32DefaultValue_5() + { + MTRDevice * device = GetDevice("alpha"); + MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute BITMAP32 Default Value Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("bitmap32", actualValue, 0UL)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWriteAttributeBitmap32WithMaskVal1AndMaskVal3_6() + { + MTRDevice * device = GetDevice("alpha"); + MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + id bitmap32Argument; + bitmap32Argument = [NSNumber numberWithUnsignedInt:5UL]; + [cluster writeAttributeBitmap32WithValue:bitmap32Argument + completionHandler:^(NSError * _Nullable err) { + NSLog(@"Write attribute BITMAP32 with MaskVal1 and MaskVal3 Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskVal2IsNotSet_7() + { + MTRDevice * device = GetDevice("alpha"); + MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal2 is not set Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("bitmap32", actualValue, 5UL)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskVal1IsSet_8() + { + MTRDevice * device = GetDevice("alpha"); + MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal1 is set Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("bitmap32", actualValue, 5UL)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskVal3IsSet_9() + { + MTRDevice * device = GetDevice("alpha"); + MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure MaskVal3 is set Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("bitmap32", actualValue, 5UL)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeBitmap32WithMaskVal1AndMaskVal3AndEnsureMaskval1AndMaskVal3AreSet_10() + { + MTRDevice * device = GetDevice("alpha"); + MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeBitmap32WithCompletionHandler:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute BITMAP32 with MaskVal1 and MaskVal3 and ensure Maskval1 and MaskVal3 are set Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValue("bitmap32", actualValue, 5UL)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWriteAttributeInt32uValue_11() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77274,7 +77451,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeInt32uValueMinValueConstraints_6() + CHIP_ERROR TestReadAttributeInt32uValueMinValueConstraints_12() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77293,7 +77470,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeInt32uValueMaxValueConstraints_7() + CHIP_ERROR TestReadAttributeInt32uValueMaxValueConstraints_13() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77312,7 +77489,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeInt32uValueNotValueConstraints_8() + CHIP_ERROR TestReadAttributeInt32uValueNotValueConstraints_14() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77331,7 +77508,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeInt32uValueBackToDefaultValue_9() + CHIP_ERROR TestWriteAttributeInt32uValueBackToDefaultValue_15() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77351,7 +77528,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValue_10() + CHIP_ERROR TestWriteAttributeCharStringValue_16() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77371,7 +77548,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueMinLengthConstraints_11() + CHIP_ERROR TestReadAttributeCharStringValueMinLengthConstraints_17() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77389,7 +77566,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueMaxLengthConstraints_12() + CHIP_ERROR TestReadAttributeCharStringValueMaxLengthConstraints_18() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77407,7 +77584,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueStartsWithConstraints_13() + CHIP_ERROR TestReadAttributeCharStringValueStartsWithConstraints_19() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77425,7 +77602,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueEndsWithConstraints_14() + CHIP_ERROR TestReadAttributeCharStringValueEndsWithConstraints_20() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77443,7 +77620,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValue_15() + CHIP_ERROR TestWriteAttributeCharStringValue_21() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77463,7 +77640,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_16() + CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_22() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77482,7 +77659,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValue_17() + CHIP_ERROR TestWriteAttributeCharStringValue_23() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77502,7 +77679,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_18() + CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_24() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77521,7 +77698,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValue_19() + CHIP_ERROR TestWriteAttributeCharStringValue_25() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77541,7 +77718,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_20() + CHIP_ERROR TestReadAttributeCharStringValueIsLowerCaseIsUpperCaseConstraints_26() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77560,7 +77737,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValue_21() + CHIP_ERROR TestWriteAttributeCharStringValue_27() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77580,7 +77757,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_22() + CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_28() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77598,7 +77775,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValue_23() + CHIP_ERROR TestWriteAttributeCharStringValue_29() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77618,7 +77795,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_24() + CHIP_ERROR TestReadAttributeCharStringValueIsHexStringConstraints_30() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue]; @@ -77636,7 +77813,7 @@ class TestConstraints : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestWriteAttributeCharStringValueBackToDefaultValue_25() + CHIP_ERROR TestWriteAttributeCharStringValueBackToDefaultValue_31() { MTRDevice * device = GetDevice("alpha"); MTRTestTestCluster * cluster = [[MTRTestTestCluster alloc] initWithDevice:device endpoint:1 queue:mCallbackQueue];