From dc1f9eba5717b91a36e49f0f2400e6b7098c168b Mon Sep 17 00:00:00 2001 From: jvillasenor Date: Thu, 19 Jan 2023 11:59:26 -0800 Subject: [PATCH] Allow the linux lock app to store credentials by type. --- .../lock-app/linux/include/LockEndpoint.h | 5 +- examples/lock-app/linux/src/LockEndpoint.cpp | 30 +- .../tests/suites/DL_UsersAndCredentials.yaml | 97 ++- .../chip-tool/zap-generated/test/Commands.h | 526 ++++++++-------- .../zap-generated/test/Commands.h | 593 ++++++++++-------- 5 files changed, 670 insertions(+), 581 deletions(-) diff --git a/examples/lock-app/linux/include/LockEndpoint.h b/examples/lock-app/linux/include/LockEndpoint.h index 0e0b32fd3b775b..7ba34d10d6c3cd 100644 --- a/examples/lock-app/linux/include/LockEndpoint.h +++ b/examples/lock-app/linux/include/LockEndpoint.h @@ -39,6 +39,7 @@ struct YearDayScheduleInfo; struct HolidayScheduleInfo; static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE = 20; +static constexpr size_t DOOR_LOCK_CREDENTIAL_INFO_MAX_TYPES = 6; class LockEndpoint { @@ -48,7 +49,7 @@ class LockEndpoint uint8_t numberOfHolidaySchedules) : mEndpointId{ endpointId }, mLockState{ DlLockState::kLocked }, mDoorState{ DoorStateEnum::kDoorClosed }, mLockUsers(numberOfLockUsersSupported), - mLockCredentials(numberOfCredentialsSupported + 1), + mLockCredentials(DOOR_LOCK_CREDENTIAL_INFO_MAX_TYPES, std::vector(numberOfCredentialsSupported + 1)), mWeekDaySchedules(numberOfLockUsersSupported, std::vector(weekDaySchedulesPerUser)), mYearDaySchedules(numberOfLockUsersSupported, std::vector(yearDaySchedulesPerUser)), mHolidaySchedules(numberOfHolidaySchedules) @@ -109,7 +110,7 @@ class LockEndpoint // This is very naive implementation of users/credentials/schedules database and by no means the best practice. Proper storage // of those items is out of scope of this example. std::vector mLockUsers; - std::vector mLockCredentials; + std::vector> mLockCredentials; std::vector> mWeekDaySchedules; std::vector> mYearDaySchedules; std::vector mHolidaySchedules; diff --git a/examples/lock-app/linux/src/LockEndpoint.cpp b/examples/lock-app/linux/src/LockEndpoint.cpp index 6ed9592df0c0f9..672b2f32f9fb75 100644 --- a/examples/lock-app/linux/src/LockEndpoint.cpp +++ b/examples/lock-app/linux/src/LockEndpoint.cpp @@ -164,14 +164,20 @@ bool LockEndpoint::GetCredential(uint16_t credentialIndex, CredentialTypeEnum cr ChipLogProgress(Zcl, "Lock App: LockEndpoint::GetCredential [endpoint=%d,credentialIndex=%u,credentialType=%u]", mEndpointId, credentialIndex, to_underlying(credentialType)); - if (credentialIndex >= mLockCredentials.size() || + if (to_underlying(credentialType) >= mLockCredentials.size()) + { + ChipLogError(Zcl, "Cannot get the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); + return false; + } + + if (credentialIndex >= mLockCredentials.at(to_underlying(credentialType)).size() || (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType)) { ChipLogError(Zcl, "Cannot get the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); return false; } - const auto & credentialInStorage = mLockCredentials[credentialIndex]; + const auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex]; credential.status = credentialInStorage.status; if (DlCredentialStatus::kAvailable == credential.status) @@ -206,14 +212,21 @@ bool LockEndpoint::SetCredential(uint16_t credentialIndex, chip::FabricIndex cre mEndpointId, credentialIndex, to_underlying(credentialStatus), to_underlying(credentialType), static_cast(credentialData.size()), creator, modifier); - if (credentialIndex >= mLockCredentials.size() || + if (to_underlying(credentialType) >= mLockCredentials.capacity()) + { + ChipLogError(Zcl, "Cannot set the credential - type out of range [endpoint=%d,type=%d]", mEndpointId, + to_underlying(credentialType)); + return false; + } + + if (credentialIndex >= mLockCredentials.at(to_underlying(credentialType)).size() || (0 == credentialIndex && CredentialTypeEnum::kProgrammingPIN != credentialType)) { ChipLogError(Zcl, "Cannot set the credential - index out of range [endpoint=%d,index=%d]", mEndpointId, credentialIndex); return false; } - auto & credentialInStorage = mLockCredentials[credentialIndex]; + auto & credentialInStorage = mLockCredentials[to_underlying(credentialType)][credentialIndex]; if (credentialData.size() > DOOR_LOCK_CREDENTIAL_INFO_MAX_DATA_SIZE) { ChipLogError(Zcl, @@ -391,11 +404,12 @@ bool LockEndpoint::setLockState(DlLockState lockState, const Optional(credential - mLockCredentials.begin()); + auto credentialIndex = static_cast(credential - pinCredentials.begin()); auto user = std::find_if(mLockUsers.begin(), mLockUsers.end(), [credential, credentialIndex](const LockUserInfo & u) { return std::any_of(u.credentials.begin(), u.credentials.end(), [&credential, credentialIndex](const CredentialStruct & c) { return c.CredentialIndex == credentialIndex && c.CredentialType == to_underlying(credential->credentialType); diff --git a/src/app/tests/suites/DL_UsersAndCredentials.yaml b/src/app/tests/suites/DL_UsersAndCredentials.yaml index be9a8525448af2..3e26badf671fc3 100644 --- a/src/app/tests/suites/DL_UsersAndCredentials.yaml +++ b/src/app/tests/suites/DL_UsersAndCredentials.yaml @@ -1180,10 +1180,7 @@ tests: saveAs: NumberOfRFIDUsersSupported value: 10 - # Disabled because due to https://github.com/project-chip/connectedhomeip/issues/21656: that causes the nextCredentialIndex - # here to have the wrong value. - label: "Reading RFID credential with index 0 returns no credential" - disabled: true command: "GetCredentialStatus" arguments: values: @@ -1274,7 +1271,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 2 } + value: { CredentialType: 2, CredentialIndex: 1 } - name: "CredentialData" value: "rfid_data_123456" - name: "UserIndex" @@ -1290,7 +1287,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 3 + value: 2 - label: "Verify modified user" command: "GetUser" @@ -1316,7 +1313,7 @@ tests: value: [ { CredentialType: 1, CredentialIndex: 1 }, - { CredentialType: 2, CredentialIndex: 2 }, + { CredentialType: 2, CredentialIndex: 1 }, ] - name: "CreatorFabricIndex" value: 1 @@ -1330,7 +1327,7 @@ tests: arguments: values: - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 2 } + value: { CredentialType: 2, CredentialIndex: 1 } response: values: - name: "CredentialExists" @@ -1368,7 +1365,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 3 + value: 2 - label: "Create new RFID credential and user with out-of-bounds index fails" @@ -1409,7 +1406,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - name: "CredentialData" value: "123465" - name: "UserIndex" @@ -1425,7 +1422,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new credential and try to add it to out-of-bounds user" command: "SetCredential" @@ -1435,7 +1432,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - name: "CredentialData" value: "123465" - name: "UserIndex" @@ -1451,7 +1448,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new PIN with too short data" command: "SetCredential" @@ -1461,7 +1458,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - name: "CredentialData" value: "12345" - name: "UserIndex" @@ -1477,7 +1474,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new PIN with too long data" command: "SetCredential" @@ -1487,7 +1484,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - name: "CredentialData" value: "123456789" - name: "UserIndex" @@ -1503,7 +1500,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new RFID with too short data" command: "SetCredential" @@ -1513,7 +1510,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 3 } + value: { CredentialType: 2, CredentialIndex: 2 } - name: "CredentialData" value: "rfid_data" - name: "UserIndex" @@ -1529,7 +1526,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new PIN with Programming user type fails" command: "SetCredential" @@ -1539,7 +1536,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - name: "CredentialData" value: "123456" - name: "UserIndex" @@ -1555,7 +1552,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new RFID with too short data" command: "SetCredential" @@ -1565,7 +1562,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 3 } + value: { CredentialType: 2, CredentialIndex: 2 } - name: "CredentialData" value: "very_long_rfid_data_to_test_boundaries" - name: "UserIndex" @@ -1581,7 +1578,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Create new PIN credential with data the would cause duplicate" command: "SetCredential" @@ -1591,7 +1588,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 4 } + value: { CredentialType: 1, CredentialIndex: 3 } - name: "CredentialData" value: "000000" - name: "UserIndex" @@ -1607,7 +1604,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: 4 - label: "Create new RFID credential with data the would cause duplicate" command: "SetCredential" @@ -1617,7 +1614,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 4 } + value: { CredentialType: 2, CredentialIndex: 2 } - name: "CredentialData" value: "rfid_data_123456" - name: "UserIndex" @@ -1633,7 +1630,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: 3 - label: "Modify credentialData of existing PIN credential" command: "SetCredential" @@ -1659,7 +1656,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 3 + value: 2 - label: "Verify that credential was changed by creating new credential with @@ -1671,7 +1668,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - name: "CredentialData" value: "000000" - name: "UserIndex" @@ -1687,7 +1684,7 @@ tests: - name: "UserIndex" value: 2 - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Verify that credential was changed by creating new credential with @@ -1699,7 +1696,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 4 } + value: { CredentialType: 1, CredentialIndex: 3 } - name: "CredentialData" value: "123456" - name: "UserIndex" @@ -1715,7 +1712,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: 4 # At that state we have the following users: # Index = 1, Credentials = {(1, PIN), (2, RFID)} @@ -1732,7 +1729,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 4 } + value: { CredentialType: 2, CredentialIndex: 2 } - name: "CredentialData" value: "rfid_data_7890" - name: "UserIndex" @@ -1748,7 +1745,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: 3 - label: "Verify modified user" command: "GetUser" @@ -1774,8 +1771,8 @@ tests: value: [ { CredentialType: 1, CredentialIndex: 1 }, + { CredentialType: 2, CredentialIndex: 1 }, { CredentialType: 2, CredentialIndex: 2 }, - { CredentialType: 2, CredentialIndex: 4 }, ] - name: "CreatorFabricIndex" value: 1 @@ -1792,7 +1789,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 5 } + value: { CredentialType: 1, CredentialIndex: 3 } - name: "CredentialData" value: "789012" - name: "UserIndex" @@ -1808,7 +1805,7 @@ tests: - name: "UserIndex" value: null - name: "NextCredentialIndex" - value: 6 + value: 4 - label: "Verify modified user" command: "GetUser" @@ -1834,9 +1831,9 @@ tests: value: [ { CredentialType: 1, CredentialIndex: 1 }, + { CredentialType: 2, CredentialIndex: 1 }, { CredentialType: 2, CredentialIndex: 2 }, - { CredentialType: 2, CredentialIndex: 4 }, - { CredentialType: 1, CredentialIndex: 5 }, + { CredentialType: 1, CredentialIndex: 3 }, ] - name: "CreatorFabricIndex" value: 1 @@ -1895,9 +1892,9 @@ tests: - name: "Credentials" value: [ + { CredentialType: 2, CredentialIndex: 1 }, { CredentialType: 2, CredentialIndex: 2 }, - { CredentialType: 2, CredentialIndex: 4 }, - { CredentialType: 1, CredentialIndex: 5 }, + { CredentialType: 1, CredentialIndex: 3 }, ] - name: "CreatorFabricIndex" value: 1 @@ -1912,14 +1909,14 @@ tests: arguments: values: - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } - label: "Read back the credential and make sure it is deleted" command: "GetCredentialStatus" arguments: values: - name: "Credential" - value: { CredentialType: 1, CredentialIndex: 3 } + value: { CredentialType: 1, CredentialIndex: 2 } response: values: - name: "CredentialExists" @@ -1931,7 +1928,7 @@ tests: - name: "LastModifiedFabricIndex" value: null - name: "NextCredentialIndex" - value: 4 + value: 3 - label: "Read the user back and make sure related user is deleted" command: "GetUser" @@ -1970,7 +1967,7 @@ tests: - name: "OperationType" value: 0 - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 1 } + value: { CredentialType: 2, CredentialIndex: 3 } - name: "CredentialData" value: "rfid_data_12345" - name: "UserIndex" @@ -1986,7 +1983,7 @@ tests: - name: "UserIndex" value: 2 - name: "NextCredentialIndex" - value: 3 + value: 4 - label: "Clear all the RFID credentials" command: "ClearCredential" @@ -2013,7 +2010,7 @@ tests: - name: "LastModifiedFabricIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: null - label: "Read back the second RFID credential and make sure it is deleted" command: "GetCredentialStatus" @@ -2032,14 +2029,14 @@ tests: - name: "LastModifiedFabricIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: null - label: "Read back the third RFID credential and make sure it is deleted" command: "GetCredentialStatus" arguments: values: - name: "Credential" - value: { CredentialType: 2, CredentialIndex: 4 } + value: { CredentialType: 2, CredentialIndex: 3 } response: values: - name: "CredentialExists" @@ -2051,7 +2048,7 @@ tests: - name: "LastModifiedFabricIndex" value: null - name: "NextCredentialIndex" - value: 5 + value: null - label: "Read the user related with first RFID back and make sure it has only @@ -2076,7 +2073,7 @@ tests: - name: "CredentialRule" value: 0 - name: "Credentials" - value: [{ CredentialType: 1, CredentialIndex: 5 }] + value: [{ CredentialType: 1, CredentialIndex: 3 }] - name: "CreatorFabricIndex" value: 1 - name: "LastModifiedFabricIndex" diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 717e41133222cf..582d08810954ee 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -74373,7 +74373,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand { public: DL_UsersAndCredentialsSuite(CredentialIssuerCommands * credsIssuerConfig) : - TestCommand("DL_UsersAndCredentials", 122, credsIssuerConfig) + TestCommand("DL_UsersAndCredentials", 123, credsIssuerConfig) { AddArgument("nodeId", 0, UINT64_MAX, &mNodeId); AddArgument("cluster", &mCluster); @@ -75024,6 +75024,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); + VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; case 54: @@ -75035,7 +75036,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; case 55: @@ -75051,6 +75051,18 @@ class DL_UsersAndCredentialsSuite : public TestCommand } break; case 56: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + { + 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; + case 57: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75058,10 +75070,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 0U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } break; - case 57: + case 58: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75084,7 +75096,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 1)); VerifyOrReturn(CheckValue("credentials.Value()[1].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); + VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 2)); } VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); @@ -75094,7 +75106,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 58: + case 59: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75109,17 +75121,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 59: - 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, 133U)); - VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); - } - break; case 60: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { @@ -75127,7 +75128,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); - VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); + VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } break; case 61: @@ -75137,8 +75139,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand 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)); + VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; case 62: @@ -75149,7 +75150,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 63: @@ -75160,7 +75161,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 64: @@ -75171,7 +75172,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 65: @@ -75182,7 +75183,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 66: @@ -75193,7 +75194,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 67: @@ -75204,7 +75205,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 68: @@ -75212,10 +75213,10 @@ 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(CheckValue("status", value.status, 133U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 69: @@ -75226,7 +75227,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 2U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } break; case 70: @@ -75234,13 +75235,24 @@ 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(CheckValue("status", value.status, 2U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; case 71: + 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(CheckValueNull("userIndex", value.userIndex)); + VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); + } + break; + case 72: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75249,10 +75261,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand 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)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; - case 72: + case 73: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75260,10 +75272,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 2U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } break; - case 73: + case 74: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75271,10 +75283,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 0U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; - case 74: + case 75: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75297,10 +75309,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 1)); VerifyOrReturn(CheckValue("credentials.Value()[1].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); + VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 2)); VerifyOrReturn(CheckValue("credentials.Value()[2].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 4U)); + VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 3)); } VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); @@ -75311,7 +75323,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } break; - case 75: + case 76: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75319,10 +75331,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", value.status, 0U)); VerifyOrReturn(CheckValueNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } break; - case 76: + case 77: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75345,13 +75357,13 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 1)); VerifyOrReturn(CheckValue("credentials.Value()[1].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); + VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 2)); VerifyOrReturn(CheckValue("credentials.Value()[2].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 4U)); + VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 3)); VerifyOrReturn(CheckValue("credentials.Value()[3].credentialType", iter_1.GetValue().credentialType, 1U)); - VerifyOrReturn(CheckValue("credentials.Value()[3].credentialIndex", iter_1.GetValue().credentialIndex, 5U)); + VerifyOrReturn(CheckValue("credentials.Value()[3].credentialIndex", iter_1.GetValue().credentialIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 4)); } VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); @@ -75362,10 +75374,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } break; - case 77: + case 78: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 78: + case 79: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75378,7 +75390,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } break; - case 79: + case 80: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75398,13 +75410,13 @@ class DL_UsersAndCredentialsSuite : public TestCommand auto iter_1 = value.credentials.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 0)); VerifyOrReturn(CheckValue("credentials.Value()[0].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); + VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 1U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 1)); VerifyOrReturn(CheckValue("credentials.Value()[1].credentialType", iter_1.GetValue().credentialType, 2U)); - VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 4U)); + VerifyOrReturn(CheckValue("credentials.Value()[1].credentialIndex", iter_1.GetValue().credentialIndex, 2U)); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 2)); VerifyOrReturn(CheckValue("credentials.Value()[2].credentialType", iter_1.GetValue().credentialType, 1U)); - VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 5U)); + VerifyOrReturn(CheckValue("credentials.Value()[2].credentialIndex", iter_1.GetValue().credentialIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 3)); } VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); @@ -75415,10 +75427,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextUserIndex.Value()", value.nextUserIndex.Value(), 2U)); } break; - case 80: + case 81: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 81: + case 82: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75428,10 +75440,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("creatorFabricIndex", value.creatorFabricIndex)); VerifyOrReturn(CheckValueNull("lastModifiedFabricIndex", value.lastModifiedFabricIndex)); VerifyOrReturn(CheckValueNonNull("nextCredentialIndex", value.nextCredentialIndex)); - VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; - case 82: + case 83: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75448,7 +75460,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 83: + case 84: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75457,13 +75469,13 @@ class DL_UsersAndCredentialsSuite : public TestCommand 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)); + VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } break; - case 84: + case 85: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 85: + case 86: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75472,11 +75484,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand 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)); + VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 86: + case 87: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75485,11 +75496,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand 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)); + VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 87: + case 88: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75498,11 +75508,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand 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)); + VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 88: + case 89: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75522,7 +75531,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand auto iter_1 = value.credentials.Value().begin(); VerifyOrReturn(CheckNextListItemDecodes("credentials.Value()", iter_1, 0)); VerifyOrReturn(CheckValue("credentials.Value()[0].credentialType", iter_1.GetValue().credentialType, 1U)); - VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 5U)); + VerifyOrReturn(CheckValue("credentials.Value()[0].credentialIndex", iter_1.GetValue().credentialIndex, 3U)); VerifyOrReturn(CheckNoMoreListItems("credentials.Value()", iter_1, 1)); } VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); @@ -75532,7 +75541,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 89: + case 90: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75549,7 +75558,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 90: + case 91: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75561,7 +75570,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } break; - case 91: + case 92: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75573,7 +75582,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; - case 92: + case 93: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75585,10 +75594,10 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 7U)); } break; - case 93: + case 94: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; - case 94: + case 95: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75600,7 +75609,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 95: + case 96: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75612,7 +75621,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 96: + case 97: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75624,7 +75633,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 97: + case 98: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75641,7 +75650,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 98: + case 99: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75658,7 +75667,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 99: + case 100: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75675,7 +75684,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 100: + case 101: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75692,7 +75701,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 101: + case 102: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75702,7 +75711,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 102: + case 103: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75713,7 +75722,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 103: + case 104: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75743,7 +75752,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 104: + case 105: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75758,7 +75767,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 105: + case 106: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75768,9 +75777,6 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 106: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); - break; case 107: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; @@ -75787,9 +75793,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 112: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 113: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 114: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetUserResponse::DecodableType value; @@ -75806,7 +75815,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextUserIndex", value.nextUserIndex)); } break; - case 114: + case 115: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; @@ -75818,7 +75827,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValueNull("nextCredentialIndex", value.nextCredentialIndex)); } break; - case 115: + case 116: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75830,7 +75839,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 2U)); } break; - case 116: + case 117: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75841,7 +75850,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 3U)); } break; - case 117: + case 118: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75852,7 +75861,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 4U)); } break; - case 118: + case 119: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75863,7 +75872,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 5U)); } break; - case 119: + case 120: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75874,7 +75883,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 6U)); } break; - case 120: + case 121: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { chip::app::Clusters::DoorLock::Commands::SetCredentialResponse::DecodableType value; @@ -75885,7 +75894,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand VerifyOrReturn(CheckValue("nextCredentialIndex.Value()", value.nextCredentialIndex.Value(), 7U)); } break; - case 121: + case 122: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; default: @@ -76597,7 +76606,7 @@ class DL_UsersAndCredentialsSuite : public TestCommand true, chip::NullOptional); } case 53: { - LogStep(53, "Reading RFID credential with index 0 returns no credential duplicate with bug workaround"); + LogStep(53, "Reading RFID credential with index 0 returns no credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -76610,12 +76619,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } case 54: { - LogStep(54, "Reading RFID credential with out-of-bounds index returns no credential"); + LogStep(54, "Reading RFID credential with index 0 returns no credential duplicate with bug workaround"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = static_cast(NumberOfRFIDUsersSupported + 1); + value.credential.credentialIndex = 0U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, chip::NullOptional @@ -76623,12 +76632,12 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } case 55: { - LogStep(55, "Check that RFID credential does not exist"); + LogStep(55, "Reading RFID credential with out-of-bounds index returns no credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 2U; + value.credential.credentialIndex = static_cast(NumberOfRFIDUsersSupported + 1); return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, chip::NullOptional @@ -76636,13 +76645,26 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } case 56: { - LogStep(56, "Create new RFID credential and add it to existing user"); + LogStep(56, "Check that RFID credential does not exist"); + ListFreer listFreer; + chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; + + value.credential.credentialType = static_cast(2); + value.credential.credentialIndex = 2U; + + return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, + chip::NullOptional + + ); + } + case 57: { + LogStep(57, "Create new RFID credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 2U; + value.credential.credentialIndex = 1U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_data_123456garbage: not in length on purpose"), 16); @@ -76655,8 +76677,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 57: { - LogStep(57, "Verify modified user"); + case 58: { + LogStep(58, "Verify modified user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -76665,21 +76687,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 58: { - LogStep(58, "Verify created credential"); + case 59: { + LogStep(59, "Verify created credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 2U; + value.credential.credentialIndex = 1U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, chip::NullOptional ); } - case 59: { - LogStep(59, "Create new RFID credential and user with index 0 fails"); + case 60: { + LogStep(60, "Create new RFID credential and user with index 0 fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -76697,8 +76719,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 60: { - LogStep(60, "Create new RFID credential and user with out-of-bounds index fails"); + case 61: { + LogStep(61, "Create new RFID credential and user with out-of-bounds index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -76716,14 +76738,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 61: { - LogStep(61, "Create new credential and try to add it to 0 user"); + case 62: { + LogStep(62, "Create new credential and try to add it to 0 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 = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123465garbage: not in length on purpose"), 6); value.userIndex.SetNonNull(); @@ -76735,14 +76757,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 62: { - LogStep(62, "Create new credential and try to add it to out-of-bounds user"); + case 63: { + LogStep(63, "Create new credential and try to add it to out-of-bounds 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 = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123465garbage: not in length on purpose"), 6); value.userIndex.SetNonNull(); @@ -76754,14 +76776,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 63: { - LogStep(63, "Create new PIN with too short data"); + case 64: { + LogStep(64, "Create new PIN with too short data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("12345garbage: not in length on purpose"), 5); value.userIndex.SetNonNull(); @@ -76773,14 +76795,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 64: { - LogStep(64, "Create new PIN with too long data"); + case 65: { + LogStep(65, "Create new PIN with too long data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456789garbage: not in length on purpose"), 9); value.userIndex.SetNonNull(); @@ -76792,14 +76814,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 65: { - LogStep(65, "Create new RFID with too short data"); + case 66: { + LogStep(66, "Create new RFID with too short data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_datagarbage: not in length on purpose"), 9); value.userIndex.SetNonNull(); @@ -76811,14 +76833,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 66: { - LogStep(66, "Create new PIN with Programming user type fails"); + case 67: { + LogStep(67, "Create new PIN with Programming user type fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); value.userIndex.SetNonNull(); @@ -76831,14 +76853,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 67: { - LogStep(67, "Create new RFID with too short data"); + case 68: { + LogStep(68, "Create new RFID with too short data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan( chip::Uint8::from_const_char("very_long_rfid_data_to_test_boundariesgarbage: not in length on purpose"), 38); @@ -76851,14 +76873,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 68: { - LogStep(68, "Create new PIN credential with data the would cause duplicate"); + case 69: { + LogStep(69, "Create new PIN credential with data the would cause duplicate"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 4U; + value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); value.userIndex.SetNull(); @@ -76869,14 +76891,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 69: { - LogStep(69, "Create new RFID credential with data the would cause duplicate"); + case 70: { + LogStep(70, "Create new RFID credential with data the would cause duplicate"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 4U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_data_123456garbage: not in length on purpose"), 16); @@ -76888,8 +76910,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 70: { - LogStep(70, "Modify credentialData of existing PIN credential"); + case 71: { + LogStep(71, "Modify credentialData of existing PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(2); @@ -76907,14 +76929,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 71: { - LogStep(71, "Verify that credential was changed by creating new credential with old data"); + case 72: { + LogStep(72, "Verify that credential was changed by creating new credential with old data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("000000garbage: not in length on purpose"), 6); value.userIndex.SetNull(); @@ -76925,14 +76947,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 72: { - LogStep(72, "Verify that credential was changed by creating new credential with new data"); + case 73: { + LogStep(73, "Verify that credential was changed by creating new credential with new data"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 4U; + value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("123456garbage: not in length on purpose"), 6); value.userIndex.SetNull(); @@ -76943,14 +76965,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 73: { - LogStep(73, "Create new RFID credential and add it to existing user"); + case 74: { + LogStep(74, "Create new RFID credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 4U; + value.credential.credentialIndex = 2U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_data_7890garbage: not in length on purpose"), 14); @@ -76963,8 +76985,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 74: { - LogStep(74, "Verify modified user"); + case 75: { + LogStep(75, "Verify modified user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -76973,14 +76995,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 75: { - LogStep(75, "Create new RFID credential and add it to existing user"); + case 76: { + LogStep(76, "Create new RFID credential and add it to existing 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 = 5U; + value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("789012garbage: not in length on purpose"), 6); value.userIndex.SetNonNull(); @@ -76992,8 +77014,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 76: { - LogStep(76, "Verify modified user"); + case 77: { + LogStep(77, "Verify modified user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -77002,8 +77024,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 77: { - LogStep(77, "Clear first PIN credential"); + case 78: { + LogStep(78, "Clear first PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77016,8 +77038,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 78: { - LogStep(78, "Read back the credential and make sure it is deleted"); + case 79: { + LogStep(79, "Read back the credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77029,8 +77051,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 79: { - LogStep(79, "Read the user back and make sure PIN credential is deleted"); + case 80: { + LogStep(80, "Read the user back and make sure PIN credential is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -77039,35 +77061,35 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 80: { - LogStep(80, "Clear the second PIN credential"); + case 81: { + LogStep(81, "Clear the second PIN 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 = 3U; + value.credential.Value().credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::ClearCredential::Id, value, chip::Optional(10000), chip::NullOptional ); } - case 81: { - LogStep(81, "Read back the credential and make sure it is deleted"); + case 82: { + LogStep(82, "Read back the credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; value.credential.credentialType = static_cast(1); - value.credential.credentialIndex = 3U; + value.credential.credentialIndex = 2U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, chip::NullOptional ); } - case 82: { - LogStep(82, "Read the user back and make sure related user is deleted"); + case 83: { + LogStep(83, "Read the user back and make sure related user is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 2U; @@ -77076,14 +77098,14 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 83: { - LogStep(83, "Create new RFID credential with user"); + case 84: { + LogStep(84, "Create new RFID credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 1U; + value.credential.credentialIndex = 3U; value.credentialData = chip::ByteSpan(chip::Uint8::from_const_char("rfid_data_12345garbage: not in length on purpose"), 15); @@ -77095,8 +77117,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 84: { - LogStep(84, "Clear all the RFID credentials"); + case 85: { + LogStep(85, "Clear all the RFID credentials"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77109,8 +77131,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 85: { - LogStep(85, "Read back the fist RFID credential and make sure it is deleted"); + case 86: { + LogStep(86, "Read back the fist RFID credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77122,8 +77144,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 86: { - LogStep(86, "Read back the second RFID credential and make sure it is deleted"); + case 87: { + LogStep(87, "Read back the second RFID credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77135,21 +77157,21 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 87: { - LogStep(87, "Read back the third RFID credential and make sure it is deleted"); + case 88: { + LogStep(88, "Read back the third RFID credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; value.credential.credentialType = static_cast(2); - value.credential.credentialIndex = 4U; + value.credential.credentialIndex = 3U; return SendCommand(kIdentityAlpha, GetEndpoint(1), DoorLock::Id, DoorLock::Commands::GetCredentialStatus::Id, value, chip::NullOptional ); } - case 88: { - LogStep(88, "Read the user related with first RFID back and make sure it has only PIN credential"); + case 89: { + LogStep(89, "Read the user related with first RFID back and make sure it has only PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -77158,8 +77180,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 89: { - LogStep(89, "Read the user related with second RFID back and make sure it is deleted"); + case 90: { + LogStep(90, "Read the user related with second RFID back and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 2U; @@ -77168,8 +77190,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 90: { - LogStep(90, "Create new PIN credential with user"); + case 91: { + LogStep(91, "Create new PIN credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77186,8 +77208,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 91: { - LogStep(91, "Create new RFID credential with user"); + case 92: { + LogStep(92, "Create new RFID credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77205,8 +77227,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 92: { - LogStep(92, "Create another RFID credential with user"); + case 93: { + LogStep(93, "Create another RFID credential with user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77224,8 +77246,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 93: { - LogStep(93, "Clear all the credentials"); + case 94: { + LogStep(94, "Clear all the credentials"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNull(); @@ -77234,8 +77256,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 94: { - LogStep(94, "Read back the first PIN credential and make sure it is deleted"); + case 95: { + LogStep(95, "Read back the first PIN credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77247,8 +77269,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 95: { - LogStep(95, "Read back the first RFID credential and make sure it is deleted"); + case 96: { + LogStep(96, "Read back the first RFID credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77260,8 +77282,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 96: { - LogStep(96, "Read back the second PIN credential and make sure it is deleted"); + case 97: { + LogStep(97, "Read back the second PIN credential and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77273,8 +77295,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 97: { - LogStep(97, "Read the user related with first PIN back and make sure it is deleted"); + case 98: { + LogStep(98, "Read the user related with first PIN back and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -77283,8 +77305,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 98: { - LogStep(98, "Read the user related with first RFID back and make sure it is deleted"); + case 99: { + LogStep(99, "Read the user related with first RFID back and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 2U; @@ -77293,8 +77315,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 99: { - LogStep(99, "Read the user related with second PIN back and make sure it is deleted"); + case 100: { + LogStep(100, "Read the user related with second PIN back and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 3U; @@ -77303,8 +77325,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 100: { - LogStep(100, "Read the user related with last RFID back and make sure it is deleted"); + case 101: { + LogStep(101, "Read the user related with last RFID back and make sure it is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 4U; @@ -77313,8 +77335,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 101: { - LogStep(101, "Create new Programming PIN credential with invalid index"); + case 102: { + LogStep(102, "Create new Programming PIN credential with invalid index"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77331,8 +77353,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 102: { - LogStep(102, "Create new Programming PIN credential with valid index"); + case 103: { + LogStep(103, "Create new Programming PIN credential with valid index"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77349,8 +77371,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 103: { - LogStep(103, "Verify created user"); + case 104: { + LogStep(104, "Verify created user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -77359,8 +77381,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 104: { - LogStep(104, "Verify created programming PIN credential"); + case 105: { + LogStep(105, "Verify created programming PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77372,8 +77394,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 105: { - LogStep(105, "Modify the Programming PIN credential"); + case 106: { + LogStep(106, "Modify the Programming PIN credential"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(2); @@ -77390,8 +77412,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 106: { - LogStep(106, "Clearing Programming PIN fails"); + case 107: { + LogStep(107, "Clearing Programming PIN fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77404,8 +77426,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 107: { - LogStep(107, "Clearing Programming PIN with invalid index fails"); + case 108: { + LogStep(108, "Clearing Programming PIN with invalid index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77418,8 +77440,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 108: { - LogStep(108, "Clearing PIN credential with zero index fails"); + case 109: { + LogStep(109, "Clearing PIN credential with zero index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77432,8 +77454,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 109: { - LogStep(109, "Clearing PIN credential with out-of-bound index fails"); + case 110: { + LogStep(110, "Clearing PIN credential with out-of-bound index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77446,8 +77468,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 110: { - LogStep(110, "Clearing RFID credential with zero index fails"); + case 111: { + LogStep(111, "Clearing RFID credential with zero index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77460,8 +77482,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 111: { - LogStep(111, "Clearing RFID credential with out-of-bound index fails"); + case 112: { + LogStep(112, "Clearing RFID credential with out-of-bound index fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearCredential::Type value; value.credential.SetNonNull(); @@ -77474,8 +77496,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 112: { - LogStep(112, "Clear the Programming PIN user"); + case 113: { + LogStep(113, "Clear the Programming PIN user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearUser::Type value; value.userIndex = 1U; @@ -77484,8 +77506,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 113: { - LogStep(113, "Make sure Programming PIN user is deleted"); + case 114: { + LogStep(114, "Make sure Programming PIN user is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetUser::Type value; value.userIndex = 1U; @@ -77494,8 +77516,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 114: { - LogStep(114, "Make sure programming PIN credential is deleted"); + case 115: { + LogStep(115, "Make sure programming PIN credential is deleted"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::GetCredentialStatus::Type value; @@ -77507,8 +77529,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 115: { - LogStep(115, "Create new PIN credential and user"); + case 116: { + LogStep(116, "Create new PIN credential and user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77525,8 +77547,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 116: { - LogStep(116, "Create second PIN credential and add it to existing user"); + case 117: { + LogStep(117, "Create second PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77544,8 +77566,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 117: { - LogStep(117, "Create third PIN credential and add it to existing user"); + case 118: { + LogStep(118, "Create third PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77563,8 +77585,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 118: { - LogStep(118, "Create fourth PIN credential and add it to existing user"); + case 119: { + LogStep(119, "Create fourth PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77582,8 +77604,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 119: { - LogStep(119, "Create fifth PIN credential and add it to existing user"); + case 120: { + LogStep(120, "Create fifth PIN credential and add it to existing user"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77601,8 +77623,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 120: { - LogStep(120, "Try to create sixth PIN credential and make sure it fails"); + case 121: { + LogStep(121, "Try to create sixth PIN credential and make sure it fails"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::SetCredential::Type value; value.operationType = static_cast(0); @@ -77620,8 +77642,8 @@ class DL_UsersAndCredentialsSuite : public TestCommand ); } - case 121: { - LogStep(121, "Final clean-up"); + case 122: { + LogStep(122, "Final clean-up"); ListFreer listFreer; chip::app::Clusters::DoorLock::Commands::ClearUser::Type value; value.userIndex = 1U; 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 fc64a87691276d..727d12e33f292a 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -110073,290 +110073,294 @@ class DL_UsersAndCredentials : public TestCommandBridge { err = TestGetNumberOfSupportedRfidCredentialsAndVerifyDefaultValue_52(); break; case 53: - ChipLogProgress(chipTool, - " ***** Test Step 53 : Reading RFID credential with index 0 returns no credential duplicate with bug workaround\n"); - err = TestReadingRfidCredentialWithIndex0ReturnsNoCredentialDuplicateWithBugWorkaround_53(); + ChipLogProgress(chipTool, " ***** Test Step 53 : Reading RFID credential with index 0 returns no credential\n"); + err = TestReadingRfidCredentialWithIndex0ReturnsNoCredential_53(); break; case 54: - ChipLogProgress( - chipTool, " ***** Test Step 54 : Reading RFID credential with out-of-bounds index returns no credential\n"); - err = TestReadingRfidCredentialWithOutOfBoundsIndexReturnsNoCredential_54(); + ChipLogProgress(chipTool, + " ***** Test Step 54 : Reading RFID credential with index 0 returns no credential duplicate with bug workaround\n"); + err = TestReadingRfidCredentialWithIndex0ReturnsNoCredentialDuplicateWithBugWorkaround_54(); break; case 55: - ChipLogProgress(chipTool, " ***** Test Step 55 : Check that RFID credential does not exist\n"); - err = TestCheckThatRfidCredentialDoesNotExist_55(); + ChipLogProgress( + chipTool, " ***** Test Step 55 : Reading RFID credential with out-of-bounds index returns no credential\n"); + err = TestReadingRfidCredentialWithOutOfBoundsIndexReturnsNoCredential_55(); break; case 56: - ChipLogProgress(chipTool, " ***** Test Step 56 : Create new RFID credential and add it to existing user\n"); - err = TestCreateNewRfidCredentialAndAddItToExistingUser_56(); + ChipLogProgress(chipTool, " ***** Test Step 56 : Check that RFID credential does not exist\n"); + err = TestCheckThatRfidCredentialDoesNotExist_56(); break; case 57: - ChipLogProgress(chipTool, " ***** Test Step 57 : Verify modified user\n"); - err = TestVerifyModifiedUser_57(); + ChipLogProgress(chipTool, " ***** Test Step 57 : Create new RFID credential and add it to existing user\n"); + err = TestCreateNewRfidCredentialAndAddItToExistingUser_57(); break; case 58: - ChipLogProgress(chipTool, " ***** Test Step 58 : Verify created credential\n"); - err = TestVerifyCreatedCredential_58(); + ChipLogProgress(chipTool, " ***** Test Step 58 : Verify modified user\n"); + err = TestVerifyModifiedUser_58(); break; case 59: - ChipLogProgress(chipTool, " ***** Test Step 59 : Create new RFID credential and user with index 0 fails\n"); - err = TestCreateNewRfidCredentialAndUserWithIndex0Fails_59(); + ChipLogProgress(chipTool, " ***** Test Step 59 : Verify created credential\n"); + err = TestVerifyCreatedCredential_59(); break; case 60: - ChipLogProgress(chipTool, " ***** Test Step 60 : Create new RFID credential and user with out-of-bounds index fails\n"); - err = TestCreateNewRfidCredentialAndUserWithOutOfBoundsIndexFails_60(); + ChipLogProgress(chipTool, " ***** Test Step 60 : Create new RFID credential and user with index 0 fails\n"); + err = TestCreateNewRfidCredentialAndUserWithIndex0Fails_60(); break; case 61: - ChipLogProgress(chipTool, " ***** Test Step 61 : Create new credential and try to add it to 0 user\n"); - err = TestCreateNewCredentialAndTryToAddItTo0User_61(); + ChipLogProgress(chipTool, " ***** Test Step 61 : Create new RFID credential and user with out-of-bounds index fails\n"); + err = TestCreateNewRfidCredentialAndUserWithOutOfBoundsIndexFails_61(); break; case 62: - ChipLogProgress(chipTool, " ***** Test Step 62 : Create new credential and try to add it to out-of-bounds user\n"); - err = TestCreateNewCredentialAndTryToAddItToOutOfBoundsUser_62(); + ChipLogProgress(chipTool, " ***** Test Step 62 : Create new credential and try to add it to 0 user\n"); + err = TestCreateNewCredentialAndTryToAddItTo0User_62(); break; case 63: - ChipLogProgress(chipTool, " ***** Test Step 63 : Create new PIN with too short data\n"); - err = TestCreateNewPinWithTooShortData_63(); + ChipLogProgress(chipTool, " ***** Test Step 63 : Create new credential and try to add it to out-of-bounds user\n"); + err = TestCreateNewCredentialAndTryToAddItToOutOfBoundsUser_63(); break; case 64: - ChipLogProgress(chipTool, " ***** Test Step 64 : Create new PIN with too long data\n"); - err = TestCreateNewPinWithTooLongData_64(); + ChipLogProgress(chipTool, " ***** Test Step 64 : Create new PIN with too short data\n"); + err = TestCreateNewPinWithTooShortData_64(); break; case 65: - ChipLogProgress(chipTool, " ***** Test Step 65 : Create new RFID with too short data\n"); - err = TestCreateNewRfidWithTooShortData_65(); + ChipLogProgress(chipTool, " ***** Test Step 65 : Create new PIN with too long data\n"); + err = TestCreateNewPinWithTooLongData_65(); break; case 66: - ChipLogProgress(chipTool, " ***** Test Step 66 : Create new PIN with Programming user type fails\n"); - err = TestCreateNewPinWithProgrammingUserTypeFails_66(); + ChipLogProgress(chipTool, " ***** Test Step 66 : Create new RFID with too short data\n"); + err = TestCreateNewRfidWithTooShortData_66(); break; case 67: - ChipLogProgress(chipTool, " ***** Test Step 67 : Create new RFID with too short data\n"); - err = TestCreateNewRfidWithTooShortData_67(); + ChipLogProgress(chipTool, " ***** Test Step 67 : Create new PIN with Programming user type fails\n"); + err = TestCreateNewPinWithProgrammingUserTypeFails_67(); break; case 68: - ChipLogProgress(chipTool, " ***** Test Step 68 : Create new PIN credential with data the would cause duplicate\n"); - err = TestCreateNewPinCredentialWithDataTheWouldCauseDuplicate_68(); + ChipLogProgress(chipTool, " ***** Test Step 68 : Create new RFID with too short data\n"); + err = TestCreateNewRfidWithTooShortData_68(); break; case 69: - ChipLogProgress(chipTool, " ***** Test Step 69 : Create new RFID credential with data the would cause duplicate\n"); - err = TestCreateNewRfidCredentialWithDataTheWouldCauseDuplicate_69(); + ChipLogProgress(chipTool, " ***** Test Step 69 : Create new PIN credential with data the would cause duplicate\n"); + err = TestCreateNewPinCredentialWithDataTheWouldCauseDuplicate_69(); break; case 70: - ChipLogProgress(chipTool, " ***** Test Step 70 : Modify credentialData of existing PIN credential\n"); - err = TestModifyCredentialDataOfExistingPinCredential_70(); + ChipLogProgress(chipTool, " ***** Test Step 70 : Create new RFID credential with data the would cause duplicate\n"); + err = TestCreateNewRfidCredentialWithDataTheWouldCauseDuplicate_70(); break; case 71: - ChipLogProgress( - chipTool, " ***** Test Step 71 : Verify that credential was changed by creating new credential with old data\n"); - err = TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithOldData_71(); + ChipLogProgress(chipTool, " ***** Test Step 71 : Modify credentialData of existing PIN credential\n"); + err = TestModifyCredentialDataOfExistingPinCredential_71(); break; case 72: ChipLogProgress( - chipTool, " ***** Test Step 72 : Verify that credential was changed by creating new credential with new data\n"); - err = TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithNewData_72(); + chipTool, " ***** Test Step 72 : Verify that credential was changed by creating new credential with old data\n"); + err = TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithOldData_72(); break; case 73: - ChipLogProgress(chipTool, " ***** Test Step 73 : Create new RFID credential and add it to existing user\n"); - err = TestCreateNewRfidCredentialAndAddItToExistingUser_73(); + ChipLogProgress( + chipTool, " ***** Test Step 73 : Verify that credential was changed by creating new credential with new data\n"); + err = TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithNewData_73(); break; case 74: - ChipLogProgress(chipTool, " ***** Test Step 74 : Verify modified user\n"); - err = TestVerifyModifiedUser_74(); + ChipLogProgress(chipTool, " ***** Test Step 74 : Create new RFID credential and add it to existing user\n"); + err = TestCreateNewRfidCredentialAndAddItToExistingUser_74(); break; case 75: - ChipLogProgress(chipTool, " ***** Test Step 75 : Create new RFID credential and add it to existing user\n"); - err = TestCreateNewRfidCredentialAndAddItToExistingUser_75(); + ChipLogProgress(chipTool, " ***** Test Step 75 : Verify modified user\n"); + err = TestVerifyModifiedUser_75(); break; case 76: - ChipLogProgress(chipTool, " ***** Test Step 76 : Verify modified user\n"); - err = TestVerifyModifiedUser_76(); + ChipLogProgress(chipTool, " ***** Test Step 76 : Create new RFID credential and add it to existing user\n"); + err = TestCreateNewRfidCredentialAndAddItToExistingUser_76(); break; case 77: - ChipLogProgress(chipTool, " ***** Test Step 77 : Clear first PIN credential\n"); - err = TestClearFirstPinCredential_77(); + ChipLogProgress(chipTool, " ***** Test Step 77 : Verify modified user\n"); + err = TestVerifyModifiedUser_77(); break; case 78: - ChipLogProgress(chipTool, " ***** Test Step 78 : Read back the credential and make sure it is deleted\n"); - err = TestReadBackTheCredentialAndMakeSureItIsDeleted_78(); + ChipLogProgress(chipTool, " ***** Test Step 78 : Clear first PIN credential\n"); + err = TestClearFirstPinCredential_78(); break; case 79: - ChipLogProgress(chipTool, " ***** Test Step 79 : Read the user back and make sure PIN credential is deleted\n"); - err = TestReadTheUserBackAndMakeSurePinCredentialIsDeleted_79(); + ChipLogProgress(chipTool, " ***** Test Step 79 : Read back the credential and make sure it is deleted\n"); + err = TestReadBackTheCredentialAndMakeSureItIsDeleted_79(); break; case 80: - ChipLogProgress(chipTool, " ***** Test Step 80 : Clear the second PIN credential\n"); - err = TestClearTheSecondPinCredential_80(); + ChipLogProgress(chipTool, " ***** Test Step 80 : Read the user back and make sure PIN credential is deleted\n"); + err = TestReadTheUserBackAndMakeSurePinCredentialIsDeleted_80(); break; case 81: - ChipLogProgress(chipTool, " ***** Test Step 81 : Read back the credential and make sure it is deleted\n"); - err = TestReadBackTheCredentialAndMakeSureItIsDeleted_81(); + ChipLogProgress(chipTool, " ***** Test Step 81 : Clear the second PIN credential\n"); + err = TestClearTheSecondPinCredential_81(); break; case 82: - ChipLogProgress(chipTool, " ***** Test Step 82 : Read the user back and make sure related user is deleted\n"); - err = TestReadTheUserBackAndMakeSureRelatedUserIsDeleted_82(); + ChipLogProgress(chipTool, " ***** Test Step 82 : Read back the credential and make sure it is deleted\n"); + err = TestReadBackTheCredentialAndMakeSureItIsDeleted_82(); break; case 83: - ChipLogProgress(chipTool, " ***** Test Step 83 : Create new RFID credential with user\n"); - err = TestCreateNewRfidCredentialWithUser_83(); + ChipLogProgress(chipTool, " ***** Test Step 83 : Read the user back and make sure related user is deleted\n"); + err = TestReadTheUserBackAndMakeSureRelatedUserIsDeleted_83(); break; case 84: - ChipLogProgress(chipTool, " ***** Test Step 84 : Clear all the RFID credentials\n"); - err = TestClearAllTheRfidCredentials_84(); + ChipLogProgress(chipTool, " ***** Test Step 84 : Create new RFID credential with user\n"); + err = TestCreateNewRfidCredentialWithUser_84(); break; case 85: - ChipLogProgress(chipTool, " ***** Test Step 85 : Read back the fist RFID credential and make sure it is deleted\n"); - err = TestReadBackTheFistRfidCredentialAndMakeSureItIsDeleted_85(); + ChipLogProgress(chipTool, " ***** Test Step 85 : Clear all the RFID credentials\n"); + err = TestClearAllTheRfidCredentials_85(); break; case 86: - ChipLogProgress(chipTool, " ***** Test Step 86 : Read back the second RFID credential and make sure it is deleted\n"); - err = TestReadBackTheSecondRfidCredentialAndMakeSureItIsDeleted_86(); + ChipLogProgress(chipTool, " ***** Test Step 86 : Read back the fist RFID credential and make sure it is deleted\n"); + err = TestReadBackTheFistRfidCredentialAndMakeSureItIsDeleted_86(); break; case 87: - ChipLogProgress(chipTool, " ***** Test Step 87 : Read back the third RFID credential and make sure it is deleted\n"); - err = TestReadBackTheThirdRfidCredentialAndMakeSureItIsDeleted_87(); + ChipLogProgress(chipTool, " ***** Test Step 87 : Read back the second RFID credential and make sure it is deleted\n"); + err = TestReadBackTheSecondRfidCredentialAndMakeSureItIsDeleted_87(); break; case 88: - ChipLogProgress(chipTool, - " ***** Test Step 88 : Read the user related with first RFID back and make sure it has only PIN credential\n"); - err = TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItHasOnlyPinCredential_88(); + ChipLogProgress(chipTool, " ***** Test Step 88 : Read back the third RFID credential and make sure it is deleted\n"); + err = TestReadBackTheThirdRfidCredentialAndMakeSureItIsDeleted_88(); break; case 89: - ChipLogProgress( - chipTool, " ***** Test Step 89 : Read the user related with second RFID back and make sure it is deleted\n"); - err = TestReadTheUserRelatedWithSecondRfidBackAndMakeSureItIsDeleted_89(); + ChipLogProgress(chipTool, + " ***** Test Step 89 : Read the user related with first RFID back and make sure it has only PIN credential\n"); + err = TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItHasOnlyPinCredential_89(); break; case 90: - ChipLogProgress(chipTool, " ***** Test Step 90 : Create new PIN credential with user\n"); - err = TestCreateNewPinCredentialWithUser_90(); + ChipLogProgress( + chipTool, " ***** Test Step 90 : Read the user related with second RFID back and make sure it is deleted\n"); + err = TestReadTheUserRelatedWithSecondRfidBackAndMakeSureItIsDeleted_90(); break; case 91: - ChipLogProgress(chipTool, " ***** Test Step 91 : Create new RFID credential with user\n"); - err = TestCreateNewRfidCredentialWithUser_91(); + ChipLogProgress(chipTool, " ***** Test Step 91 : Create new PIN credential with user\n"); + err = TestCreateNewPinCredentialWithUser_91(); break; case 92: - ChipLogProgress(chipTool, " ***** Test Step 92 : Create another RFID credential with user\n"); - err = TestCreateAnotherRfidCredentialWithUser_92(); + ChipLogProgress(chipTool, " ***** Test Step 92 : Create new RFID credential with user\n"); + err = TestCreateNewRfidCredentialWithUser_92(); break; case 93: - ChipLogProgress(chipTool, " ***** Test Step 93 : Clear all the credentials\n"); - err = TestClearAllTheCredentials_93(); + ChipLogProgress(chipTool, " ***** Test Step 93 : Create another RFID credential with user\n"); + err = TestCreateAnotherRfidCredentialWithUser_93(); break; case 94: - ChipLogProgress(chipTool, " ***** Test Step 94 : Read back the first PIN credential and make sure it is deleted\n"); - err = TestReadBackTheFirstPinCredentialAndMakeSureItIsDeleted_94(); + ChipLogProgress(chipTool, " ***** Test Step 94 : Clear all the credentials\n"); + err = TestClearAllTheCredentials_94(); break; case 95: - ChipLogProgress(chipTool, " ***** Test Step 95 : Read back the first RFID credential and make sure it is deleted\n"); - err = TestReadBackTheFirstRfidCredentialAndMakeSureItIsDeleted_95(); + ChipLogProgress(chipTool, " ***** Test Step 95 : Read back the first PIN credential and make sure it is deleted\n"); + err = TestReadBackTheFirstPinCredentialAndMakeSureItIsDeleted_95(); break; case 96: - ChipLogProgress(chipTool, " ***** Test Step 96 : Read back the second PIN credential and make sure it is deleted\n"); - err = TestReadBackTheSecondPinCredentialAndMakeSureItIsDeleted_96(); + ChipLogProgress(chipTool, " ***** Test Step 96 : Read back the first RFID credential and make sure it is deleted\n"); + err = TestReadBackTheFirstRfidCredentialAndMakeSureItIsDeleted_96(); break; case 97: - ChipLogProgress( - chipTool, " ***** Test Step 97 : Read the user related with first PIN back and make sure it is deleted\n"); - err = TestReadTheUserRelatedWithFirstPinBackAndMakeSureItIsDeleted_97(); + ChipLogProgress(chipTool, " ***** Test Step 97 : Read back the second PIN credential and make sure it is deleted\n"); + err = TestReadBackTheSecondPinCredentialAndMakeSureItIsDeleted_97(); break; case 98: ChipLogProgress( - chipTool, " ***** Test Step 98 : Read the user related with first RFID back and make sure it is deleted\n"); - err = TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItIsDeleted_98(); + chipTool, " ***** Test Step 98 : Read the user related with first PIN back and make sure it is deleted\n"); + err = TestReadTheUserRelatedWithFirstPinBackAndMakeSureItIsDeleted_98(); break; case 99: ChipLogProgress( - chipTool, " ***** Test Step 99 : Read the user related with second PIN back and make sure it is deleted\n"); - err = TestReadTheUserRelatedWithSecondPinBackAndMakeSureItIsDeleted_99(); + chipTool, " ***** Test Step 99 : Read the user related with first RFID back and make sure it is deleted\n"); + err = TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItIsDeleted_99(); break; case 100: ChipLogProgress( - chipTool, " ***** Test Step 100 : Read the user related with last RFID back and make sure it is deleted\n"); - err = TestReadTheUserRelatedWithLastRfidBackAndMakeSureItIsDeleted_100(); + chipTool, " ***** Test Step 100 : Read the user related with second PIN back and make sure it is deleted\n"); + err = TestReadTheUserRelatedWithSecondPinBackAndMakeSureItIsDeleted_100(); break; case 101: - ChipLogProgress(chipTool, " ***** Test Step 101 : Create new Programming PIN credential with invalid index\n"); - err = TestCreateNewProgrammingPinCredentialWithInvalidIndex_101(); + ChipLogProgress( + chipTool, " ***** Test Step 101 : Read the user related with last RFID back and make sure it is deleted\n"); + err = TestReadTheUserRelatedWithLastRfidBackAndMakeSureItIsDeleted_101(); break; case 102: - ChipLogProgress(chipTool, " ***** Test Step 102 : Create new Programming PIN credential with valid index\n"); - err = TestCreateNewProgrammingPinCredentialWithValidIndex_102(); + ChipLogProgress(chipTool, " ***** Test Step 102 : Create new Programming PIN credential with invalid index\n"); + err = TestCreateNewProgrammingPinCredentialWithInvalidIndex_102(); break; case 103: - ChipLogProgress(chipTool, " ***** Test Step 103 : Verify created user\n"); - err = TestVerifyCreatedUser_103(); + ChipLogProgress(chipTool, " ***** Test Step 103 : Create new Programming PIN credential with valid index\n"); + err = TestCreateNewProgrammingPinCredentialWithValidIndex_103(); break; case 104: - ChipLogProgress(chipTool, " ***** Test Step 104 : Verify created programming PIN credential\n"); - err = TestVerifyCreatedProgrammingPinCredential_104(); + ChipLogProgress(chipTool, " ***** Test Step 104 : Verify created user\n"); + err = TestVerifyCreatedUser_104(); break; case 105: - ChipLogProgress(chipTool, " ***** Test Step 105 : Modify the Programming PIN credential\n"); - err = TestModifyTheProgrammingPinCredential_105(); + ChipLogProgress(chipTool, " ***** Test Step 105 : Verify created programming PIN credential\n"); + err = TestVerifyCreatedProgrammingPinCredential_105(); break; case 106: - ChipLogProgress(chipTool, " ***** Test Step 106 : Clearing Programming PIN fails\n"); - err = TestClearingProgrammingPinFails_106(); + ChipLogProgress(chipTool, " ***** Test Step 106 : Modify the Programming PIN credential\n"); + err = TestModifyTheProgrammingPinCredential_106(); break; case 107: - ChipLogProgress(chipTool, " ***** Test Step 107 : Clearing Programming PIN with invalid index fails\n"); - err = TestClearingProgrammingPinWithInvalidIndexFails_107(); + ChipLogProgress(chipTool, " ***** Test Step 107 : Clearing Programming PIN fails\n"); + err = TestClearingProgrammingPinFails_107(); break; case 108: - ChipLogProgress(chipTool, " ***** Test Step 108 : Clearing PIN credential with zero index fails\n"); - err = TestClearingPinCredentialWithZeroIndexFails_108(); + ChipLogProgress(chipTool, " ***** Test Step 108 : Clearing Programming PIN with invalid index fails\n"); + err = TestClearingProgrammingPinWithInvalidIndexFails_108(); break; case 109: - ChipLogProgress(chipTool, " ***** Test Step 109 : Clearing PIN credential with out-of-bound index fails\n"); - err = TestClearingPinCredentialWithOutOfBoundIndexFails_109(); + ChipLogProgress(chipTool, " ***** Test Step 109 : Clearing PIN credential with zero index fails\n"); + err = TestClearingPinCredentialWithZeroIndexFails_109(); break; case 110: - ChipLogProgress(chipTool, " ***** Test Step 110 : Clearing RFID credential with zero index fails\n"); - err = TestClearingRfidCredentialWithZeroIndexFails_110(); + ChipLogProgress(chipTool, " ***** Test Step 110 : Clearing PIN credential with out-of-bound index fails\n"); + err = TestClearingPinCredentialWithOutOfBoundIndexFails_110(); break; case 111: - ChipLogProgress(chipTool, " ***** Test Step 111 : Clearing RFID credential with out-of-bound index fails\n"); - err = TestClearingRfidCredentialWithOutOfBoundIndexFails_111(); + ChipLogProgress(chipTool, " ***** Test Step 111 : Clearing RFID credential with zero index fails\n"); + err = TestClearingRfidCredentialWithZeroIndexFails_111(); break; case 112: - ChipLogProgress(chipTool, " ***** Test Step 112 : Clear the Programming PIN user\n"); - err = TestClearTheProgrammingPinUser_112(); + ChipLogProgress(chipTool, " ***** Test Step 112 : Clearing RFID credential with out-of-bound index fails\n"); + err = TestClearingRfidCredentialWithOutOfBoundIndexFails_112(); break; case 113: - ChipLogProgress(chipTool, " ***** Test Step 113 : Make sure Programming PIN user is deleted\n"); - err = TestMakeSureProgrammingPinUserIsDeleted_113(); + ChipLogProgress(chipTool, " ***** Test Step 113 : Clear the Programming PIN user\n"); + err = TestClearTheProgrammingPinUser_113(); break; case 114: - ChipLogProgress(chipTool, " ***** Test Step 114 : Make sure programming PIN credential is deleted\n"); - err = TestMakeSureProgrammingPinCredentialIsDeleted_114(); + ChipLogProgress(chipTool, " ***** Test Step 114 : Make sure Programming PIN user is deleted\n"); + err = TestMakeSureProgrammingPinUserIsDeleted_114(); break; case 115: - ChipLogProgress(chipTool, " ***** Test Step 115 : Create new PIN credential and user\n"); - err = TestCreateNewPinCredentialAndUser_115(); + ChipLogProgress(chipTool, " ***** Test Step 115 : Make sure programming PIN credential is deleted\n"); + err = TestMakeSureProgrammingPinCredentialIsDeleted_115(); break; case 116: - ChipLogProgress(chipTool, " ***** Test Step 116 : Create second PIN credential and add it to existing user\n"); - err = TestCreateSecondPinCredentialAndAddItToExistingUser_116(); + ChipLogProgress(chipTool, " ***** Test Step 116 : Create new PIN credential and user\n"); + err = TestCreateNewPinCredentialAndUser_116(); break; case 117: - ChipLogProgress(chipTool, " ***** Test Step 117 : Create third PIN credential and add it to existing user\n"); - err = TestCreateThirdPinCredentialAndAddItToExistingUser_117(); + ChipLogProgress(chipTool, " ***** Test Step 117 : Create second PIN credential and add it to existing user\n"); + err = TestCreateSecondPinCredentialAndAddItToExistingUser_117(); break; case 118: - ChipLogProgress(chipTool, " ***** Test Step 118 : Create fourth PIN credential and add it to existing user\n"); - err = TestCreateFourthPinCredentialAndAddItToExistingUser_118(); + ChipLogProgress(chipTool, " ***** Test Step 118 : Create third PIN credential and add it to existing user\n"); + err = TestCreateThirdPinCredentialAndAddItToExistingUser_118(); break; case 119: - ChipLogProgress(chipTool, " ***** Test Step 119 : Create fifth PIN credential and add it to existing user\n"); - err = TestCreateFifthPinCredentialAndAddItToExistingUser_119(); + ChipLogProgress(chipTool, " ***** Test Step 119 : Create fourth PIN credential and add it to existing user\n"); + err = TestCreateFourthPinCredentialAndAddItToExistingUser_119(); break; case 120: - ChipLogProgress(chipTool, " ***** Test Step 120 : Try to create sixth PIN credential and make sure it fails\n"); - err = TestTryToCreateSixthPinCredentialAndMakeSureItFails_120(); + ChipLogProgress(chipTool, " ***** Test Step 120 : Create fifth PIN credential and add it to existing user\n"); + err = TestCreateFifthPinCredentialAndAddItToExistingUser_120(); break; case 121: - ChipLogProgress(chipTool, " ***** Test Step 121 : Final clean-up\n"); - err = TestFinalCleanUp_121(); + ChipLogProgress(chipTool, " ***** Test Step 121 : Try to create sixth PIN credential and make sure it fails\n"); + err = TestTryToCreateSixthPinCredentialAndMakeSureItFails_121(); + break; + case 122: + ChipLogProgress(chipTool, " ***** Test Step 122 : Final clean-up\n"); + err = TestFinalCleanUp_122(); break; } @@ -110688,7 +110692,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 106: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; case 107: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); @@ -110706,7 +110710,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 112: - VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), EMBER_ZCL_STATUS_INVALID_COMMAND)); break; case 113: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); @@ -110735,6 +110739,9 @@ class DL_UsersAndCredentials : public TestCommandBridge { case 121: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 122: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -110748,7 +110755,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 122; + const uint16_t mTestCount = 123; chip::Optional mNodeId; chip::Optional mCluster; @@ -113274,7 +113281,58 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadingRfidCredentialWithIndex0ReturnsNoCredentialDuplicateWithBugWorkaround_53() + CHIP_ERROR TestReadingRfidCredentialWithIndex0ReturnsNoCredential_53() + { + + MTRBaseDevice * device = GetDevice("alpha"); + commissionerNodeId = mCommissionerNodeId.ValueOr(0); + __auto_type * cluster = [[MTRBaseClusterDoorLock alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; + params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:0U]; + + [cluster getCredentialStatusWithParams:params + completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, + NSError * _Nullable err) { + NSLog(@"Reading RFID credential with index 0 returns no credential Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = values.credentialExists; + VerifyOrReturn(CheckValue("CredentialExists", actualValue, false)); + } + + { + id actualValue = values.userIndex; + VerifyOrReturn(CheckValueNull("UserIndex", actualValue)); + } + + { + id actualValue = values.creatorFabricIndex; + VerifyOrReturn(CheckValueNull("CreatorFabricIndex", actualValue)); + } + + { + id actualValue = values.lastModifiedFabricIndex; + VerifyOrReturn(CheckValueNull("LastModifiedFabricIndex", actualValue)); + } + + { + id actualValue = values.nextCredentialIndex; + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadingRfidCredentialWithIndex0ReturnsNoCredentialDuplicateWithBugWorkaround_54() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113322,7 +113380,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadingRfidCredentialWithOutOfBoundsIndexReturnsNoCredential_54() + CHIP_ERROR TestReadingRfidCredentialWithOutOfBoundsIndexReturnsNoCredential_55() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113375,7 +113433,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCheckThatRfidCredentialDoesNotExist_55() + CHIP_ERROR TestCheckThatRfidCredentialDoesNotExist_56() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113426,7 +113484,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_56() + CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_57() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113438,7 +113496,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -113464,7 +113522,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -113473,7 +113531,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyModifiedUser_57() + CHIP_ERROR TestVerifyModifiedUser_58() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113534,7 +113592,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 1U)); } { @@ -113560,7 +113618,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyCreatedCredential_58() + CHIP_ERROR TestVerifyCreatedCredential_59() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113571,7 +113629,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -113614,7 +113672,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialAndUserWithIndex0Fails_59() + CHIP_ERROR TestCreateNewRfidCredentialAndUserWithIndex0Fails_60() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113652,7 +113710,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -113661,7 +113719,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialAndUserWithOutOfBoundsIndexFails_60() + CHIP_ERROR TestCreateNewRfidCredentialAndUserWithOutOfBoundsIndexFails_61() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113708,7 +113766,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewCredentialAndTryToAddItTo0User_61() + CHIP_ERROR TestCreateNewCredentialAndTryToAddItTo0User_62() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113720,7 +113778,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113746,7 +113804,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113755,7 +113813,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewCredentialAndTryToAddItToOutOfBoundsUser_62() + CHIP_ERROR TestCreateNewCredentialAndTryToAddItToOutOfBoundsUser_63() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113767,7 +113825,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; @@ -113793,7 +113851,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113802,7 +113860,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewPinWithTooShortData_63() + CHIP_ERROR TestCreateNewPinWithTooShortData_64() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113814,7 +113872,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"12345" length:5]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113840,7 +113898,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113849,7 +113907,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewPinWithTooLongData_64() + CHIP_ERROR TestCreateNewPinWithTooLongData_65() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113861,7 +113919,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"123456789" length:9]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113887,7 +113945,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113896,7 +113954,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidWithTooShortData_65() + CHIP_ERROR TestCreateNewRfidWithTooShortData_66() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113908,7 +113966,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data" length:9]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113934,7 +113992,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113943,7 +114001,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewPinWithProgrammingUserTypeFails_66() + CHIP_ERROR TestCreateNewPinWithProgrammingUserTypeFails_67() { MTRBaseDevice * device = GetDevice("alpha"); @@ -113955,7 +114013,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -113981,7 +114039,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -113990,7 +114048,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidWithTooShortData_67() + CHIP_ERROR TestCreateNewRfidWithTooShortData_68() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114002,7 +114060,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"very_long_rfid_data_to_test_boundaries" length:38]; params.userIndex = [NSNumber numberWithUnsignedShort:0U]; @@ -114028,7 +114086,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -114037,7 +114095,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewPinCredentialWithDataTheWouldCauseDuplicate_68() + CHIP_ERROR TestCreateNewPinCredentialWithDataTheWouldCauseDuplicate_69() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114049,7 +114107,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -114075,7 +114133,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -114084,7 +114142,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialWithDataTheWouldCauseDuplicate_69() + CHIP_ERROR TestCreateNewRfidCredentialWithDataTheWouldCauseDuplicate_70() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114096,7 +114154,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_123456" length:16]; params.userIndex = nil; @@ -114122,7 +114180,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -114131,7 +114189,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestModifyCredentialDataOfExistingPinCredential_70() + CHIP_ERROR TestModifyCredentialDataOfExistingPinCredential_71() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114169,7 +114227,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 2U)); } NextTest(); @@ -114178,7 +114236,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithOldData_71() + CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithOldData_72() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114190,7 +114248,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"000000" length:6]; params.userIndex = nil; @@ -114217,7 +114275,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -114226,7 +114284,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithNewData_72() + CHIP_ERROR TestVerifyThatCredentialWasChangedByCreatingNewCredentialWithNewData_73() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114238,7 +114296,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -114264,7 +114322,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -114273,7 +114331,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_73() + CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_74() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114285,7 +114343,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_7890" length:14]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -114311,7 +114369,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -114320,7 +114378,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyModifiedUser_74() + CHIP_ERROR TestVerifyModifiedUser_75() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114381,11 +114439,11 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 1U)); VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 4U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 2U)); } { @@ -114412,7 +114470,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_75() + CHIP_ERROR TestCreateNewRfidCredentialAndAddItToExistingUser_76() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114424,7 +114482,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:5U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"789012" length:6]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; @@ -114450,7 +114508,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 6U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -114459,7 +114517,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyModifiedUser_76() + CHIP_ERROR TestVerifyModifiedUser_77() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114520,15 +114578,15 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 1U)); VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 4U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 2U)); VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialType, 1U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialIndex, 5U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[3]).credentialIndex, 3U)); } { @@ -114555,7 +114613,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearFirstPinCredential_77() + CHIP_ERROR TestClearFirstPinCredential_78() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114580,7 +114638,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_78() + CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_79() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114632,7 +114690,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserBackAndMakeSurePinCredentialIsDeleted_79() + CHIP_ERROR TestReadTheUserBackAndMakeSurePinCredentialIsDeleted_80() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114689,15 +114747,15 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 2U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 1U)); VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialType, 2U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 4U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[1]).credentialIndex, 2U)); VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialType, 1U)); VerifyOrReturn(CheckValue("CredentialIndex", - ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 5U)); + ((MTRDoorLockClusterCredentialStruct *) actualValue[2]).credentialIndex, 3U)); } { @@ -114724,7 +114782,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearTheSecondPinCredential_80() + CHIP_ERROR TestClearTheSecondPinCredential_81() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114735,7 +114793,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterClearCredentialParams alloc] init]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -114749,7 +114807,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_81() + CHIP_ERROR TestReadBackTheCredentialAndMakeSureItIsDeleted_82() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114760,7 +114818,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -114792,7 +114850,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); } NextTest(); @@ -114801,7 +114859,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserBackAndMakeSureRelatedUserIsDeleted_82() + CHIP_ERROR TestReadTheUserBackAndMakeSureRelatedUserIsDeleted_83() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114873,7 +114931,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialWithUser_83() + CHIP_ERROR TestCreateNewRfidCredentialWithUser_84() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114885,7 +114943,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.operationType = [NSNumber numberWithUnsignedChar:0U]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:1U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; params.credentialData = [[NSData alloc] initWithBytes:"rfid_data_12345" length:15]; params.userIndex = nil; @@ -114912,7 +114970,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 3U)); + VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 4U)); } NextTest(); @@ -114921,7 +114979,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearAllTheRfidCredentials_84() + CHIP_ERROR TestClearAllTheRfidCredentials_85() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114946,7 +115004,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheFistRfidCredentialAndMakeSureItIsDeleted_85() + CHIP_ERROR TestReadBackTheFistRfidCredentialAndMakeSureItIsDeleted_86() { MTRBaseDevice * device = GetDevice("alpha"); @@ -114988,8 +115046,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -114998,7 +115055,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheSecondRfidCredentialAndMakeSureItIsDeleted_86() + CHIP_ERROR TestReadBackTheSecondRfidCredentialAndMakeSureItIsDeleted_87() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115040,8 +115097,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115050,7 +115106,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheThirdRfidCredentialAndMakeSureItIsDeleted_87() + CHIP_ERROR TestReadBackTheThirdRfidCredentialAndMakeSureItIsDeleted_88() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115061,7 +115117,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterGetCredentialStatusParams alloc] init]; params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; - ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:4U]; + ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:3U]; [cluster getCredentialStatusWithParams:params completion:^(MTRDoorLockClusterGetCredentialStatusResponseParams * _Nullable values, @@ -115092,8 +115148,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.nextCredentialIndex; - VerifyOrReturn(CheckValueNonNull("NextCredentialIndex", actualValue)); - VerifyOrReturn(CheckValue("NextCredentialIndex", actualValue, 5U)); + VerifyOrReturn(CheckValueNull("NextCredentialIndex", actualValue)); } NextTest(); @@ -115102,7 +115157,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItHasOnlyPinCredential_88() + CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItHasOnlyPinCredential_89() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115160,7 +115215,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue( "CredentialType", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialType, 1U)); VerifyOrReturn(CheckValue( - "CredentialIndex", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 5U)); + "CredentialIndex", ((MTRDoorLockClusterCredentialStruct *) actualValue[0]).credentialIndex, 3U)); } { @@ -115186,7 +115241,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserRelatedWithSecondRfidBackAndMakeSureItIsDeleted_89() + CHIP_ERROR TestReadTheUserRelatedWithSecondRfidBackAndMakeSureItIsDeleted_90() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115258,7 +115313,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewPinCredentialWithUser_90() + CHIP_ERROR TestCreateNewPinCredentialWithUser_91() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115306,7 +115361,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewRfidCredentialWithUser_91() + CHIP_ERROR TestCreateNewRfidCredentialWithUser_92() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115354,7 +115409,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateAnotherRfidCredentialWithUser_92() + CHIP_ERROR TestCreateAnotherRfidCredentialWithUser_93() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115402,7 +115457,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearAllTheCredentials_93() + CHIP_ERROR TestClearAllTheCredentials_94() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115424,7 +115479,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheFirstPinCredentialAndMakeSureItIsDeleted_94() + CHIP_ERROR TestReadBackTheFirstPinCredentialAndMakeSureItIsDeleted_95() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115475,7 +115530,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheFirstRfidCredentialAndMakeSureItIsDeleted_95() + CHIP_ERROR TestReadBackTheFirstRfidCredentialAndMakeSureItIsDeleted_96() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115526,7 +115581,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadBackTheSecondPinCredentialAndMakeSureItIsDeleted_96() + CHIP_ERROR TestReadBackTheSecondPinCredentialAndMakeSureItIsDeleted_97() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115577,7 +115632,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserRelatedWithFirstPinBackAndMakeSureItIsDeleted_97() + CHIP_ERROR TestReadTheUserRelatedWithFirstPinBackAndMakeSureItIsDeleted_98() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115649,7 +115704,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItIsDeleted_98() + CHIP_ERROR TestReadTheUserRelatedWithFirstRfidBackAndMakeSureItIsDeleted_99() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115721,7 +115776,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserRelatedWithSecondPinBackAndMakeSureItIsDeleted_99() + CHIP_ERROR TestReadTheUserRelatedWithSecondPinBackAndMakeSureItIsDeleted_100() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115793,7 +115848,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestReadTheUserRelatedWithLastRfidBackAndMakeSureItIsDeleted_100() + CHIP_ERROR TestReadTheUserRelatedWithLastRfidBackAndMakeSureItIsDeleted_101() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115865,7 +115920,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewProgrammingPinCredentialWithInvalidIndex_101() + CHIP_ERROR TestCreateNewProgrammingPinCredentialWithInvalidIndex_102() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115911,7 +115966,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewProgrammingPinCredentialWithValidIndex_102() + CHIP_ERROR TestCreateNewProgrammingPinCredentialWithValidIndex_103() { MTRBaseDevice * device = GetDevice("alpha"); @@ -115958,7 +116013,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyCreatedUser_103() + CHIP_ERROR TestVerifyCreatedUser_104() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116041,7 +116096,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestVerifyCreatedProgrammingPinCredential_104() + CHIP_ERROR TestVerifyCreatedProgrammingPinCredential_105() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116095,7 +116150,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestModifyTheProgrammingPinCredential_105() + CHIP_ERROR TestModifyTheProgrammingPinCredential_106() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116141,7 +116196,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearingProgrammingPinFails_106() + CHIP_ERROR TestClearingProgrammingPinFails_107() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116169,7 +116224,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearingProgrammingPinWithInvalidIndexFails_107() + CHIP_ERROR TestClearingProgrammingPinWithInvalidIndexFails_108() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116197,7 +116252,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearingPinCredentialWithZeroIndexFails_108() + CHIP_ERROR TestClearingPinCredentialWithZeroIndexFails_109() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116225,7 +116280,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearingPinCredentialWithOutOfBoundIndexFails_109() + CHIP_ERROR TestClearingPinCredentialWithOutOfBoundIndexFails_110() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116254,7 +116309,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearingRfidCredentialWithZeroIndexFails_110() + CHIP_ERROR TestClearingRfidCredentialWithZeroIndexFails_111() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116282,7 +116337,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearingRfidCredentialWithOutOfBoundIndexFails_111() + CHIP_ERROR TestClearingRfidCredentialWithOutOfBoundIndexFails_112() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116311,7 +116366,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestClearTheProgrammingPinUser_112() + CHIP_ERROR TestClearTheProgrammingPinUser_113() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116333,7 +116388,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestMakeSureProgrammingPinUserIsDeleted_113() + CHIP_ERROR TestMakeSureProgrammingPinUserIsDeleted_114() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116405,7 +116460,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestMakeSureProgrammingPinCredentialIsDeleted_114() + CHIP_ERROR TestMakeSureProgrammingPinCredentialIsDeleted_115() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116456,7 +116511,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateNewPinCredentialAndUser_115() + CHIP_ERROR TestCreateNewPinCredentialAndUser_116() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116504,7 +116559,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateSecondPinCredentialAndAddItToExistingUser_116() + CHIP_ERROR TestCreateSecondPinCredentialAndAddItToExistingUser_117() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116551,7 +116606,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateThirdPinCredentialAndAddItToExistingUser_117() + CHIP_ERROR TestCreateThirdPinCredentialAndAddItToExistingUser_118() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116598,7 +116653,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateFourthPinCredentialAndAddItToExistingUser_118() + CHIP_ERROR TestCreateFourthPinCredentialAndAddItToExistingUser_119() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116645,7 +116700,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestCreateFifthPinCredentialAndAddItToExistingUser_119() + CHIP_ERROR TestCreateFifthPinCredentialAndAddItToExistingUser_120() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116692,7 +116747,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestTryToCreateSixthPinCredentialAndMakeSureItFails_120() + CHIP_ERROR TestTryToCreateSixthPinCredentialAndMakeSureItFails_121() { MTRBaseDevice * device = GetDevice("alpha"); @@ -116739,7 +116794,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - CHIP_ERROR TestFinalCleanUp_121() + CHIP_ERROR TestFinalCleanUp_122() { MTRBaseDevice * device = GetDevice("alpha");