diff --git a/scripts/py_matter_yamltests/matter_yamltests/errors.py b/scripts/py_matter_yamltests/matter_yamltests/errors.py index fb525bae6c8850..daa886573569c1 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/errors.py +++ b/scripts/py_matter_yamltests/matter_yamltests/errors.py @@ -210,3 +210,15 @@ def __init__(self, content): self.tag_key_with_error(content, 'command') arguments = content.get('arguments') self.tag_key_with_error(arguments, 'value') + + +class TestStepSaveAsNameError(TestStepError): + """Raise when a test step response save an attribute response with the same name than the attribute itself""" + + def __init__(self, content): + message = 'The "saveAs" key can not be the same than the "attribute" key' + super().__init__(message) + + self.tag_key_with_error(content, 'attribute') + response = content.get('response') + self.tag_key_with_error(response, 'saveAs') diff --git a/scripts/py_matter_yamltests/matter_yamltests/parser.py b/scripts/py_matter_yamltests/matter_yamltests/parser.py index d66584355ff175..18e643d97d5df5 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/parser.py +++ b/scripts/py_matter_yamltests/matter_yamltests/parser.py @@ -1080,9 +1080,8 @@ def _config_variable_substitution(self, value): variable_info = self._runtime_config_variable_storage[token] if type(variable_info) is dict and 'defaultValue' in variable_info: variable_info = variable_info['defaultValue'] - if variable_info is not None: - tokens[idx] = variable_info - substitution_occured = True + tokens[idx] = variable_info + substitution_occured = True if len(tokens) == 1: return tokens[0] diff --git a/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py b/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py index 5f1352ced6d40e..d798ef5f06d99c 100644 --- a/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py +++ b/scripts/py_matter_yamltests/matter_yamltests/yaml_loader.py @@ -17,7 +17,8 @@ from .errors import (TestStepArgumentsValueError, TestStepError, TestStepGroupEndPointError, TestStepGroupResponseError, TestStepInvalidTypeError, TestStepKeyError, TestStepNodeIdAndGroupIdError, TestStepResponseVariableError, - TestStepValueAndValuesError, TestStepVerificationStandaloneError, TestStepWaitResponseError) + TestStepSaveAsNameError, TestStepValueAndValuesError, TestStepVerificationStandaloneError, + TestStepWaitResponseError) from .fixes import add_yaml_support_for_scientific_notation_without_dot try: @@ -123,6 +124,7 @@ def __check_test_step(self, config: dict, content): self.__rule_wait_should_not_expect_a_response(content) self.__rule_response_variable_should_exist_in_config(config, content) self.__rule_argument_value_is_only_when_writing_attributes(content) + self.__rule_saveas_name_and_attribute_name_should_be_different(content) if 'arguments' in content: arguments = content.get('arguments') @@ -272,3 +274,11 @@ def __rule_argument_value_is_only_when_writing_attributes(self, content): arguments = content.get('arguments') if 'value' in arguments and operation != 'writeAttribute': raise TestStepArgumentsValueError(content) + + def __rule_saveas_name_and_attribute_name_should_be_different(self, content): + if content.get('command') == 'readAttribute' and 'response' in content: + attribute_name = content.get('attribute') + response = content.get('response') + if 'saveAs' in response: + if response.get('saveAs') == attribute_name: + raise TestStepSaveAsNameError(content) diff --git a/src/app/tests/suites/DL_Schedules.yaml b/src/app/tests/suites/DL_Schedules.yaml index 208600f4f65ec8..fedc9247daca26 100644 --- a/src/app/tests/suites/DL_Schedules.yaml +++ b/src/app/tests/suites/DL_Schedules.yaml @@ -58,7 +58,7 @@ tests: command: "readAttribute" attribute: "NumberOfTotalUsersSupported" response: - saveAs: NumberOfTotalUsersSupported + saveAs: NumberOfTotalUsersSupportedValue value: 10 - label: @@ -67,7 +67,7 @@ tests: command: "readAttribute" attribute: "NumberOfWeekDaySchedulesSupportedPerUser" response: - saveAs: NumberOfWeekDaySchedulesSupportedPerUser + saveAs: NumberOfWeekDaySchedulesSupportedPerUserValue value: 10 - label: @@ -76,14 +76,14 @@ tests: command: "readAttribute" attribute: "NumberOfYearDaySchedulesSupportedPerUser" response: - saveAs: NumberOfYearDaySchedulesSupportedPerUser + saveAs: NumberOfYearDaySchedulesSupportedPerUserValue value: 10 - label: "Get Max number of Holiday schedules and verify default value" command: "readAttribute" attribute: "NumberOfHolidaySchedulesSupported" response: - saveAs: NumberOfHolidaySchedulesSupported + saveAs: NumberOfHolidaySchedulesSupportedValue value: 10 # @@ -115,7 +115,7 @@ tests: arguments: values: - name: "WeekDayIndex" - value: NumberOfWeekDaySchedulesSupportedPerUser + 1 + value: NumberOfWeekDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 - name: "DaysMask" @@ -159,7 +159,7 @@ tests: - name: "WeekDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 - name: "DaysMask" value: 0x01 - name: "StartHour" @@ -427,13 +427,13 @@ tests: arguments: values: - name: "WeekDayIndex" - value: NumberOfWeekDaySchedulesSupportedPerUser + 1 + value: NumberOfWeekDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 response: values: - name: "WeekDayIndex" - value: NumberOfWeekDaySchedulesSupportedPerUser + 1 + value: NumberOfWeekDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 - name: "Status" @@ -463,13 +463,13 @@ tests: - name: "WeekDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 response: values: - name: "WeekDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 - name: "Status" value: 0x85 @@ -513,7 +513,7 @@ tests: arguments: values: - name: "YearDayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + 1 + value: NumberOfYearDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 - name: "LocalStartTime" @@ -545,7 +545,7 @@ tests: - name: "YearDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 - name: "LocalStartTime" value: 12345 - name: "LocalEndTime" @@ -625,13 +625,13 @@ tests: arguments: values: - name: "YearDayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + 1 + value: NumberOfYearDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 response: values: - name: "YearDayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + 1 + value: NumberOfYearDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 - name: "Status" @@ -661,13 +661,13 @@ tests: - name: "YearDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 response: values: - name: "YearDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 - name: "Status" value: 0x85 @@ -711,7 +711,7 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + 1 + value: NumberOfHolidaySchedulesSupportedValue + 1 - name: "LocalStartTime" value: 12345 - name: "LocalEndTime" @@ -785,11 +785,11 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + 1 + value: NumberOfHolidaySchedulesSupportedValue + 1 response: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + 1 + value: NumberOfHolidaySchedulesSupportedValue + 1 - name: "Status" value: 0x85 @@ -925,7 +925,7 @@ tests: arguments: values: - name: "WeekDayIndex" - value: NumberOfWeekDaySchedulesSupportedPerUser + 1 + value: NumberOfWeekDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 response: @@ -949,7 +949,7 @@ tests: - name: "WeekDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 response: error: INVALID_COMMAND @@ -1050,7 +1050,7 @@ tests: arguments: values: - name: "YearDayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + 1 + value: NumberOfYearDaySchedulesSupportedPerUserValue + 1 - name: "UserIndex" value: 1 response: @@ -1074,7 +1074,7 @@ tests: - name: "YearDayIndex" value: 1 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 response: error: INVALID_COMMAND @@ -1171,7 +1171,7 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + 1 + value: NumberOfYearDaySchedulesSupportedPerUserValue + 1 response: error: INVALID_COMMAND @@ -1896,7 +1896,7 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue - name: "LocalStartTime" value: 1 - name: "LocalEndTime" @@ -1909,11 +1909,11 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue response: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue - name: "Status" value: 0x0 - name: "LocalStartTime" @@ -2027,11 +2027,11 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue response: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue - name: "Status" value: 0x0 - name: "LocalStartTime" @@ -2129,11 +2129,11 @@ tests: arguments: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue response: values: - name: "HolidayIndex" - value: NumberOfHolidaySchedulesSupported + value: NumberOfHolidaySchedulesSupportedValue - name: "Status" value: 0x8B diff --git a/src/app/tests/suites/DL_UsersAndCredentials.yaml b/src/app/tests/suites/DL_UsersAndCredentials.yaml index d62a8291181084..0a344d4883eba6 100644 --- a/src/app/tests/suites/DL_UsersAndCredentials.yaml +++ b/src/app/tests/suites/DL_UsersAndCredentials.yaml @@ -61,7 +61,7 @@ tests: command: "readAttribute" attribute: "NumberOfTotalUsersSupported" response: - saveAs: NumberOfTotalUsersSupported + saveAs: NumberOfTotalUsersSupportedValue value: 10 - label: "Read fails for user with index 0" @@ -79,7 +79,7 @@ tests: arguments: values: - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 response: error: INVALID_COMMAND @@ -656,7 +656,7 @@ tests: - name: "OperationType" value: 0 - name: "UserIndex" - value: NumberOfTotalUsersSupported + value: NumberOfTotalUsersSupportedValue - name: "UserName" value: "last_user" - name: "UserUniqueID" @@ -673,11 +673,11 @@ tests: arguments: values: - name: "UserIndex" - value: NumberOfTotalUsersSupported + value: NumberOfTotalUsersSupportedValue response: values: - name: "UserIndex" - value: NumberOfTotalUsersSupported + value: NumberOfTotalUsersSupportedValue - name: "UserName" value: "last_user" - name: "UserUniqueID" @@ -727,7 +727,7 @@ tests: - name: "OperationType" value: 0 - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 - name: "UserName" value: null - name: "UserUniqueID" @@ -844,7 +844,7 @@ tests: arguments: values: - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 response: error: INVALID_COMMAND @@ -890,11 +890,11 @@ tests: arguments: values: - name: "UserIndex" - value: NumberOfTotalUsersSupported + value: NumberOfTotalUsersSupportedValue response: values: - name: "UserIndex" - value: NumberOfTotalUsersSupported + value: NumberOfTotalUsersSupportedValue - name: "UserName" value: null - name: "UserUniqueID" @@ -922,7 +922,7 @@ tests: command: "readAttribute" attribute: "NumberOfPINUsersSupported" response: - saveAs: NumberOfPINUsersSupported + saveAs: NumberOfPINUsersSupportedValue value: 10 - label: "Check that PIN credential does not exist" @@ -972,7 +972,7 @@ tests: value: { CredentialType: 1, - CredentialIndex: NumberOfPINUsersSupported + 1, + CredentialIndex: NumberOfPINUsersSupportedValue + 1, } response: values: @@ -1154,7 +1154,7 @@ tests: value: { CredentialType: 1, - CredentialIndex: NumberOfPINUsersSupported + 1, + CredentialIndex: NumberOfPINUsersSupportedValue + 1, } - name: "CredentialData" value: "123456" @@ -1177,7 +1177,7 @@ tests: command: "readAttribute" attribute: "NumberOfRFIDUsersSupported" response: - saveAs: NumberOfRFIDUsersSupported + saveAs: NumberOfRFIDUsersSupportedValue value: 10 - label: "Reading RFID credential with index 0 returns no credential" @@ -1209,7 +1209,7 @@ tests: value: { CredentialType: 2, - CredentialIndex: NumberOfRFIDUsersSupported + 1, + CredentialIndex: NumberOfRFIDUsersSupportedValue + 1, } response: values: @@ -1443,7 +1443,7 @@ tests: value: { CredentialType: 2, - CredentialIndex: NumberOfRFIDUsersSupported + 1, + CredentialIndex: NumberOfRFIDUsersSupportedValue + 1, } - name: "CredentialData" value: "new_rfid_data_field" @@ -1500,7 +1500,7 @@ tests: - name: "CredentialData" value: "123465" - name: "UserIndex" - value: NumberOfTotalUsersSupported + 1 + value: NumberOfTotalUsersSupportedValue + 1 - name: "UserStatus" value: null - name: "UserType" @@ -2692,7 +2692,7 @@ tests: value: { CredentialType: 1, - CredentialIndex: NumberOfPINUsersSupported + 1, + CredentialIndex: NumberOfPINUsersSupportedValue + 1, } response: error: INVALID_COMMAND @@ -2716,7 +2716,7 @@ tests: value: { CredentialType: 2, - CredentialIndex: NumberOfRFIDUsersSupported + 1, + CredentialIndex: NumberOfRFIDUsersSupportedValue + 1, } response: error: INVALID_COMMAND diff --git a/src/app/tests/suites/TestColorControl_9_2.yaml b/src/app/tests/suites/TestColorControl_9_2.yaml index 21e501ced547a9..0d41650935001c 100644 --- a/src/app/tests/suites/TestColorControl_9_2.yaml +++ b/src/app/tests/suites/TestColorControl_9_2.yaml @@ -233,7 +233,7 @@ tests: command: "readAttribute" attribute: "ColorLoopStartEnhancedHue" response: - saveAs: ColorLoopStartEnhancedHue + saveAs: ColorLoopStartEnhancedHueValue2 - label: "Read EnhancedCurrentHue attribute from DUT" command: "readAttribute" @@ -241,7 +241,7 @@ tests: response: constraints: type: int16u - minValue: ColorLoopStartEnhancedHue + minValue: ColorLoopStartEnhancedHueValue2 maxValue: 65535 - label: "Wait for 5S" @@ -258,7 +258,7 @@ tests: response: constraints: type: int16u - minValue: ColorLoopStartEnhancedHue + minValue: ColorLoopStartEnhancedHueValue2 maxValue: 65535 - label: @@ -294,13 +294,13 @@ tests: command: "readAttribute" attribute: "ColorLoopStoredEnhancedHue" response: - saveAs: ColorLoopStoredEnhancedHueValue + saveAs: ColorLoopStoredEnhancedHueValue3 - label: "Read EnhancedCurrentHue attribute from DUT." command: "readAttribute" attribute: "EnhancedCurrentHue" response: - value: ColorLoopStoredEnhancedHueValue + value: ColorLoopStoredEnhancedHueValue3 - label: "Turn off light for color control tests" cluster: "On/Off" diff --git a/src/app/tests/suites/TestSaveAs.yaml b/src/app/tests/suites/TestSaveAs.yaml index 47a648a4f384ea..de46bb85caec79 100644 --- a/src/app/tests/suites/TestSaveAs.yaml +++ b/src/app/tests/suites/TestSaveAs.yaml @@ -802,3 +802,38 @@ tests: attribute: "octet_string" arguments: value: readAttributeOctetStringDefaultValue + + # Tests for null values + - label: "Read attribute nullable_boolean Default Value" + command: "readAttribute" + attribute: "nullable_boolean" + response: + saveAs: readAttributeNullableBooleanDefaultValue + value: false + + - label: "Write attribute nullable_boolean to null" + command: "writeAttribute" + attribute: "nullable_boolean" + arguments: + value: null + + - label: "Read attribute nullable_boolean null Value" + command: "readAttribute" + attribute: "nullable_boolean" + response: + saveAs: readAttributeNullableBooleanNullValue + value: null + + - label: + "Read attribute nullable_boolean null Value again and compare it to + the previously saved value" + command: "readAttribute" + attribute: "nullable_boolean" + response: + value: readAttributeNullableBooleanNullValue + + - label: "Write attribute nullable_boolean Default Value" + command: "writeAttribute" + attribute: "nullable_boolean" + arguments: + value: readAttributeNullableBooleanDefaultValue diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml index 68dacd47324ba1..af287a4fa97869 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_3.yaml @@ -69,7 +69,7 @@ tests: command: "readAttribute" attribute: "CurrentFabricIndex" response: - saveAs: CurrentFabricIndex + saveAs: CurrentFabricIndexValue - label: "Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster Extension @@ -88,7 +88,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }] - label: "Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster Extension @@ -97,7 +97,7 @@ tests: command: "readAttribute" attribute: "Extension" response: - value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }] - label: "Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster Extension @@ -108,7 +108,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }] - label: "Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster Extension @@ -117,7 +117,7 @@ tests: command: "readAttribute" attribute: "Extension" response: - value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }] - label: "Step 8: TH1 writes DUT Endpoint 0 AccessControl cluster Extension @@ -128,7 +128,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_OK_FULL, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_FULL, FabricIndex: CurrentFabricIndexValue }] - label: "Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster Extension @@ -137,7 +137,7 @@ tests: command: "readAttribute" attribute: "Extension" response: - value: [{ Data: D_OK_FULL, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_FULL, FabricIndex: CurrentFabricIndexValue }] - label: "Step 10: TH1 writes DUT Endpoint 0 AccessControl cluster Extension @@ -148,7 +148,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_LENGTH, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_BAD_LENGTH, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -160,7 +160,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_STRUCT, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_BAD_STRUCT, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -173,7 +173,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_LIST, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_BAD_LIST, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -186,7 +186,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_ELEM, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_BAD_ELEM, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -199,7 +199,8 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_OVERFLOW, FabricIndex: CurrentFabricIndex }] + value: + [{ Data: D_BAD_OVERFLOW, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -212,7 +213,8 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_UNDERFLOW, FabricIndex: CurrentFabricIndex }] + value: + [{ Data: D_BAD_UNDERFLOW, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -224,7 +226,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_NONE, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_BAD_NONE, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -241,8 +243,8 @@ tests: arguments: value: [ - { Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }, - { Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndex }, + { Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }, + { Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }, ] response: error: CONSTRAINT_ERROR @@ -254,7 +256,7 @@ tests: command: "readAttribute" attribute: "Extension" response: - value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }] - label: "Step 19: TH1 writes DUT Endpoint 0 AccessControl cluster Extension diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml index ac498dc6ff9d8a..c08bba0b65f47f 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml @@ -59,7 +59,7 @@ tests: cluster: "Operational Credentials" attribute: "CurrentFabricIndex" response: - saveAs: CurrentFabricIndex + saveAs: CurrentFabricIndexValue - label: "Step 3:TH1 reads DUT Endpoint 0 AccessControl cluster ACL attribute" @@ -74,7 +74,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -98,7 +98,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, @@ -106,7 +106,7 @@ tests: Subjects: [111, 222, 333, 444], Targets: [{ Cluster: 11, Endpoint: 22, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -114,7 +114,7 @@ tests: Subjects: [555, 666, 777, 888], Targets: [{ Cluster: 55, Endpoint: 66, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -131,7 +131,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, @@ -139,7 +139,7 @@ tests: Subjects: [111, 222, 333, 444], Targets: [{ Cluster: 11, Endpoint: 22, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -147,7 +147,7 @@ tests: Subjects: [555, 666, 777, 888], Targets: [{ Cluster: 55, Endpoint: 66, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -171,7 +171,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 4, @@ -179,7 +179,7 @@ tests: Subjects: [444, 333, 222, 111], Targets: [{ Cluster: 44, Endpoint: 33, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 5, @@ -187,7 +187,7 @@ tests: Subjects: [888, 777, 666, 555], Targets: [{ Cluster: 88, Endpoint: 77, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -204,7 +204,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 4, @@ -212,7 +212,7 @@ tests: Subjects: [444, 333, 222, 111], Targets: [{ Cluster: 44, Endpoint: 33, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 5, @@ -220,7 +220,7 @@ tests: Subjects: [888, 777, 666, 555], Targets: [{ Cluster: 88, Endpoint: 77, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -245,7 +245,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, @@ -256,7 +256,7 @@ tests: { Cluster: 11, Endpoint: 22, DeviceType: null }, { Cluster: 33, Endpoint: null, DeviceType: 44 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -267,7 +267,7 @@ tests: { Cluster: 55, Endpoint: 66, DeviceType: null }, { Cluster: 77, Endpoint: null, DeviceType: 88 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -283,7 +283,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, @@ -294,7 +294,7 @@ tests: { Cluster: 11, Endpoint: 22, DeviceType: null }, { Cluster: 33, Endpoint: null, DeviceType: 44 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -305,7 +305,7 @@ tests: { Cluster: 55, Endpoint: 66, DeviceType: null }, { Cluster: 77, Endpoint: null, DeviceType: 88 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -330,7 +330,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, @@ -341,7 +341,7 @@ tests: { Cluster: 11, Endpoint: 22, DeviceType: null }, { Cluster: 33, Endpoint: null, DeviceType: 44 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -352,7 +352,7 @@ tests: { Cluster: 55, Endpoint: 66, DeviceType: null }, { Cluster: 77, Endpoint: null, DeviceType: 88 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -368,7 +368,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, @@ -379,7 +379,7 @@ tests: { Cluster: 11, Endpoint: 22, DeviceType: null }, { Cluster: 33, Endpoint: null, DeviceType: 44 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -390,7 +390,7 @@ tests: { Cluster: 55, Endpoint: 66, DeviceType: null }, { Cluster: 77, Endpoint: null, DeviceType: 88 }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -414,21 +414,21 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, AuthMode: 2, Subjects: [111, 222, 333, 444], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 3, Subjects: [555, 666, 777, 888], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -444,21 +444,21 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 1, AuthMode: 2, Subjects: [111, 222, 333, 444], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 3, Subjects: [555, 666, 777, 888], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -480,14 +480,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 3, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -503,14 +503,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 3, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -532,14 +532,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 2, AuthMode: 2, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -555,14 +555,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 2, AuthMode: 2, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -719,14 +719,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: [CAT1, CAT2, CAT3, CAT4], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -742,14 +742,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: [CAT1, CAT2, CAT3, CAT4], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -760,7 +760,7 @@ tests: command: "readAttribute" attribute: "TargetsPerAccessControlEntry" response: - saveAs: TargetsPerAccessControlEntry + saveAs: TargetsPerAccessControlEntryValue #Need if support : https://github.com/project-chip/connectedhomeip/issues/16719 - label: @@ -926,21 +926,21 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -956,21 +956,21 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -992,14 +992,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 1, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1017,7 +1017,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -1039,14 +1039,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 5, AuthMode: 3, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1070,14 +1070,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: "6", AuthMode: 3, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1097,14 +1097,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: "6", AuthMode: "4", Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1124,14 +1124,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: [0], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1155,14 +1155,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: ["18446744073709551615"], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1186,14 +1186,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: ["18446744060824649728"], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1217,14 +1217,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: ["18446744073709486080"], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1248,7 +1248,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -1256,7 +1256,7 @@ tests: Subjects: null, Targets: [{ Cluster: null, Endpoint: null, DeviceType: null }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1280,7 +1280,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -1294,7 +1294,7 @@ tests: DeviceType: null, }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1318,7 +1318,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -1332,7 +1332,7 @@ tests: DeviceType: null, }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1356,7 +1356,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -1370,7 +1370,7 @@ tests: DeviceType: 4294967295, }, ], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1394,7 +1394,7 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, @@ -1402,7 +1402,7 @@ tests: Subjects: null, Targets: [{ Cluster: null, Endpoint: 22, DeviceType: 33 }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: @@ -1426,14 +1426,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 2, Subjects: null, Targets: [{ Cluster: 11, Endpoint: 22, DeviceType: 33 }], - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml index cc97538d2a3678..bc2a1b7ddb315c 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml @@ -56,7 +56,7 @@ tests: cluster: "Operational Credentials" attribute: "CurrentFabricIndex" response: - saveAs: CurrentFabricIndex + saveAs: CurrentFabricIndexValue #Issue: https://github.com/project-chip/connectedhomeip/issues/24081 - label: @@ -94,7 +94,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }] - label: "Step 5: TH reads DUT Endpoint 0 AccessControl cluster @@ -109,8 +109,11 @@ tests: AdminPasscodeID: null, ChangeType: 1, LatestValue: - { Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }, - FabricIndex: CurrentFabricIndex, + { + Data: D_OK_EMPTY, + FabricIndex: CurrentFabricIndexValue, + }, + FabricIndex: CurrentFabricIndexValue, } - label: @@ -121,7 +124,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }] #Issue: https://github.com/project-chip/connectedhomeip/issues/24149 - label: @@ -178,7 +181,7 @@ tests: command: "writeAttribute" attribute: "Extension" arguments: - value: [{ Data: D_BAD_LENGTH, FabricIndex: CurrentFabricIndex }] + value: [{ Data: D_BAD_LENGTH, FabricIndex: CurrentFabricIndexValue }] response: error: CONSTRAINT_ERROR @@ -224,8 +227,8 @@ tests: arguments: value: [ - { Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndex }, - { Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndex }, + { Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }, + { Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }, ] response: error: CONSTRAINT_ERROR diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml index 5cb8e02110db3a..942fd2f97f82c2 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml @@ -46,7 +46,7 @@ tests: cluster: "Operational Credentials" attribute: "CurrentFabricIndex" response: - saveAs: CurrentFabricIndex + saveAs: CurrentFabricIndexValue - label: "Step 3: TH reads DUT Endpoint 0 AccessControl cluster @@ -66,9 +66,9 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, } - label: @@ -89,14 +89,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 3, Subjects: null, Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -210,14 +210,14 @@ tests: AuthMode: 2, Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, { Privilege: 3, AuthMode: 3, Subjects: [0], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml index 1789e7091b8d52..6b8e1d507b5bfd 100644 --- a/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACL_2_9.yaml @@ -52,7 +52,7 @@ tests: cluster: "Operational Credentials" attribute: "CurrentFabricIndex" response: - saveAs: CurrentFabricIndex + saveAs: CurrentFabricIndexValue - label: "Step 2:TH1 writes DUT Endpoint 0 AccessControl cluster ACL attribute" @@ -67,7 +67,7 @@ tests: AuthMode: "2", Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] @@ -92,7 +92,7 @@ tests: AuthMode: "2", Subjects: [CommissionerNodeId], Targets: null, - FabricIndex: CurrentFabricIndex, + FabricIndex: CurrentFabricIndexValue, }, ] response: diff --git a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml index 2492c644355dfc..4406b0a35b6a98 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_8_1.yaml @@ -218,7 +218,7 @@ tests: command: "readAttribute" attribute: "ColorTempPhysicalMinMireds" response: - saveAs: ColorTempPhysicalMinMireds + saveAs: ColorTempPhysicalMinMiredsValue constraints: type: int16u minValue: 0 @@ -229,7 +229,7 @@ tests: command: "readAttribute" attribute: "ColorTempPhysicalMaxMireds" response: - saveAs: ColorTempPhysicalMaxMireds + saveAs: ColorTempPhysicalMaxMiredsValue constraints: type: int16u minValue: 0 @@ -245,8 +245,8 @@ tests: values: - name: "ColorTemperatureMireds" value: - ( ColorTempPhysicalMinMireds + ColorTempPhysicalMaxMireds ) - / 2 + ( ColorTempPhysicalMinMiredsValue + + ColorTempPhysicalMaxMiredsValue ) / 2 - name: "TransitionTime" value: 0 - name: "OptionsMask" @@ -274,12 +274,12 @@ tests: value: 1 - name: "Rate" value: - ( ColorTempPhysicalMaxMireds - ColorTempPhysicalMinMireds ) - / 40 + ( ColorTempPhysicalMaxMiredsValue - + ColorTempPhysicalMinMiredsValue ) / 40 - name: "ColorTemperatureMinimumMireds" - value: ColorTempPhysicalMinMireds + value: ColorTempPhysicalMinMiredsValue - name: "ColorTemperatureMaximumMireds" - value: ColorTempPhysicalMaxMireds + value: ColorTempPhysicalMaxMiredsValue - name: "OptionsMask" value: 0 - name: "OptionsOverride" @@ -309,8 +309,8 @@ tests: attribute: "ColorTemperatureMireds" response: constraints: - minValue: ColorTempPhysicalMinMireds - maxValue: ColorTempPhysicalMaxMireds + minValue: ColorTempPhysicalMinMiredsValue + maxValue: ColorTempPhysicalMaxMiredsValue - label: "Wait 2s" cluster: "DelayCommands" @@ -326,8 +326,8 @@ tests: attribute: "ColorTemperatureMireds" response: constraints: - minValue: ColorTempPhysicalMinMireds - maxValue: ColorTempPhysicalMaxMireds + minValue: ColorTempPhysicalMinMiredsValue + maxValue: ColorTempPhysicalMaxMiredsValue - label: "Step 5a: TH sends EnhancedMoveToHue command to DUT with diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml index c4cbef954db9c5..959804e2a8e11c 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_9_2.yaml @@ -255,7 +255,7 @@ tests: attribute: "ColorLoopStartEnhancedHue" PICS: CC.S.F01 && CC.S.F02 && CC.S.A4005 && CC.S.C44.Rsp response: - saveAs: ColorLoopStartEnhancedHue + saveAs: ColorLoopStartEnhancedHueValue2 - label: "Step 3c: Read EnhancedCurrentHue attribute from DUT" command: "readAttribute" @@ -264,7 +264,7 @@ tests: response: constraints: type: int16u - minValue: ColorLoopStartEnhancedHue + minValue: ColorLoopStartEnhancedHueValue2 maxValue: 65535 - label: "Wait for 30S" @@ -283,7 +283,7 @@ tests: response: constraints: type: int16u - minValue: ColorLoopStartEnhancedHue + minValue: ColorLoopStartEnhancedHueValue2 maxValue: 65535 - label: @@ -323,14 +323,14 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4006 && CC.S.C44.Rsp attribute: "ColorLoopStoredEnhancedHue" response: - saveAs: ColorLoopStoredEnhancedHueValue + saveAs: ColorLoopStoredEnhancedHueValue3 - label: "Step 4c: Read EnhancedCurrentHue attribute from DUT." command: "readAttribute" attribute: "EnhancedCurrentHue" PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: - value: ColorLoopStoredEnhancedHueValue + value: ColorLoopStoredEnhancedHueValue3 - label: "Turn off light for color control tests" PICS: OO.S.C00.Rsp diff --git a/src/app/tests/suites/certification/Test_TC_CDOCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CDOCONC_2_1.yaml index 82a2a7b622e566..aefd4aeb36e961 100644 --- a/src/app/tests/suites/certification/Test_TC_CDOCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CDOCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: CDOCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: CDOCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_CMOCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CMOCONC_2_1.yaml index 62de23eda9c0c4..9d1ab7f333031e 100644 --- a/src/app/tests/suites/certification/Test_TC_CMOCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CMOCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: CMOCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: CMOCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml index 782824c8de5caf..dc14b7b47be313 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_5.yaml @@ -89,7 +89,7 @@ tests: command: "readAttribute" attribute: "NumberOfWeekDaySchedulesSupportedPerUser" response: - saveAs: NumberOfWeekDaySchedulesSupportedPerUser + saveAs: NumberOfWeekDaySchedulesSupportedPerUserValue constraints: minValue: 0 maxValue: 255 @@ -99,7 +99,7 @@ tests: command: "readAttribute" attribute: "NumberOfTotalUsersSupported" response: - saveAs: NumberOfTotalUsersSupported + saveAs: NumberOfTotalUsersSupportedValue constraints: minValue: 0 maxValue: 65534 diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_6.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_6.yaml index 739bcd33a304b4..c52167942223ff 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_6.yaml @@ -41,7 +41,7 @@ tests: command: "readAttribute" attribute: "NumberOfHolidaySchedulesSupported" response: - saveAs: NumberOfHolidaySchedulesSupported + saveAs: NumberOfHolidaySchedulesSupportedValue constraints: minValue: 0 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml index 0db99395e20ea8..86dcd163375afc 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_7.yaml @@ -89,7 +89,7 @@ tests: command: "readAttribute" attribute: "NumberOfYearDaySchedulesSupportedPerUser" response: - saveAs: NumberOfYearDaySchedulesSupportedPerUser + saveAs: NumberOfYearDaySchedulesSupportedPerUserValue constraints: minValue: 0 maxValue: 255 @@ -99,7 +99,7 @@ tests: command: "readAttribute" attribute: "NumberOfTotalUsersSupported" response: - saveAs: NumberOfTotalUsersSupported + saveAs: NumberOfTotalUsersSupportedValue constraints: minValue: 0 maxValue: 65534 @@ -208,13 +208,13 @@ tests: arguments: values: - name: "YearDayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + value: NumberOfYearDaySchedulesSupportedPerUserValue - name: "UserIndex" value: 5 response: values: - name: "YearDayIndex" - value: NumberOfYearDaySchedulesSupportedPerUser + value: NumberOfYearDaySchedulesSupportedPerUserValue - name: "UserIndex" value: 5 - name: "Status" diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml index e1169d4acd1aeb..fa960d570a0e47 100644 --- a/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_DRLK_2_9.yaml @@ -90,7 +90,7 @@ tests: command: "readAttribute" attribute: "NumberOfTotalUsersSupported" response: - saveAs: NumberOfTotalUsersSupported + saveAs: NumberOfTotalUsersSupportedValue constraints: minValue: 0 maxValue: 65534 diff --git a/src/app/tests/suites/certification/Test_TC_FLDCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLDCONC_2_1.yaml index 2c9c2b78c55f0b..fa75195dd33fff 100644 --- a/src/app/tests/suites/certification/Test_TC_FLDCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLDCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: FLDCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: FLDCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml index 47c85f44d9a19e..b7817bf216284a 100644 --- a/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_ILL_2_2.yaml @@ -37,7 +37,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: int16u @@ -46,7 +46,7 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: int16u diff --git a/src/app/tests/suites/certification/Test_TC_NDOCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_NDOCONC_2_1.yaml index c98982da5b8b8b..145610ca5ff950 100644 --- a/src/app/tests/suites/certification/Test_TC_NDOCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_NDOCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: NDOCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: NDOCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_OZCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OZCONC_2_1.yaml index d68496691ab4c6..d1cf7f692e555a 100644 --- a/src/app/tests/suites/certification/Test_TC_OZCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OZCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: OZCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: OZCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_PMHCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PMHCONC_2_1.yaml index 02160146954a5a..2e673e96a6899c 100644 --- a/src/app/tests/suites/certification/Test_TC_PMHCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PMHCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: PMHCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: PMHCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_PMICONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PMICONC_2_1.yaml index 3488c29bd75cb7..f1692efb0443e2 100644 --- a/src/app/tests/suites/certification/Test_TC_PMICONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PMICONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: PMICONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: PMICONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_PMKCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PMKCONC_2_1.yaml index 848c3ae27ec5a4..1045a64fada66c 100644 --- a/src/app/tests/suites/certification/Test_TC_PMKCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PMKCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: PMKCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: PMKCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml index 1f5b8a86e00e1e..e025d856390ec3 100644 --- a/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PRS_2_1.yaml @@ -37,7 +37,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: int16s minValue: -32767 @@ -49,10 +49,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: int16s - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue maxValue: 32767 - label: "Step 4: Read the mandatory attribute constraints: MeasuredValue" @@ -62,8 +62,8 @@ tests: response: constraints: type: int16s - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: Read the optional attribute: Tolerance" PICS: PRS.S.A0003 @@ -80,7 +80,7 @@ tests: command: "readAttribute" attribute: "MinScaledValue" response: - saveAs: MinScaledValue + saveAs: MinScaledValueValue constraints: type: int16s minValue: -32767 @@ -91,10 +91,10 @@ tests: command: "readAttribute" attribute: "MaxScaledValue" response: - saveAs: MaxScaledValue + saveAs: MaxScaledValueValue constraints: type: int16s - minValue: MinScaledValue + minValue: MinScaledValueValue maxValue: 32767 - label: "Step 8: Read the optional attribute: ScaledValue" @@ -104,8 +104,8 @@ tests: response: constraints: type: int16s - minValue: MinScaledValue - maxValue: MaxScaledValue + minValue: MinScaledValueValue + maxValue: MaxScaledValueValue - label: "Step 9: Read the optional attribute: ScaledTolerance" PICS: PRS.S.A0013 diff --git a/src/app/tests/suites/certification/Test_TC_RNCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RNCONC_2_1.yaml index d8fea0cad57baa..fe2a4adebcfae9 100644 --- a/src/app/tests/suites/certification/Test_TC_RNCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RNCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: RNCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: RNCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_TVOCCONC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TVOCCONC_2_1.yaml index 9fa0181973521d..578b12c8de855d 100644 --- a/src/app/tests/suites/certification/Test_TC_TVOCCONC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TVOCCONC_2_1.yaml @@ -36,7 +36,7 @@ tests: command: "readAttribute" attribute: "MinMeasuredValue" response: - saveAs: MinMeasuredValue + saveAs: MinMeasuredValueValue constraints: type: single minValue: 0 @@ -46,10 +46,10 @@ tests: command: "readAttribute" attribute: "MaxMeasuredValue" response: - saveAs: MaxMeasuredValue + saveAs: MaxMeasuredValueValue constraints: type: single - minValue: MinMeasuredValue + minValue: MinMeasuredValueValue - label: "Step 4: TH reads from the DUT the MeasuredValue attribute." PICS: TVOCCONC.S.A0000 @@ -58,8 +58,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 5: TH reads from the DUT the PeakMeasuredValue attribute." PICS: TVOCCONC.S.A0003 @@ -68,8 +68,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 6: TH reads from the DUT the PeakMeasuredValueWindow attribute." @@ -89,8 +89,8 @@ tests: response: constraints: type: single - minValue: MinMeasuredValue - maxValue: MaxMeasuredValue + minValue: MinMeasuredValueValue + maxValue: MaxMeasuredValueValue - label: "Step 8: TH reads from the DUT the AverageMeasuredValueWindow diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml index d309d65f99a496..6c273f2fb46af0 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_2_1.yaml @@ -159,7 +159,7 @@ tests: attribute: "InstalledOpenLimitLift" PICS: WNCV.S.A0010 response: - saveAs: InstalledOpenLimitLift + saveAs: InstalledOpenLimitLiftValue constraints: type: int16u minValue: 0 @@ -173,7 +173,7 @@ tests: attribute: "InstalledClosedLimitLift" PICS: WNCV.S.A0011 response: - saveAs: InstalledClosedLimitLift + saveAs: InstalledClosedLimitLiftValue constraints: type: int16u minValue: 0 @@ -187,7 +187,7 @@ tests: attribute: "InstalledOpenLimitTilt" PICS: WNCV.S.A0012 response: - saveAs: InstalledOpenLimitTilt + saveAs: InstalledOpenLimitTiltValue constraints: type: int16u minValue: 0 @@ -201,7 +201,7 @@ tests: attribute: "InstalledClosedLimitTilt" PICS: WNCV.S.A0013 response: - saveAs: InstalledClosedLimitTilt + saveAs: InstalledClosedLimitTiltValue constraints: type: int16u minValue: 0 @@ -266,8 +266,8 @@ tests: response: constraints: type: int16u - minValue: InstalledOpenLimitLift - maxValue: InstalledClosedLimitLift + minValue: InstalledOpenLimitLiftValue + maxValue: InstalledClosedLimitLiftValue ### Attribute[ 4]: CurrentPositionTilt ==================== - label: @@ -290,8 +290,8 @@ tests: response: constraints: type: int16u - minValue: InstalledOpenLimitTilt - maxValue: InstalledClosedLimitTilt + minValue: InstalledOpenLimitTiltValue + maxValue: InstalledClosedLimitTiltValue ### Attribute[ 5]: NumberOfActuationsLift ==================== - label: 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 c3b182ff614a02..1f549307744223 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -3353,7 +3353,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nonnull CurrentFabricIndex; + NSNumber * _Nonnull CurrentFabricIndexValue; CHIP_ERROR TestStep2Th1ReadsDutEndpoint0OperationalCredentialsClusterCurrentFabricIndexAttribute_1() { @@ -3370,7 +3370,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - CurrentFabricIndex = value; + CurrentFabricIndexValue = value; } NextTest(); @@ -3422,7 +3422,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).data = mDOkEmpty.HasValue() ? [NSData dataWithBytes:mDOkEmpty.Value().data() length:mDOkEmpty.Value().size()] : [[NSData alloc] initWithBytes:"\x17\x18" length:2]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3470,7 +3470,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { )); VerifyOrReturn(CheckValue("FabricIndex", ((MTRAccessControlClusterAccessControlExtensionStruct *) actualValue[0]).fabricIndex, - CurrentFabricIndex)); + CurrentFabricIndexValue)); } NextTest(); @@ -3498,7 +3498,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C" "\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18" length:71]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3555,7 +3555,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { )); VerifyOrReturn(CheckValue("FabricIndex", ((MTRAccessControlClusterAccessControlExtensionStruct *) actualValue[0]).fabricIndex, - CurrentFabricIndex)); + CurrentFabricIndexValue)); } NextTest(); @@ -3586,7 +3586,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E" "\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x00\x18" length:128]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3648,7 +3648,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { )); VerifyOrReturn(CheckValue("FabricIndex", ((MTRAccessControlClusterAccessControlExtensionStruct *) actualValue[0]).fabricIndex, - CurrentFabricIndex)); + CurrentFabricIndexValue)); } NextTest(); @@ -3679,7 +3679,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x48\x65\x6C\x6C\x6F\x20\x57\x6F\x72\x6C\x64\x2E\x20\x54\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E" "\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x61\x67\x61\x69\x6E\x2E\x2E\x2E\x2E\x2E\x2E\x00\x18" length:129]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3721,7 +3721,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).data = mDBadStruct.HasValue() ? [NSData dataWithBytes:mDBadStruct.Value().data() length:mDBadStruct.Value().size()] : [[NSData alloc] initWithBytes:"\x15\x18" length:2]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3763,7 +3763,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x68\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20" "\x6C\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18" length:72]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3807,7 +3807,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C\x69\x76\x69\x6E\x67\x20" "\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18" length:65]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3851,7 +3851,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C" "\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18\xFF" length:72]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3895,7 +3895,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C" "\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00" length:70]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3935,7 +3935,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).data = mDBadNone.HasValue() ? [NSData dataWithBytes:mDBadNone.Value().data() length:mDBadNone.Value().size()] : [[NSData alloc] initWithBytes:"" length:0]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -3973,7 +3973,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).data = mDOkEmpty.HasValue() ? [NSData dataWithBytes:mDOkEmpty.Value().data() length:mDOkEmpty.Value().size()] : [[NSData alloc] initWithBytes:"\x17\x18" length:2]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[0]).fabricIndex = [CurrentFabricIndexValue copy]; temp_0[1] = [[MTRAccessControlClusterAccessControlExtensionStruct alloc] init]; ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[1]).data = mDOkSingle.HasValue() @@ -3983,7 +3983,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { "\x69\x73\x20\x69\x73\x20\x61\x20\x73\x69\x6E\x67\x6C\x65\x20\x65\x6C\x65\x6D\x65\x6E\x74\x20\x6C" "\x69\x76\x69\x6E\x67\x20\x61\x73\x20\x61\x20\x63\x68\x61\x72\x73\x74\x72\x69\x6E\x67\x00\x18" length:71]; - ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[1]).fabricIndex = [CurrentFabricIndex copy]; + ((MTRAccessControlClusterAccessControlExtensionStruct *) temp_0[1]).fabricIndex = [CurrentFabricIndexValue copy]; extensionArgument = temp_0; } @@ -4039,7 +4039,7 @@ class Test_TC_ACL_2_3 : public TestCommandBridge { )); VerifyOrReturn(CheckValue("FabricIndex", ((MTRAccessControlClusterAccessControlExtensionStruct *) actualValue[0]).fabricIndex, - CurrentFabricIndex)); + CurrentFabricIndexValue)); } NextTest(); @@ -27259,7 +27259,7 @@ class TestColorControl_9_2 : public TestCommandBridge { value.ms = 5000UL; return WaitForMs("alpha", value); } - NSNumber * _Nonnull ColorLoopStartEnhancedHue; + NSNumber * _Nonnull ColorLoopStartEnhancedHueValue2; CHIP_ERROR TestSavingValueForComparisionReadColorLoopStartEnhancedHueAttributeFromDut_21() { @@ -27274,7 +27274,7 @@ class TestColorControl_9_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - ColorLoopStartEnhancedHue = value; + ColorLoopStartEnhancedHueValue2 = value; } NextTest(); @@ -27296,8 +27296,8 @@ class TestColorControl_9_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); - VerifyOrReturn( - CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], ColorLoopStartEnhancedHue)); + VerifyOrReturn(CheckConstraintMinValue( + "enhancedCurrentHue", [value unsignedShortValue], ColorLoopStartEnhancedHueValue2)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); NextTest(); @@ -27327,8 +27327,8 @@ class TestColorControl_9_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); - VerifyOrReturn( - CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], ColorLoopStartEnhancedHue)); + VerifyOrReturn(CheckConstraintMinValue( + "enhancedCurrentHue", [value unsignedShortValue], ColorLoopStartEnhancedHueValue2)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); NextTest(); @@ -27388,7 +27388,7 @@ class TestColorControl_9_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull ColorLoopStoredEnhancedHueValue; + NSNumber * _Nonnull ColorLoopStoredEnhancedHueValue3; CHIP_ERROR TestSavingValueForComparisionReadColorLoopStoredEnhancedHueAttributeFromDut_27() { @@ -27403,7 +27403,7 @@ class TestColorControl_9_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); { - ColorLoopStoredEnhancedHueValue = value; + ColorLoopStoredEnhancedHueValue3 = value; } NextTest(); @@ -27426,7 +27426,7 @@ class TestColorControl_9_2 : public TestCommandBridge { { id actualValue = value; - VerifyOrReturn(CheckValue("EnhancedCurrentHue", actualValue, ColorLoopStoredEnhancedHueValue)); + VerifyOrReturn(CheckValue("EnhancedCurrentHue", actualValue, ColorLoopStoredEnhancedHueValue3)); } NextTest(); @@ -28761,7 +28761,7 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -28783,7 +28783,7 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -28791,7 +28791,7 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -28810,10 +28810,10 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -28839,8 +28839,8 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -28866,8 +28866,8 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -28917,8 +28917,8 @@ class Test_TC_CDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -30308,7 +30308,7 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -30330,7 +30330,7 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -30338,7 +30338,7 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -30357,10 +30357,10 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -30386,8 +30386,8 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -30413,8 +30413,8 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -30464,8 +30464,8 @@ class Test_TC_CMOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -31855,7 +31855,7 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -31877,7 +31877,7 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -31885,7 +31885,7 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -31904,10 +31904,10 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -31933,8 +31933,8 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -31960,8 +31960,8 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -32011,8 +32011,8 @@ class Test_TC_FLDCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -33402,7 +33402,7 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -33424,7 +33424,7 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -33432,7 +33432,7 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -33451,10 +33451,10 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -33480,8 +33480,8 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -33507,8 +33507,8 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -33558,8 +33558,8 @@ class Test_TC_NDOCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -34945,7 +34945,7 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -34967,7 +34967,7 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -34975,7 +34975,7 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -34994,10 +34994,10 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -35023,8 +35023,8 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -35050,8 +35050,8 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -35101,8 +35101,8 @@ class Test_TC_OZCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -36492,7 +36492,7 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -36514,7 +36514,7 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -36522,7 +36522,7 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -36541,10 +36541,10 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -36570,8 +36570,8 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -36597,8 +36597,8 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -36648,8 +36648,8 @@ class Test_TC_PMHCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -38039,7 +38039,7 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -38061,7 +38061,7 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -38069,7 +38069,7 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -38088,10 +38088,10 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -38117,8 +38117,8 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -38144,8 +38144,8 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -38195,8 +38195,8 @@ class Test_TC_PMICONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -39586,7 +39586,7 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -39608,7 +39608,7 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -39616,7 +39616,7 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -39635,10 +39635,10 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -39664,8 +39664,8 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -39691,8 +39691,8 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -39742,8 +39742,8 @@ class Test_TC_PMKCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -41129,7 +41129,7 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -41151,7 +41151,7 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -41159,7 +41159,7 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -41178,10 +41178,10 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -41207,8 +41207,8 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -41234,8 +41234,8 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -41285,8 +41285,8 @@ class Test_TC_RNCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -42707,7 +42707,7 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ThReadsFromTheDutTheMinMeasuredValueAttribute_1() { @@ -42730,7 +42730,7 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value floatValue], 0.0f)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -42738,7 +42738,7 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ThReadsFromTheDutTheMaxMeasuredValueAttribute_2() { @@ -42758,10 +42758,10 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value floatValue], MinMeasuredValueValue)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -42788,8 +42788,8 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -42816,8 +42816,8 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("peakMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("peakMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("peakMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -42869,8 +42869,8 @@ class Test_TC_TVOCCONC_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("averageMeasuredValue", "single", "single")); - VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("averageMeasuredValue", [value floatValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("averageMeasuredValue", [value floatValue], MaxMeasuredValueValue)); } NextTest(); @@ -57916,7 +57916,7 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2aThReadsMinMeasuredValueAttributeFromDut_1() { @@ -57937,7 +57937,7 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16u", "int16u")); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -57945,7 +57945,7 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep2bThReadsMaxMeasuredValueAttributeFromDut_2() { @@ -57966,7 +57966,7 @@ class Test_TC_ILL_2_2 : public TestCommandBridge { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16u", "int16u")); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -88385,7 +88385,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nullable MinMeasuredValue; + NSNumber * _Nullable MinMeasuredValueValue; CHIP_ERROR TestStep2ReadTheMandatoryAttributeConstraintsMinMeasuredValue_1() { @@ -88408,7 +88408,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value shortValue], 32766)); } { - MinMeasuredValue = value; + MinMeasuredValueValue = value; } NextTest(); @@ -88416,7 +88416,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxMeasuredValue; + NSNumber * _Nullable MaxMeasuredValueValue; CHIP_ERROR TestStep3ReadTheMandatoryAttributeConstraintsMaxMeasuredValue_2() { @@ -88435,11 +88435,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value shortValue], MinMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value shortValue], MinMeasuredValueValue)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value shortValue], 32767)); } { - MaxMeasuredValue = value; + MaxMeasuredValueValue = value; } NextTest(); @@ -88465,8 +88465,8 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("measuredValue", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value shortValue], MinMeasuredValue)); - VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value shortValue], MaxMeasuredValue)); + VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value shortValue], MinMeasuredValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value shortValue], MaxMeasuredValueValue)); } NextTest(); @@ -88498,7 +88498,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MinScaledValue; + NSNumber * _Nullable MinScaledValueValue; CHIP_ERROR TestStep6ReadTheOptionalAttributeMinScaledValue_5() { @@ -88521,7 +88521,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMaxValue("minScaledValue", [value shortValue], 32766)); } { - MinScaledValue = value; + MinScaledValueValue = value; } NextTest(); @@ -88529,7 +88529,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nullable MaxScaledValue; + NSNumber * _Nullable MaxScaledValueValue; CHIP_ERROR TestStep7ReadTheOptionalAttributeMaxScaledValue_6() { @@ -88548,11 +88548,11 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("maxScaledValue", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("maxScaledValue", [value shortValue], MinScaledValue)); + VerifyOrReturn(CheckConstraintMinValue("maxScaledValue", [value shortValue], MinScaledValueValue)); VerifyOrReturn(CheckConstraintMaxValue("maxScaledValue", [value shortValue], 32767)); } { - MaxScaledValue = value; + MaxScaledValueValue = value; } NextTest(); @@ -88578,8 +88578,8 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("scaledValue", "int16s", "int16s")); - VerifyOrReturn(CheckConstraintMinValue("scaledValue", [value shortValue], MinScaledValue)); - VerifyOrReturn(CheckConstraintMaxValue("scaledValue", [value shortValue], MaxScaledValue)); + VerifyOrReturn(CheckConstraintMinValue("scaledValue", [value shortValue], MinScaledValueValue)); + VerifyOrReturn(CheckConstraintMaxValue("scaledValue", [value shortValue], MaxScaledValueValue)); } NextTest(); @@ -108093,7 +108093,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull InstalledOpenLimitLift; + NSNumber * _Nonnull InstalledOpenLimitLiftValue; CHIP_ERROR TestStep2eReadTheRoOptionalAttributeDefaultInstalledOpenLimitLift_11() { @@ -108111,7 +108111,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedOpenLimitLift", [value unsignedShortValue], 65535U)); { - InstalledOpenLimitLift = value; + InstalledOpenLimitLiftValue = value; } NextTest(); @@ -108119,7 +108119,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull InstalledClosedLimitLift; + NSNumber * _Nonnull InstalledClosedLimitLiftValue; CHIP_ERROR TestStep2fReadTheRoOptionalAttributeDefaultInstalledClosedLimitLift_12() { @@ -108137,7 +108137,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedClosedLimitLift", [value unsignedShortValue], 65535U)); { - InstalledClosedLimitLift = value; + InstalledClosedLimitLiftValue = value; } NextTest(); @@ -108145,7 +108145,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull InstalledOpenLimitTilt; + NSNumber * _Nonnull InstalledOpenLimitTiltValue; CHIP_ERROR TestStep2gReadTheRoOptionalAttributeDefaultInstalledOpenLimitTilt_13() { @@ -108163,7 +108163,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedOpenLimitTilt", [value unsignedShortValue], 65535U)); { - InstalledOpenLimitTilt = value; + InstalledOpenLimitTiltValue = value; } NextTest(); @@ -108171,7 +108171,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull InstalledClosedLimitTilt; + NSNumber * _Nonnull InstalledClosedLimitTiltValue; CHIP_ERROR TestStep2hReadTheRoOptionalAttributeDefaultInstalledClosedLimitTilt_14() { @@ -108189,7 +108189,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedClosedLimitTilt", [value unsignedShortValue], 65535U)); { - InstalledClosedLimitTilt = value; + InstalledClosedLimitTiltValue = value; } NextTest(); @@ -108304,10 +108304,10 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("currentPositionLift", "int16u", "int16u")); - VerifyOrReturn( - CheckConstraintMinValue("currentPositionLift", [value unsignedShortValue], InstalledOpenLimitLift)); - VerifyOrReturn( - CheckConstraintMaxValue("currentPositionLift", [value unsignedShortValue], InstalledClosedLimitLift)); + VerifyOrReturn(CheckConstraintMinValue( + "currentPositionLift", [value unsignedShortValue], InstalledOpenLimitLiftValue)); + VerifyOrReturn(CheckConstraintMaxValue( + "currentPositionLift", [value unsignedShortValue], InstalledClosedLimitLiftValue)); } NextTest(); @@ -108356,10 +108356,10 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { VerifyOrReturn(CheckConstraintType("currentPositionTilt", "int16u", "int16u")); - VerifyOrReturn( - CheckConstraintMinValue("currentPositionTilt", [value unsignedShortValue], InstalledOpenLimitTilt)); - VerifyOrReturn( - CheckConstraintMaxValue("currentPositionTilt", [value unsignedShortValue], InstalledClosedLimitTilt)); + VerifyOrReturn(CheckConstraintMinValue( + "currentPositionTilt", [value unsignedShortValue], InstalledOpenLimitTiltValue)); + VerifyOrReturn(CheckConstraintMaxValue( + "currentPositionTilt", [value unsignedShortValue], InstalledClosedLimitTiltValue)); } NextTest(); @@ -138679,6 +138679,28 @@ class TestSaveAs : public TestCommandBridge { ChipLogProgress(chipTool, " ***** Test Step 109 : Write attribute octet_string Default Value\n"); err = TestWriteAttributeOctetStringDefaultValue_109(); break; + case 110: + ChipLogProgress(chipTool, " ***** Test Step 110 : Read attribute nullable_boolean Default Value\n"); + err = TestReadAttributeNullableBooleanDefaultValue_110(); + break; + case 111: + ChipLogProgress(chipTool, " ***** Test Step 111 : Write attribute nullable_boolean to null\n"); + err = TestWriteAttributeNullableBooleanToNull_111(); + break; + case 112: + ChipLogProgress(chipTool, " ***** Test Step 112 : Read attribute nullable_boolean null Value\n"); + err = TestReadAttributeNullableBooleanNullValue_112(); + break; + case 113: + ChipLogProgress(chipTool, + " ***** Test Step 113 : Read attribute nullable_boolean null Value again and compare it to the previously saved " + "value\n"); + err = TestReadAttributeNullableBooleanNullValueAgainAndCompareItToThePreviouslySavedValue_113(); + break; + case 114: + ChipLogProgress(chipTool, " ***** Test Step 114 : Write attribute nullable_boolean Default Value\n"); + err = TestWriteAttributeNullableBooleanDefaultValue_114(); + break; } if (CHIP_NO_ERROR != err) { @@ -139020,6 +139042,21 @@ class TestSaveAs : public TestCommandBridge { case 109: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); break; + case 110: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 111: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 112: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 113: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; + case 114: + VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); + break; } // Go on to the next test. @@ -139033,7 +139070,7 @@ class TestSaveAs : public TestCommandBridge { private: std::atomic_uint16_t mTestIndex; - const uint16_t mTestCount = 110; + const uint16_t mTestCount = 115; chip::Optional mNodeId; chip::Optional mCluster; @@ -141532,6 +141569,131 @@ class TestSaveAs : public TestCommandBridge { return CHIP_NO_ERROR; } + NSNumber * _Nullable readAttributeNullableBooleanDefaultValue; + + CHIP_ERROR TestReadAttributeNullableBooleanDefaultValue_110() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute nullable_boolean Default Value Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNonNull("nullable_boolean", actualValue)); + VerifyOrReturn(CheckValue("nullable_boolean", actualValue, false)); + } + { + readAttributeNullableBooleanDefaultValue = value; + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWriteAttributeNullableBooleanToNull_111() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + id nullableBooleanArgument; + nullableBooleanArgument = nil; + [cluster writeAttributeNullableBooleanWithValue:nullableBooleanArgument + completion:^(NSError * _Nullable err) { + NSLog(@"Write attribute nullable_boolean to null Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + NSNumber * _Nullable readAttributeNullableBooleanNullValue; + + CHIP_ERROR TestReadAttributeNullableBooleanNullValue_112() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute nullable_boolean null Value Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + VerifyOrReturn(CheckValueNull("nullable_boolean", actualValue)); + } + { + readAttributeNullableBooleanNullValue = value; + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestReadAttributeNullableBooleanNullValueAgainAndCompareItToThePreviouslySavedValue_113() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + [cluster readAttributeNullableBooleanWithCompletion:^(NSNumber * _Nullable value, NSError * _Nullable err) { + NSLog(@"Read attribute nullable_boolean null Value again and compare it to the previously saved value Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + { + id actualValue = value; + if (readAttributeNullableBooleanNullValue == nil) { + VerifyOrReturn(CheckValueNull("nullable_boolean", actualValue)); + } else { + VerifyOrReturn(CheckValueNonNull("nullable_boolean", actualValue)); + VerifyOrReturn(CheckValue("nullable_boolean", actualValue, readAttributeNullableBooleanNullValue)); + } + } + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } + + CHIP_ERROR TestWriteAttributeNullableBooleanDefaultValue_114() + { + + MTRBaseDevice * device = GetDevice("alpha"); + __auto_type * cluster = [[MTRBaseClusterUnitTesting alloc] initWithDevice:device endpointID:@(1) queue:mCallbackQueue]; + VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); + + id nullableBooleanArgument; + nullableBooleanArgument = [readAttributeNullableBooleanDefaultValue copy]; + [cluster writeAttributeNullableBooleanWithValue:nullableBooleanArgument + completion:^(NSError * _Nullable err) { + NSLog(@"Write attribute nullable_boolean Default Value Error: %@", err); + + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + + NextTest(); + }]; + + return CHIP_NO_ERROR; + } }; class TestConfigVariables : public TestCommandBridge { @@ -157869,7 +158031,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfTotalUsersSupported; + NSNumber * _Nonnull NumberOfTotalUsersSupportedValue; CHIP_ERROR TestGetNumberOfSupportedUsersAndVerifyDefaultValue_2() { @@ -157888,7 +158050,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U)); } { - NumberOfTotalUsersSupported = value; + NumberOfTotalUsersSupportedValue = value; } NextTest(); @@ -157928,7 +158090,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetUserParams alloc] init]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; [cluster getUserWithParams:params completion:^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) { @@ -159133,7 +159295,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetUserParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.userIndex = [NumberOfTotalUsersSupported copy]; + params.userIndex = [NumberOfTotalUsersSupportedValue copy]; params.userName = @"last_user"; params.userUniqueID = nil; params.userStatus = nil; @@ -159159,7 +159321,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetUserParams alloc] init]; - params.userIndex = [NumberOfTotalUsersSupported copy]; + params.userIndex = [NumberOfTotalUsersSupportedValue copy]; [cluster getUserWithParams:params completion:^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) { NSLog(@"Read the last user back and verify its fields Error: %@", err); @@ -159168,7 +159330,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupported)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupportedValue)); } { @@ -159267,7 +159429,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetUserParams alloc] init]; params.operationType = [NSNumber numberWithUnsignedChar:0U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; params.userName = nil; params.userUniqueID = nil; params.userStatus = nil; @@ -159518,7 +159680,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearUserParams alloc] init]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; [cluster clearUserWithParams:params completion:^(NSError * _Nullable err) { @@ -159634,7 +159796,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetUserParams alloc] init]; - params.userIndex = [NumberOfTotalUsersSupported copy]; + params.userIndex = [NumberOfTotalUsersSupportedValue copy]; [cluster getUserWithParams:params completion:^(MTRDoorLockClusterGetUserResponseParams * _Nullable values, NSError * _Nullable err) { NSLog(@"Read last cleared user and verify it is available Error: %@", err); @@ -159643,7 +159805,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupported)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, NumberOfTotalUsersSupportedValue)); } { @@ -159696,7 +159858,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfPINUsersSupported; + NSNumber * _Nonnull NumberOfPINUsersSupportedValue; CHIP_ERROR TestGetNumberOfSupportedPinCredentialsAndVerifyDefaultValue_41() { @@ -159715,7 +159877,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfPINUsersSupported", actualValue, 10U)); } { - NumberOfPINUsersSupported = value; + NumberOfPINUsersSupportedValue = value; } NextTest(); @@ -159835,7 +159997,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = - [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U]; + [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupportedValue unsignedShortValue] + 1U]; [cluster getCredentialStatusWithParams:params @@ -160208,7 +160370,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = - [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U]; + [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupportedValue unsignedShortValue] + 1U]; params.credentialData = [[NSData alloc] initWithBytes:"123456" length:6]; params.userIndex = nil; @@ -160241,7 +160403,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfRFIDUsersSupported; + NSNumber * _Nonnull NumberOfRFIDUsersSupportedValue; CHIP_ERROR TestGetNumberOfSupportedRfidCredentialsAndVerifyDefaultValue_52() { @@ -160260,7 +160422,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfRFIDUsersSupported", actualValue, 10U)); } { - NumberOfRFIDUsersSupported = value; + NumberOfRFIDUsersSupportedValue = value; } NextTest(); @@ -160330,7 +160492,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = - [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U]; + [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupportedValue unsignedShortValue] + 1U]; [cluster getCredentialStatusWithParams:params @@ -160808,7 +160970,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = - [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U]; + [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupportedValue unsignedShortValue] + 1U]; params.credentialData = [[NSData alloc] initWithBytes:"new_rfid_data_field" length:19]; params.userIndex = nil; @@ -160902,7 +161064,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = [NSNumber numberWithUnsignedShort:2U]; params.credentialData = [[NSData alloc] initWithBytes:"123465" length:6]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; params.userStatus = nil; params.userType = nil; [cluster @@ -163462,7 +163624,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:1U]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = - [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupported unsignedShortValue] + 1U]; + [NSNumber numberWithUnsignedShort:[NumberOfPINUsersSupportedValue unsignedShortValue] + 1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -163517,7 +163679,7 @@ class DL_UsersAndCredentials : public TestCommandBridge { params.credential = [[MTRDoorLockClusterCredentialStruct alloc] init]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialType = [NSNumber numberWithUnsignedChar:2U]; ((MTRDoorLockClusterCredentialStruct *) params.credential).credentialIndex = - [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupported unsignedShortValue] + 1U]; + [NSNumber numberWithUnsignedShort:[NumberOfRFIDUsersSupportedValue unsignedShortValue] + 1U]; [cluster clearCredentialWithParams:params completion:^(NSError * _Nullable err) { @@ -164995,7 +165157,7 @@ class DL_Schedules : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfTotalUsersSupported; + NSNumber * _Nonnull NumberOfTotalUsersSupportedValue; CHIP_ERROR TestGetNumberOfSupportedUsers_2() { @@ -165014,7 +165176,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfTotalUsersSupported", actualValue, 10U)); } { - NumberOfTotalUsersSupported = value; + NumberOfTotalUsersSupportedValue = value; } NextTest(); @@ -165022,7 +165184,7 @@ class DL_Schedules : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUser; + NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUserValue; CHIP_ERROR TestGetMaxNumberOfWeekDaySchedulesForUserAndVerifyDefaultValue_3() { @@ -165042,7 +165204,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfWeekDaySchedulesSupportedPerUser", actualValue, 10U)); } { - NumberOfWeekDaySchedulesSupportedPerUser = value; + NumberOfWeekDaySchedulesSupportedPerUserValue = value; } NextTest(); @@ -165050,7 +165212,7 @@ class DL_Schedules : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUser; + NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUserValue; CHIP_ERROR TestGetMaxNumberOfYearDaySchedulesForUserAndVerifyDefaultValue_4() { @@ -165070,7 +165232,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfYearDaySchedulesSupportedPerUser", actualValue, 10U)); } { - NumberOfYearDaySchedulesSupportedPerUser = value; + NumberOfYearDaySchedulesSupportedPerUserValue = value; } NextTest(); @@ -165078,7 +165240,7 @@ class DL_Schedules : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfHolidaySchedulesSupported; + NSNumber * _Nonnull NumberOfHolidaySchedulesSupportedValue; CHIP_ERROR TestGetMaxNumberOfHolidaySchedulesAndVerifyDefaultValue_5() { @@ -165098,7 +165260,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturn(CheckValue("NumberOfHolidaySchedulesSupported", actualValue, 10U)); } { - NumberOfHolidaySchedulesSupported = value; + NumberOfHolidaySchedulesSupportedValue = value; } NextTest(); @@ -165145,7 +165307,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterSetWeekDayScheduleParams alloc] init]; - params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.weekDayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.daysMask = [NSNumber numberWithUnsignedChar:1U]; params.startHour = [NSNumber numberWithUnsignedChar:15U]; @@ -165206,7 +165369,7 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetWeekDayScheduleParams alloc] init]; params.weekDayIndex = [NSNumber numberWithUnsignedChar:1U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; params.daysMask = [NSNumber numberWithUnsignedChar:1U]; params.startHour = [NSNumber numberWithUnsignedChar:15U]; params.startMinute = [NSNumber numberWithUnsignedChar:16U]; @@ -165613,7 +165776,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetWeekDayScheduleParams alloc] init]; - params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.weekDayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getWeekDayScheduleWithParams:params completion:^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, @@ -165625,7 +165789,7 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.weekDayIndex; VerifyOrReturn(CheckValue("WeekDayIndex", actualValue, - [NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1U)); + [NumberOfWeekDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U)); } { @@ -165691,7 +165855,7 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterGetWeekDayScheduleParams alloc] init]; params.weekDayIndex = [NSNumber numberWithUnsignedChar:1U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; [cluster getWeekDayScheduleWithParams:params completion:^(MTRDoorLockClusterGetWeekDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) { @@ -165706,8 +165870,8 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue( - "UserIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, + [NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U)); } { @@ -165794,7 +165958,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterSetYearDayScheduleParams alloc] init]; - params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.yearDayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL]; params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL]; @@ -165849,7 +166014,7 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterSetYearDayScheduleParams alloc] init]; params.yearDayIndex = [NSNumber numberWithUnsignedChar:1U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL]; params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL]; [cluster setYearDayScheduleWithParams:params @@ -166005,7 +166170,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetYearDayScheduleParams alloc] init]; - params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.yearDayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster getYearDayScheduleWithParams:params completion:^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, @@ -166017,7 +166183,7 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.yearDayIndex; VerifyOrReturn(CheckValue("YearDayIndex", actualValue, - [NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U)); + [NumberOfYearDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U)); } { @@ -166083,7 +166249,7 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterGetYearDayScheduleParams alloc] init]; params.yearDayIndex = [NSNumber numberWithUnsignedChar:1U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; [cluster getYearDayScheduleWithParams:params completion:^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, NSError * _Nullable err) { @@ -166098,8 +166264,8 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.userIndex; - VerifyOrReturn(CheckValue( - "UserIndex", actualValue, [NumberOfTotalUsersSupported unsignedShortValue] + 1U)); + VerifyOrReturn(CheckValue("UserIndex", actualValue, + [NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U)); } { @@ -166186,7 +166352,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterSetHolidayScheduleParams alloc] init]; - params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupported unsignedCharValue] + 1U]; + params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupportedValue unsignedCharValue] + 1U]; params.localStartTime = [NSNumber numberWithUnsignedInt:12345UL]; params.localEndTime = [NSNumber numberWithUnsignedInt:12345689UL]; params.operatingMode = [NSNumber numberWithUnsignedChar:0U]; @@ -166331,7 +166497,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetHolidayScheduleParams alloc] init]; - params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupported unsignedCharValue] + 1U]; + params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfHolidaySchedulesSupportedValue unsignedCharValue] + 1U]; [cluster getHolidayScheduleWithParams:params completion:^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) { @@ -166342,7 +166508,7 @@ class DL_Schedules : public TestCommandBridge { { id actualValue = values.holidayIndex; VerifyOrReturn(CheckValue("HolidayIndex", actualValue, - [NumberOfHolidaySchedulesSupported unsignedCharValue] + 1U)); + [NumberOfHolidaySchedulesSupportedValue unsignedCharValue] + 1U)); } { @@ -166623,7 +166789,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearWeekDayScheduleParams alloc] init]; - params.weekDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.weekDayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfWeekDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearWeekDayScheduleWithParams:params @@ -166676,7 +166843,7 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterClearWeekDayScheduleParams alloc] init]; params.weekDayIndex = [NSNumber numberWithUnsignedChar:1U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; [cluster clearWeekDayScheduleWithParams:params completion:^(NSError * _Nullable err) { @@ -166911,7 +167078,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearYearDayScheduleParams alloc] init]; - params.yearDayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.yearDayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; params.userIndex = [NSNumber numberWithUnsignedShort:1U]; [cluster clearYearDayScheduleWithParams:params @@ -166964,7 +167132,7 @@ class DL_Schedules : public TestCommandBridge { __auto_type * params = [[MTRDoorLockClusterClearYearDayScheduleParams alloc] init]; params.yearDayIndex = [NSNumber numberWithUnsignedChar:1U]; - params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupported unsignedShortValue] + 1U]; + params.userIndex = [NSNumber numberWithUnsignedShort:[NumberOfTotalUsersSupportedValue unsignedShortValue] + 1U]; [cluster clearYearDayScheduleWithParams:params completion:^(NSError * _Nullable err) { @@ -167198,7 +167366,8 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterClearHolidayScheduleParams alloc] init]; - params.holidayIndex = [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUser unsignedCharValue] + 1U]; + params.holidayIndex = + [NSNumber numberWithUnsignedChar:[NumberOfYearDaySchedulesSupportedPerUserValue unsignedCharValue] + 1U]; [cluster clearHolidayScheduleWithParams:params completion:^(NSError * _Nullable err) { @@ -168774,7 +168943,7 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterSetHolidayScheduleParams alloc] init]; - params.holidayIndex = [NumberOfHolidaySchedulesSupported copy]; + params.holidayIndex = [NumberOfHolidaySchedulesSupportedValue copy]; params.localStartTime = [NSNumber numberWithUnsignedInt:1UL]; params.localEndTime = [NSNumber numberWithUnsignedInt:100UL]; params.operatingMode = [NSNumber numberWithUnsignedChar:4U]; @@ -168798,42 +168967,42 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetHolidayScheduleParams alloc] init]; - params.holidayIndex = [NumberOfHolidaySchedulesSupported copy]; - [cluster - getHolidayScheduleWithParams:params - completion:^( - MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) { - NSLog(@"Verify Created Holiday Schedule Error: %@", err); + params.holidayIndex = [NumberOfHolidaySchedulesSupportedValue copy]; + [cluster getHolidayScheduleWithParams:params + completion:^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, + NSError * _Nullable err) { + NSLog(@"Verify Created Holiday Schedule Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); - } + { + id actualValue = values.holidayIndex; + VerifyOrReturn( + CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupportedValue)); + } - { - id actualValue = values.status; - VerifyOrReturn(CheckValue("Status", actualValue, 0U)); - } + { + id actualValue = values.status; + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); + } - { - id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL)); - } + { + id actualValue = values.localStartTime; + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL)); + } - { - id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL)); - } + { + id actualValue = values.localEndTime; + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL)); + } - { - id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U)); - } + { + id actualValue = values.operatingMode; + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U)); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -169044,42 +169213,42 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetHolidayScheduleParams alloc] init]; - params.holidayIndex = [NumberOfHolidaySchedulesSupported copy]; - [cluster - getHolidayScheduleWithParams:params - completion:^( - MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) { - NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err); + params.holidayIndex = [NumberOfHolidaySchedulesSupportedValue copy]; + [cluster getHolidayScheduleWithParams:params + completion:^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, + NSError * _Nullable err) { + NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); - } + { + id actualValue = values.holidayIndex; + VerifyOrReturn( + CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupportedValue)); + } - { - id actualValue = values.status; - VerifyOrReturn(CheckValue("Status", actualValue, 0U)); - } + { + id actualValue = values.status; + VerifyOrReturn(CheckValue("Status", actualValue, 0U)); + } - { - id actualValue = values.localStartTime; - VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL)); - } + { + id actualValue = values.localStartTime; + VerifyOrReturn(CheckValue("LocalStartTime", actualValue, 1UL)); + } - { - id actualValue = values.localEndTime; - VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL)); - } + { + id actualValue = values.localEndTime; + VerifyOrReturn(CheckValue("LocalEndTime", actualValue, 100UL)); + } - { - id actualValue = values.operatingMode; - VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U)); - } + { + id actualValue = values.operatingMode; + VerifyOrReturn(CheckValue("OperatingMode", actualValue, 4U)); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -169288,27 +169457,27 @@ class DL_Schedules : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetHolidayScheduleParams alloc] init]; - params.holidayIndex = [NumberOfHolidaySchedulesSupported copy]; - [cluster - getHolidayScheduleWithParams:params - completion:^( - MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, NSError * _Nullable err) { - NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err); + params.holidayIndex = [NumberOfHolidaySchedulesSupportedValue copy]; + [cluster getHolidayScheduleWithParams:params + completion:^(MTRDoorLockClusterGetHolidayScheduleResponseParams * _Nullable values, + NSError * _Nullable err) { + NSLog(@"Make sure that third holiday schedule was not deleted Error: %@", err); - VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); + VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - { - id actualValue = values.holidayIndex; - VerifyOrReturn(CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupported)); - } + { + id actualValue = values.holidayIndex; + VerifyOrReturn( + CheckValue("HolidayIndex", actualValue, NumberOfHolidaySchedulesSupportedValue)); + } - { - id actualValue = values.status; - VerifyOrReturn(CheckValue("Status", actualValue, 139U)); - } + { + id actualValue = values.status; + VerifyOrReturn(CheckValue("Status", actualValue, 139U)); + } - NextTest(); - }]; + NextTest(); + }]; return CHIP_NO_ERROR; } @@ -172044,7 +172213,7 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUser; + NSNumber * _Nonnull NumberOfWeekDaySchedulesSupportedPerUserValue; CHIP_ERROR TestStep1ThReadsNumberOfWeekDaySchedulesSupportedPerUserAttribute_3() { @@ -172064,7 +172233,7 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { VerifyOrReturn( CheckConstraintMaxValue("numberOfWeekDaySchedulesSupportedPerUser", [value unsignedCharValue], 255U)); { - NumberOfWeekDaySchedulesSupportedPerUser = value; + NumberOfWeekDaySchedulesSupportedPerUserValue = value; } NextTest(); @@ -172072,7 +172241,7 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfTotalUsersSupported; + NSNumber * _Nonnull NumberOfTotalUsersSupportedValue; CHIP_ERROR TestStep2ThReadsNumberOfTotalUsersSupportedAttribute_4() { @@ -172089,7 +172258,7 @@ class Test_TC_DRLK_2_5 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("numberOfTotalUsersSupported", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfTotalUsersSupported", [value unsignedShortValue], 65534U)); { - NumberOfTotalUsersSupported = value; + NumberOfTotalUsersSupportedValue = value; } NextTest(); @@ -172622,7 +172791,7 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { value.nodeId = mNodeId.HasValue() ? mNodeId.Value() : 305414945ULL; return WaitForCommissionee("alpha", value); } - NSNumber * _Nonnull NumberOfHolidaySchedulesSupported; + NSNumber * _Nonnull NumberOfHolidaySchedulesSupportedValue; CHIP_ERROR TestStep1ThReadsNumberOfHolidaySchedulesSupportedAndSavesForFutureUse_1() { @@ -172640,7 +172809,7 @@ class Test_TC_DRLK_2_6 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("numberOfHolidaySchedulesSupported", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfHolidaySchedulesSupported", [value unsignedCharValue], 255U)); { - NumberOfHolidaySchedulesSupported = value; + NumberOfHolidaySchedulesSupportedValue = value; } NextTest(); @@ -173272,7 +173441,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUser; + NSNumber * _Nonnull NumberOfYearDaySchedulesSupportedPerUserValue; CHIP_ERROR TestStep1ThReadsNumberOfYearDaySchedulesSupportedPerUserAttribute_3() { @@ -173292,7 +173461,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { VerifyOrReturn( CheckConstraintMaxValue("numberOfYearDaySchedulesSupportedPerUser", [value unsignedCharValue], 255U)); { - NumberOfYearDaySchedulesSupportedPerUser = value; + NumberOfYearDaySchedulesSupportedPerUserValue = value; } NextTest(); @@ -173300,7 +173469,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { return CHIP_NO_ERROR; } - NSNumber * _Nonnull NumberOfTotalUsersSupported; + NSNumber * _Nonnull NumberOfTotalUsersSupportedValue; CHIP_ERROR TestStep2ThReadsNumberOfTotalUsersSupportedAttribute_4() { @@ -173317,7 +173486,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { VerifyOrReturn(CheckConstraintMinValue("numberOfTotalUsersSupported", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfTotalUsersSupported", [value unsignedShortValue], 65534U)); { - NumberOfTotalUsersSupported = value; + NumberOfTotalUsersSupportedValue = value; } NextTest(); @@ -173512,7 +173681,7 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { VerifyOrReturnError(cluster != nil, CHIP_ERROR_INCORRECT_STATE); __auto_type * params = [[MTRDoorLockClusterGetYearDayScheduleParams alloc] init]; - params.yearDayIndex = [NumberOfYearDaySchedulesSupportedPerUser copy]; + params.yearDayIndex = [NumberOfYearDaySchedulesSupportedPerUserValue copy]; params.userIndex = [NSNumber numberWithUnsignedShort:5U]; [cluster getYearDayScheduleWithParams:params completion:^(MTRDoorLockClusterGetYearDayScheduleResponseParams * _Nullable values, @@ -173523,8 +173692,8 @@ class Test_TC_DRLK_2_7 : public TestCommandBridge { { id actualValue = values.yearDayIndex; - VerifyOrReturn( - CheckValue("YearDayIndex", actualValue, NumberOfYearDaySchedulesSupportedPerUser)); + VerifyOrReturn(CheckValue( + "YearDayIndex", actualValue, NumberOfYearDaySchedulesSupportedPerUserValue)); } {