diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter index 3a0bc89a7e6847..e1d48f4f655e42 100644 --- a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter +++ b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter @@ -1577,7 +1577,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -3477,7 +3477,7 @@ server cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationStatusEnum status = 5; diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter index e2ad0498e02061..dac16c909b027a 100644 --- a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter +++ b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter @@ -1422,7 +1422,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/bridge-app/bridge-common/bridge-app.matter b/examples/bridge-app/bridge-common/bridge-app.matter index 8cd5035de3dd30..b47457480c4a44 100644 --- a/examples/bridge-app/bridge-common/bridge-app.matter +++ b/examples/bridge-app/bridge-common/bridge-app.matter @@ -1267,7 +1267,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter index f1d12e8a612b0b..cadd67a1fd1247 100644 --- a/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/noip_rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1235,7 +1235,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter index 208861c334f308..6bf99cf5abb818 100644 --- a/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter +++ b/examples/chef/devices/rootnode_contactsensor_lFAGG1bfRO.matter @@ -1114,7 +1114,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter index 70ca6ec6347735..d50c2189e0c6dd 100644 --- a/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter +++ b/examples/chef/devices/rootnode_dimmablelight_bCwGYSDpoe.matter @@ -1369,7 +1369,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter index 74cfedb2c235f1..289a20f8500804 100644 --- a/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter +++ b/examples/chef/devices/rootnode_flowsensor_1zVxHedlaV.matter @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter index a55b3e4bd2daee..1a4a99c3aa7c54 100644 --- a/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter +++ b/examples/chef/devices/rootnode_heatingcoolingunit_ncdGai1E5a.matter @@ -1362,7 +1362,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter index 4fa09e3ae8a1f1..e9ac1fb1890303 100644 --- a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter +++ b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.matter @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter index 05810a920c2375..7943d5d9ee76c9 100644 --- a/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter +++ b/examples/chef/devices/rootnode_lightsensor_lZQycTFcJK.matter @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter index 70a2a926513a52..08f36aa6cf63fc 100644 --- a/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter +++ b/examples/chef/devices/rootnode_occupancysensor_iHyVgifZuo.matter @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter index 5fdd540c0a2e77..0b364eeaa0d0f5 100644 --- a/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter +++ b/examples/chef/devices/rootnode_onofflight_bbs1b7IaOV.matter @@ -1369,7 +1369,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter index d77ed04f6716b1..c6c4ac7930da4e 100644 --- a/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter +++ b/examples/chef/devices/rootnode_onofflightswitch_FsPlMr090Q.matter @@ -1428,7 +1428,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter index 0c4e0bd5a9e870..6654270b576023 100644 --- a/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter +++ b/examples/chef/devices/rootnode_onoffpluginunit_Wtf8ss5EBY.matter @@ -1275,7 +1275,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter index c1085b8fcd4534..5ea7e699ff4785 100644 --- a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter +++ b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter index 131573cd34d01e..7e7274afe8d39d 100644 --- a/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter +++ b/examples/chef/devices/rootnode_speaker_RpzeXdimqA.matter @@ -1249,7 +1249,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter index 493113d5f38102..62ca53940e28d1 100644 --- a/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter +++ b/examples/chef/devices/rootnode_temperaturesensor_Qy1zkNW7c3.matter @@ -1127,7 +1127,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter index 49f626f23559bc..15abcd5da025e8 100644 --- a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter +++ b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.matter @@ -1225,7 +1225,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter index 33fc686acfd41a..960e33569fac7c 100644 --- a/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter +++ b/examples/chef/devices/rootnode_windowcovering_RLCxaGi9Yx.matter @@ -1225,7 +1225,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/chip-tool/templates/helper.js b/examples/chip-tool/templates/helper.js index 742cbf703ed8b2..6fdc65cc32090d 100644 --- a/examples/chip-tool/templates/helper.js +++ b/examples/chip-tool/templates/helper.js @@ -130,6 +130,19 @@ async function structs_with_cluster_name(options) return templateUtil.collectBlocks(blocks, options, this); } +async function assertSameTestType(current, expected) +{ + if (current == expected) { + return ''; + } + + const filename = this.parent.parent.parent.filename; + const testName = this.parent.parent.parent.testName; + const error = `\nFile: ${filename}\nTest: ${testName}\nCluster ${this.parent.cluster} Attribute: ${this.name}: Constraint type "${ + expected}" does not match the current type "${current}".`; + throw error; +} + // // Module exports // @@ -137,3 +150,4 @@ exports.asDelimitedCommand = asDelimitedCommand; exports.asTypeMinValue = asTypeMinValue; exports.asTypeMaxValue = asTypeMaxValue; exports.structs_with_cluster_name = structs_with_cluster_name; +exports.assertSameTestType = assertSameTestType; diff --git a/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt b/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt index da6a6b6a230b14..95c52a5b934c46 100644 --- a/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt +++ b/examples/chip-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt @@ -9,8 +9,9 @@ {{~#chip_tests_iterate_constraints expectedConstraints}} {{~#if (isStrEqual constraint "hasValue")}} {{~! Already handled above~}} - {{~else if (isStrEqual constraint "type")}}VerifyOrReturn(CheckConstraintType("{{asPropertyValue context=..}}", "", "{{value}}")); - + {{~else if (isStrEqual constraint "type")}} + {{~assertSameTestType (asTestType ../type ../isArray) value~}} + VerifyOrReturn(CheckConstraintType("{{asPropertyValue context=..}}", "{{asTestType ../type ../isArray}}", "{{value}}")); {{~else if (isStrEqual constraint "format")}}VerifyOrReturn(CheckConstraintFormat("{{asPropertyValue context=..}}", "", "{{value}}")); {{~else if (isStrEqual constraint "startsWith")}}VerifyOrReturn(CheckConstraintStartsWith("{{asPropertyValue context=..}}", {{asPropertyValue context=..}}, "{{value}}")); diff --git a/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt b/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt index 073efc9cab618e..26293b6314d470 100644 --- a/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt +++ b/examples/darwin-framework-tool/templates/tests/partials/checks/maybeCheckExpectedConstraints.zapt @@ -8,7 +8,7 @@ if ({{>actualValue}} != nil) { {{/if}} - {{#if (hasProperty expectedConstraints "type")}}VerifyOrReturn(CheckConstraintType("{{>item}}", "", "{{expectedConstraints.type}}"));{{/if}} + {{#if (hasProperty expectedConstraints "type")}}VerifyOrReturn(CheckConstraintType("{{>item}}", "{{asTestType type isArray}}", "{{expectedConstraints.type}}"));{{/if}} {{~#if (hasProperty expectedConstraints "format")}}VerifyOrReturn(CheckConstraintFormat("{{>item}}", "", "{{expectedConstraints.format}}"));{{/if}} diff --git a/examples/light-switch-app/light-switch-common/light-switch-app.matter b/examples/light-switch-app/light-switch-common/light-switch-app.matter index 9aaa6b1275064c..1229fc2c1fce3e 100644 --- a/examples/light-switch-app/light-switch-common/light-switch-app.matter +++ b/examples/light-switch-app/light-switch-common/light-switch-app.matter @@ -1319,7 +1319,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lighting-app/lighting-common/lighting-app.matter b/examples/lighting-app/lighting-common/lighting-app.matter index 92f113bfc67417..5478b00116e3d5 100644 --- a/examples/lighting-app/lighting-common/lighting-app.matter +++ b/examples/lighting-app/lighting-common/lighting-app.matter @@ -1265,7 +1265,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/lock-app/lock-common/lock-app.matter b/examples/lock-app/lock-common/lock-app.matter index e83a47caf80c3e..1b71ec1e293514 100644 --- a/examples/lock-app/lock-common/lock-app.matter +++ b/examples/lock-app/lock-common/lock-app.matter @@ -1196,7 +1196,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter index 7356fef2cc2b99..23aeb22bb00d91 100644 --- a/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter +++ b/examples/ota-provider-app/ota-provider-common/ota-provider-app.matter @@ -647,7 +647,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter index 0f1ff08464f01c..b5258a7d8f5dfb 100644 --- a/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter +++ b/examples/ota-requestor-app/ota-requestor-common/ota-requestor-app.matter @@ -664,7 +664,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/placeholder/linux/apps/app1/config.matter b/examples/placeholder/linux/apps/app1/config.matter index 3dd237d26dd2e7..ca1a1ec46e847d 100644 --- a/examples/placeholder/linux/apps/app1/config.matter +++ b/examples/placeholder/linux/apps/app1/config.matter @@ -1266,7 +1266,7 @@ client cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1345,7 +1345,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2554,7 +2554,7 @@ client cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationBasicApplication application = 4; @@ -2582,7 +2582,7 @@ server cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationBasicApplication application = 4; diff --git a/examples/placeholder/linux/apps/app2/config.matter b/examples/placeholder/linux/apps/app2/config.matter index 3dd237d26dd2e7..ca1a1ec46e847d 100644 --- a/examples/placeholder/linux/apps/app2/config.matter +++ b/examples/placeholder/linux/apps/app2/config.matter @@ -1266,7 +1266,7 @@ client cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1345,7 +1345,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2554,7 +2554,7 @@ client cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationBasicApplication application = 4; @@ -2582,7 +2582,7 @@ server cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationBasicApplication application = 4; diff --git a/examples/pump-app/pump-common/pump-app.matter b/examples/pump-app/pump-common/pump-app.matter index b70aea23e271b8..0ee873ccb5a72c 100644 --- a/examples/pump-app/pump-common/pump-app.matter +++ b/examples/pump-app/pump-common/pump-app.matter @@ -933,7 +933,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter index 52e33b8bb0a09e..7ea1db01b01dd7 100644 --- a/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter +++ b/examples/pump-controller-app/pump-controller-common/pump-controller-app.matter @@ -837,7 +837,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter index 4b995dd8f784f4..1dd938ce8febaa 100644 --- a/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter +++ b/examples/temperature-measurement-app/esp32/main/temperature-measurement.matter @@ -677,7 +677,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/thermostat/thermostat-common/thermostat.matter b/examples/thermostat/thermostat-common/thermostat.matter index ad185bfb472d5f..c672a742dfdd51 100644 --- a/examples/thermostat/thermostat-common/thermostat.matter +++ b/examples/thermostat/thermostat-common/thermostat.matter @@ -1231,7 +1231,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; diff --git a/examples/tv-app/tv-common/tv-app.matter b/examples/tv-app/tv-common/tv-app.matter index f608722f57202c..a509109ec75045 100644 --- a/examples/tv-app/tv-common/tv-app.matter +++ b/examples/tv-app/tv-common/tv-app.matter @@ -1273,7 +1273,7 @@ client cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -1373,7 +1373,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2079,7 +2079,7 @@ server cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationBasicApplication application = 4; diff --git a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter index ee30eb74dae50e..24841d02cad66a 100644 --- a/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter +++ b/examples/tv-casting-app/tv-casting-common/tv-casting-app.matter @@ -1477,7 +1477,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute bitmap32 featureMap = 65532; readonly attribute int16u clusterRevision = 65533; @@ -2095,7 +2095,7 @@ client cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationStatusEnum status = 5; diff --git a/examples/window-app/common/window-app.matter b/examples/window-app/common/window-app.matter index 8c36f1069f3fec..23d2eb55874595 100644 --- a/examples/window-app/common/window-app.matter +++ b/examples/window-app/common/window-app.matter @@ -1275,7 +1275,7 @@ server cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; diff --git a/src/app/tests/suites/OTA_SuccessfulTransfer.yaml b/src/app/tests/suites/OTA_SuccessfulTransfer.yaml index f15d5ded5013f4..4e186d4fd5b815 100644 --- a/src/app/tests/suites/OTA_SuccessfulTransfer.yaml +++ b/src/app/tests/suites/OTA_SuccessfulTransfer.yaml @@ -17,34 +17,34 @@ name: Test OTA Software Update Successful Transfer config: endpoint: 0 requestorNodeId: - type: NODE_ID + type: node_id defaultValue: 0x12344321 providerNodeId: - type: NODE_ID + type: node_id defaultValue: 0xC0FFEE providerPayload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0IX4122-.548G00" # This value needs to be generated providerDiscriminator: - type: INT16U + type: int16u defaultValue: 50 providerPort: - type: INT16U + type: int16u defaultValue: 5560 providerKvs: - type: CHAR_STRING + type: char_string defaultValue: "/tmp/chip_kvs_provider" otaImageFilePath: - type: CHAR_STRING + type: char_string defaultValue: "/tmp/otaImage" rawImageFilePath: - type: CHAR_STRING + type: char_string defaultValue: "/tmp/rawImage" rawImageContent: - type: CHAR_STRING + type: char_string defaultValue: "Have a hootenanny!" downloadImageFilePath: - type: CHAR_STRING + type: char_string defaultValue: "/tmp/downloadedImage" tests: diff --git a/src/app/tests/suites/TestClusterMultiFabric.yaml b/src/app/tests/suites/TestClusterMultiFabric.yaml index 6c934778872783..6a1bef07b816b1 100644 --- a/src/app/tests/suites/TestClusterMultiFabric.yaml +++ b/src/app/tests/suites/TestClusterMultiFabric.yaml @@ -18,10 +18,10 @@ config: nodeId: 0x12344321 endpoint: 1 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: diff --git a/src/app/tests/suites/TestConfigVariables.yaml b/src/app/tests/suites/TestConfigVariables.yaml index 5889887896fd69..eff8a39aaa106c 100644 --- a/src/app/tests/suites/TestConfigVariables.yaml +++ b/src/app/tests/suites/TestConfigVariables.yaml @@ -19,10 +19,10 @@ config: cluster: "Test Cluster" endpoint: 1 arg1: - type: INT8U + type: int8u defaultValue: 5 returnValueWithArg1: - type: INT8U + type: int8u defaultValue: 25 tests: diff --git a/src/app/tests/suites/TestDiscovery.yaml b/src/app/tests/suites/TestDiscovery.yaml index b1d889d9406eff..febff676e13b64 100644 --- a/src/app/tests/suites/TestDiscovery.yaml +++ b/src/app/tests/suites/TestDiscovery.yaml @@ -18,16 +18,16 @@ config: nodeId: 0x12344321 endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 vendorId: - type: INT16U + type: int16u defaultValue: 65521 productId: - type: INT16U + type: int16u defaultValue: 32769 deviceType: - type: INT16U + type: int16u defaultValue: 5 tests: diff --git a/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml b/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml index 5271f380749cf1..cdd8fded717805 100644 --- a/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml +++ b/src/app/tests/suites/TestFabricRemovalWhileSubscribed.yaml @@ -21,10 +21,10 @@ config: cluster: "Operational Credentials" endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: @@ -42,7 +42,7 @@ tests: response: value: 1 constraints: - type: uint8 + type: int8u - label: "Read current fabric index" command: "readAttribute" @@ -50,7 +50,7 @@ tests: response: saveAs: ourFabricIndex constraints: - type: uint8 + type: int8u # 0 is not a valid value, but past that we have no idea what the # other side will claim here. minValue: 1 diff --git a/src/app/tests/suites/TestGeneralCommissioning.yaml b/src/app/tests/suites/TestGeneralCommissioning.yaml index 42c24b93b79ac8..dbd7072d3e8b39 100644 --- a/src/app/tests/suites/TestGeneralCommissioning.yaml +++ b/src/app/tests/suites/TestGeneralCommissioning.yaml @@ -19,10 +19,10 @@ config: cluster: "General Commissioning" endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: @@ -271,4 +271,4 @@ tests: attribute: "SupportsConcurrentConnection" response: constraints: - type: bool + type: boolean diff --git a/src/app/tests/suites/TestGroupMessaging.yaml b/src/app/tests/suites/TestGroupMessaging.yaml index 36ce37b69596ea..df7355429e8dba 100644 --- a/src/app/tests/suites/TestGroupMessaging.yaml +++ b/src/app/tests/suites/TestGroupMessaging.yaml @@ -23,13 +23,13 @@ config: cluster: "Basic" endpoint: 0 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0x43211234 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: diff --git a/src/app/tests/suites/TestMultiAdmin.yaml b/src/app/tests/suites/TestMultiAdmin.yaml index 9ae6519ffcab7b..ff45d1bbe1d985 100644 --- a/src/app/tests/suites/TestMultiAdmin.yaml +++ b/src/app/tests/suites/TestMultiAdmin.yaml @@ -17,20 +17,20 @@ name: Test Multi Admin config: nodeId: 0x12344321 nodeIdForDuplicateCommissioning: - type: NODE_ID + type: node_id defaultValue: 0x11 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE nodeId3: - type: NODE_ID + type: node_id defaultValue: 0xC00FEE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: diff --git a/src/app/tests/suites/TestOperationalCredentialsCluster.yaml b/src/app/tests/suites/TestOperationalCredentialsCluster.yaml index 12a0ee83a486b2..7bc03fb52a9b18 100644 --- a/src/app/tests/suites/TestOperationalCredentialsCluster.yaml +++ b/src/app/tests/suites/TestOperationalCredentialsCluster.yaml @@ -33,7 +33,7 @@ tests: attribute: "SupportedFabrics" response: constraints: - type: uint8 + type: int8u minValue: 4 - label: "Read number of commissioned fabrics" @@ -41,7 +41,7 @@ tests: attribute: "CommissionedFabrics" response: constraints: - type: uint8 + type: int8u minValue: 1 - label: "Read current fabric index" @@ -50,7 +50,7 @@ tests: response: saveAs: ourFabricIndex constraints: - type: uint8 + type: int8u # 0 is not a valid value, but past that we have no idea what the # other side will claim here. minValue: 1 diff --git a/src/app/tests/suites/TestSelfFabricRemoval.yaml b/src/app/tests/suites/TestSelfFabricRemoval.yaml index 4c7dfcf8ff22ab..9e2295fe09099f 100644 --- a/src/app/tests/suites/TestSelfFabricRemoval.yaml +++ b/src/app/tests/suites/TestSelfFabricRemoval.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint8 + type: int8u - label: "Read current fabric index" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: saveAs: ourFabricIndex constraints: - type: uint8 + type: int8u # 0 is not a valid value, but past that we have no idea what the # other side will claim here. minValue: 1 diff --git a/src/app/tests/suites/TestSystemCommands.yaml b/src/app/tests/suites/TestSystemCommands.yaml index d9df986451d7cc..f4ad90f14e42ac 100644 --- a/src/app/tests/suites/TestSystemCommands.yaml +++ b/src/app/tests/suites/TestSystemCommands.yaml @@ -19,7 +19,7 @@ config: cluster: "SystemCommands" endpoint: 0 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0IX4122-.548G00" # This value needs to be generated tests: diff --git a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml index b634523a3d2301..29d85932b5e9ce 100644 --- a/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ACT_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml index 14fc3be363f2a6..a5ab639f85d669 100644 --- a/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml +++ b/src/app/tests/suites/certification/Test_TC_ALOGIN_1_12.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -44,7 +44,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml index df987420e2e045..e6b473d7bfe496 100644 --- a/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_APBSC_1_10.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read FeatureMap attribute from the DUT" command: "readAttribute" @@ -44,7 +44,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml index 41fe02b98672e5..73ac569a6c095a 100644 --- a/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_APBSC_9_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "VendorName" response: constraints: - type: string + type: char_string maxLength: 32 - label: "Reads the VendorID attribute" @@ -43,7 +43,7 @@ tests: attribute: "VendorID" response: constraints: - type: vendor-id + type: vendor_id saveAs: vendorID - label: "Reads the ApplicationName attribute" @@ -52,7 +52,7 @@ tests: attribute: "ApplicationName" response: constraints: - type: string + type: char_string maxLength: 256 - label: "Reads the ProductID attribute" @@ -61,7 +61,7 @@ tests: attribute: "ProductID" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -71,7 +71,7 @@ tests: attribute: "Application" response: constraints: - type: struct + type: ApplicationBasicApplication - label: "Reads the Status attribute" PICS: APBSC.S.A0005 @@ -88,7 +88,7 @@ tests: attribute: "ApplicationVersion" response: constraints: - type: string + type: char_string maxLength: 32 - label: "Reads the AllowedVendorList attribute" diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml index 6e6fd9324c13ac..7b9eecd1ced204 100644 --- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_1_3.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: APPLAUNCHER.S.AP @@ -45,7 +45,7 @@ tests: response: value: 1 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: FeatureMap" PICS: " !APPLAUNCHER.S.AP " @@ -54,7 +54,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml index fd6c9337b31c20..88ebf1183b5d55 100644 --- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_7.yaml @@ -19,10 +19,10 @@ config: cluster: "Application Launcher" endpoint: 1 catalogVendorId: - type: INT16U + type: int16u defaultValue: 123 applicationId: - type: CHAR_STRING + type: char_string defaultValue: "exampleid" tests: diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8.yaml index caa412e0171b04..cff97c0e92b2b3 100644 --- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_8.yaml @@ -19,10 +19,10 @@ config: cluster: "Application Launcher" endpoint: 1 catalogVendorId: - type: INT16U + type: int16u defaultValue: 123 applicationId: - type: CHAR_STRING + type: char_string defaultValue: "exampleid" tests: diff --git a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9.yaml b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9.yaml index 08b966f0e45e31..c233063ad86216 100644 --- a/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_APPLAUNCHER_3_9.yaml @@ -19,10 +19,10 @@ config: cluster: "Application Launcher" endpoint: 1 catalogVendorId: - type: INT16U + type: int16u defaultValue: 123 applicationId: - type: CHAR_STRING + type: char_string defaultValue: "exampleid" tests: diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml index f59c26a9caff9c..d3fef20d04f878 100644 --- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml +++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_1_8.yaml @@ -36,14 +36,14 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 3 diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml index ebc17cc9dbc7f2..f43a7c27fb1103 100644 --- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "OutputList" response: constraints: - type: OutPutInfo + type: list - label: "Sends a SelectAudioOutput command" PICS: AUDIOOUTPUT.S.C0000 diff --git a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml index 43acc9f3ce66a9..258970c1ad8d50 100644 --- a/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_AUDIOOUTPUT_7_2.yaml @@ -35,7 +35,7 @@ tests: response: saveAs: audioOutputListValues constraints: - type: OutPutInfo + type: list - label: "Sends a RenameOutput command" PICS: AUDIOOUTPUT.S.C0001 diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml index d3f5a9ed0cc5fb..2756ffad7d6405 100644 --- a/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BINFO_2_1.yaml @@ -62,7 +62,7 @@ tests: response: saveAs: DataModelRevisionValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65534 @@ -89,7 +89,7 @@ tests: response: saveAs: VendorNameValue constraints: - type: string + type: char_string maxLength: 32 - label: "TH writes VendorName from the DUT." @@ -115,7 +115,7 @@ tests: response: saveAs: VendorIDValue constraints: - type: uint16 + type: vendor_id minValue: 1 maxValue: 65521 @@ -142,7 +142,7 @@ tests: response: saveAs: ProductNameValue constraints: - type: string + type: char_string maxLength: 32 - label: "TH writes ProductName from the DUT." @@ -168,7 +168,7 @@ tests: response: saveAs: ProductIDValue constraints: - type: uint16 + type: int16u minValue: 1 maxValue: 65534 @@ -195,7 +195,7 @@ tests: response: saveAs: NodeLabelValue constraints: - type: string + type: char_string maxLength: 32 - label: "TH writes NodeLabel from the DUT." @@ -218,7 +218,7 @@ tests: attribute: "Location" response: constraints: - type: string + type: char_string maxLength: 16 - label: @@ -263,7 +263,7 @@ tests: response: saveAs: HardwareVersionValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65534 @@ -290,7 +290,7 @@ tests: response: saveAs: HardwareVersionStringValue constraints: - type: string + type: char_string minLength: 1 maxLength: 64 @@ -382,7 +382,7 @@ tests: response: saveAs: ManufacturingDateValue constraints: - type: string + type: char_string minLength: 8 maxLength: 16 @@ -422,7 +422,7 @@ tests: response: saveAs: PartNumberValue constraints: - type: string + type: char_string maxLength: 32 - label: "TH writes PartNumber from the DUT." @@ -448,7 +448,7 @@ tests: response: saveAs: ProductURLValue constraints: - type: string + type: long_char_string maxLength: 256 - label: @@ -487,7 +487,7 @@ tests: response: saveAs: ProductLabelValue constraints: - type: string + type: char_string maxLength: 64 - label: @@ -526,7 +526,7 @@ tests: response: saveAs: SerialNumberValue constraints: - type: string + type: char_string maxLength: 32 - label: "TH writes SerialNumber from the DUT." @@ -595,7 +595,7 @@ tests: response: saveAs: UniqueIDValue constraints: - type: string + type: char_string maxLength: 32 - label: "TH writes UniqueID from the DUT." diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml index b01bea003704f0..cb8965e96d17c1 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml index 1d715f98b29ea2..79dac0d1a3e49e 100644 --- a/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_BOOL_2_1.yaml @@ -34,4 +34,4 @@ tests: attribute: "StateValue" response: constraints: - type: bool + type: boolean diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml index 6edc60eb000278..e0f14bd09c0120 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_10.yaml @@ -20,23 +20,23 @@ config: nodeId: 0x12344321 timeout: 700 nodeIdForDuplicateCommissioning: - type: NODE_ID + type: node_id defaultValue: 0x11 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE nodeId3: - type: NODE_ID + type: node_id defaultValue: 0xC00FEE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:0000000000I31506010" payload2: - type: CHAR_STRING + type: char_string defaultValue: "MT:0000000000I.0648G00" tests: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml index c35bda367e1263..3607b092a20cc8 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml @@ -21,20 +21,20 @@ config: nodeId: 0x12344321 timeout: 500 nodeIdForDuplicateCommissioning: - type: NODE_ID + type: node_id defaultValue: 0x11 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE nodeId3: - type: NODE_ID + type: node_id defaultValue: 0xC00FEE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" tests: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml index ded3a609fba3c4..0bb6f302830de6 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_3.yaml @@ -18,14 +18,14 @@ config: nodeId: 0x12344321 timeout: 300 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:0000000000I31506010" # This value needs to be generated automatically tests: @@ -76,7 +76,7 @@ tests: response: value: "chiptest" constraints: - type: string + type: char_string maxLength: 32 - label: "TH_CR2 starts a commissioning process with DUT_CE" @@ -143,7 +143,7 @@ tests: response: value: "chiptest1" constraints: - type: string + type: char_string maxLength: 32 - label: @@ -168,7 +168,7 @@ tests: response: value: "chiptest2" constraints: - type: string + type: char_string maxLength: 32 - label: "TH_CR2 opens a commissioning window on DUT_CE using ECM" diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml index 9b1183a5825568..196fa479025ee9 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_4.yaml @@ -18,14 +18,14 @@ config: nodeId: 0x12344321 timeout: 300 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" tests: @@ -69,7 +69,7 @@ tests: PICS: BINFO.S.A0005 response: constraints: - type: string + type: char_string maxLength: 32 - label: "TH_CR2 starts a commissioning process with DUT_CE" @@ -135,7 +135,7 @@ tests: response: value: "chiptest" constraints: - type: string + type: char_string maxLength: 32 - label: @@ -160,7 +160,7 @@ tests: response: value: "chiptest" constraints: - type: string + type: char_string maxLength: 32 - label: "TH_CR2 opens a commissioning window on DUT_CE using BCM" diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml index c7306e025f2268..ab1d4b0d236ed4 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_5.yaml @@ -20,20 +20,20 @@ config: nodeId: 0x12344321 timeout: 300 nodeIdForDuplicateCommissioning: - type: NODE_ID + type: node_id defaultValue: 0x11 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE nodeId3: - type: NODE_ID + type: node_id defaultValue: 0xC00FEE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml index 78a7488f54dc62..867f4df1a9deee 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_6.yaml @@ -20,20 +20,20 @@ config: nodeId: 0x12344321 timeout: 300 nodeIdForDuplicateCommissioning: - type: NODE_ID + type: node_id defaultValue: 0x11 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE nodeId3: - type: NODE_ID + type: node_id defaultValue: 0xC00FEE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" # This value needs to be generated automatically tests: diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml index ed094eb77d4399..5e0a0578b4d98b 100644 --- a/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_CADMIN_1_9.yaml @@ -20,23 +20,23 @@ config: nodeId: 0x12344321 timeout: 700 nodeIdForDuplicateCommissioning: - type: NODE_ID + type: node_id defaultValue: 0x11 nodeId2: - type: NODE_ID + type: node_id defaultValue: 0xCAFE nodeId3: - type: NODE_ID + type: node_id defaultValue: 0xC00FEE endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 payload: - type: CHAR_STRING + type: char_string defaultValue: "MT:-24J0AFN00KA0648G00" payload2: - type: CHAR_STRING + type: char_string defaultValue: "MT:0000000000I.0648G00" tests: diff --git a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml index 9385a746cd65ce..e62e11283bfd57 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 5 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: (CC.S.F00 || CC.S.F01 || CC.S.F02 || CC.S.F03) @@ -42,7 +42,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 31 diff --git a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml index 8f5debd61f9b73..8dae8c05ea5ef5 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -44,7 +44,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -54,7 +54,7 @@ tests: attribute: "RemainingTime" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -64,7 +64,7 @@ tests: attribute: "CurrentX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -74,7 +74,7 @@ tests: attribute: "CurrentY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -94,7 +94,7 @@ tests: attribute: "CompensationText" response: constraints: - type: string + type: char_string maxLength: 254 - label: "TH reads ColorTemperatureMireds attribute from DUT" @@ -103,7 +103,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -133,7 +133,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -153,7 +153,7 @@ tests: attribute: "ColorLoopActive" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -163,7 +163,7 @@ tests: attribute: "ColorLoopDirection" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -173,7 +173,7 @@ tests: attribute: "ColorLoopTime" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -183,7 +183,7 @@ tests: attribute: "ColorLoopStartEnhancedHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -193,7 +193,7 @@ tests: attribute: "ColorLoopStoredEnhancedHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -210,7 +210,7 @@ tests: response: value: FeatureMapValue constraints: - type: map16 + type: bitmap16 minValue: 0 maxValue: 31 @@ -220,7 +220,7 @@ tests: attribute: "ColorTempPhysicalMinMireds" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -230,7 +230,7 @@ tests: attribute: "ColorTempPhysicalMaxMireds" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -240,7 +240,7 @@ tests: attribute: "CoupleColorTempToLevelMinMireds" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -250,7 +250,7 @@ tests: attribute: "StartUpColorTemperatureMireds" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -261,7 +261,7 @@ tests: attribute: "NumberOfPrimaries" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 6 @@ -645,7 +645,7 @@ tests: attribute: "WhitePointX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -655,7 +655,7 @@ tests: attribute: "WhitePointY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -665,7 +665,7 @@ tests: attribute: "ColorPointRX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -675,7 +675,7 @@ tests: attribute: "ColorPointRY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -685,7 +685,7 @@ tests: attribute: "ColorPointRIntensity" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -695,7 +695,7 @@ tests: attribute: "ColorPointGX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -705,7 +705,7 @@ tests: attribute: "ColorPointGY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -715,7 +715,7 @@ tests: attribute: "ColorPointGIntensity" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -725,7 +725,7 @@ tests: attribute: "ColorPointBX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -735,7 +735,7 @@ tests: attribute: "ColorPointBY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -745,6 +745,6 @@ tests: attribute: "ColorPointBIntensity" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml index 43fffa68aa63ab..fefa5d3edce2c6 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_1.yaml @@ -20,16 +20,16 @@ config: endpoint: 1 timeout: 150 hueShortestDistance: - type: INT8U + type: int8u defaultValue: 150 hueLongestDistance: - type: INT8U + type: int8u defaultValue: 200 hueDirectionUp: - type: INT8U + type: int8u defaultValue: 250 hueDirectionDown: - type: INT8U + type: int8u defaultValue: 170 tests: @@ -65,7 +65,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -101,7 +101,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -119,7 +119,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -170,7 +170,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -188,7 +188,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -239,7 +239,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -257,7 +257,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -308,7 +308,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -326,7 +326,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml index 75f8db02ce10e0..9295e1d7282cab 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_2.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 RateConfigValue: - type: ENUM8 + type: enum8 defaultValue: 50 tests: @@ -55,7 +55,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -87,7 +87,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -105,7 +105,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -123,7 +123,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -156,7 +156,7 @@ tests: response: saveAs: CurrentHueValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -203,7 +203,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -221,7 +221,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -239,7 +239,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -272,7 +272,7 @@ tests: response: saveAs: CurrentHueValueAfterStopmode constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml index f4fd0c58e073f9..0dbfc5efd24bf4 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_3_3.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 StepSizeConfigValue: - type: INT8U + type: int8u defaultValue: 5 tests: @@ -55,7 +55,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -90,7 +90,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 5 maxValue: 254 @@ -124,7 +124,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 249 diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml index 8867ae02d7f323..fdbcdb8420c353 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_1.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 SaturationConfigValue: - type: INT8U + type: int8u defaultValue: 90 tests: @@ -55,7 +55,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -89,7 +89,7 @@ tests: response: value: SaturationConfigValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml index 25480f037c2808..bfca64ef26b3e1 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_2.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 RateConfigValue: - type: INT8U + type: int8u defaultValue: 50 tests: @@ -55,7 +55,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -87,7 +87,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -105,7 +105,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -123,7 +123,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -155,7 +155,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -173,7 +173,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -191,7 +191,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -225,7 +225,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -260,7 +260,7 @@ tests: response: saveAs: CurrentSaturationStep4d constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -310,7 +310,7 @@ tests: response: saveAs: CurrentSaturationStep5b constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -328,7 +328,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: CurrentSaturationStep5b @@ -363,7 +363,7 @@ tests: response: saveAs: CurrentSaturationStep5d constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml index 6b9e9e0a8dbffd..c7243596ba8be1 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_3.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 StepSizeConfigValue: - type: INT8U + type: int8u defaultValue: 15 tests: @@ -55,7 +55,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -90,7 +90,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -124,7 +124,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml index 7562d93b6c38bb..30b6bc80f66f58 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_4_4.yaml @@ -20,10 +20,10 @@ config: cluster: "Color Control" endpoint: 1 hueConfigValue: - type: INT8U + type: int8u defaultValue: 40 SaturationConfigValue: - type: INT8U + type: int8u defaultValue: 160 tests: @@ -59,7 +59,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -69,7 +69,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -104,7 +104,7 @@ tests: response: value: hueConfigValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -116,7 +116,7 @@ tests: response: value: SaturationConfigValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml index e03a667ae40cec..ff63e1a898d9bf 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_1.yaml @@ -19,10 +19,10 @@ config: cluster: "Color Control" endpoint: 1 colorXConfigValue: - type: INT16U + type: int16u defaultValue: 400 colorYConfigValue: - type: INT16U + type: int16u defaultValue: 500 tests: @@ -58,7 +58,7 @@ tests: attribute: "CurrentX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -68,7 +68,7 @@ tests: attribute: "CurrentY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -103,7 +103,7 @@ tests: response: value: colorXConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -114,7 +114,7 @@ tests: response: value: colorYConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml index 13cd8d94fc0037..d7c6f283e0658b 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_2.yaml @@ -19,10 +19,10 @@ config: cluster: "Color Control" endpoint: 1 RateXValue: - type: INT16S + type: int16s defaultValue: 50 RateYValue: - type: INT16S + type: int16s defaultValue: 50 tests: @@ -59,7 +59,7 @@ tests: response: saveAs: CurrentXValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -70,7 +70,7 @@ tests: response: saveAs: CurrentYValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -103,7 +103,7 @@ tests: response: saveAs: CurrentXBeforeStopCommand constraints: - type: uint16 + type: int16u minValue: CurrentXValue maxValue: 65279 @@ -114,7 +114,7 @@ tests: response: saveAs: CurrentYBeforeStopCommand constraints: - type: uint16 + type: int16u minValue: CurrentYValue maxValue: 65279 @@ -134,7 +134,7 @@ tests: attribute: "CurrentX" response: constraints: - type: uint16 + type: int16u minValue: CurrentXBeforeStopCommand maxValue: 65279 @@ -144,7 +144,7 @@ tests: attribute: "CurrentY" response: constraints: - type: uint16 + type: int16u minValue: CurrentYBeforeStopCommand maxValue: 65279 diff --git a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml index 8b81f353104070..a4b3141553f63f 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_5_3.yaml @@ -19,10 +19,10 @@ config: cluster: "Color Control" endpoint: 1 StepXConfigValue: - type: INT16S + type: int16s defaultValue: 100 StepYConfigValue: - type: INT16S + type: int16s defaultValue: 100 tests: @@ -59,7 +59,7 @@ tests: response: saveAs: CurrentXValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -70,7 +70,7 @@ tests: response: saveAs: CurrentYValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -104,7 +104,7 @@ tests: attribute: "CurrentX" response: constraints: - type: uint16 + type: int16u minValue: CurrentXValue maxValue: 65279 @@ -114,7 +114,7 @@ tests: attribute: "CurrentY" response: constraints: - type: uint16 + type: int16u minValue: CurrentYValue maxValue: 65279 diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml index f9daaa512ea1e9..1dd9eeba179f02 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_1.yaml @@ -55,7 +55,7 @@ tests: response: saveAs: ColorTempPhysicalMinMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -66,7 +66,7 @@ tests: response: saveAs: ColorTempPhysicalMaxMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -76,7 +76,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -109,7 +109,7 @@ tests: response: value: ColorTempPhysicalMaxMiredsValue constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml index 255e36389327f4..d9d49ab601542e 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_2.yaml @@ -54,7 +54,7 @@ tests: response: saveAs: ColorTempPhysicalMinMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -65,7 +65,7 @@ tests: response: saveAs: ColorTempPhysicalMaxMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -75,7 +75,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -111,7 +111,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -129,7 +129,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -147,7 +147,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -183,7 +183,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -201,7 +201,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -219,7 +219,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -274,7 +274,7 @@ tests: response: saveAs: ColorTemperatureValue constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -293,7 +293,7 @@ tests: response: value: ColorTemperatureValue constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -312,7 +312,7 @@ tests: response: value: ColorTemperatureValue constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -367,7 +367,7 @@ tests: response: saveAs: ColorTemperatureMoveModeStop constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -386,7 +386,7 @@ tests: response: value: ColorTemperatureMoveModeStop constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -405,7 +405,7 @@ tests: response: value: ColorTemperatureValue constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue diff --git a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml index 3a4f902eff0c7e..b68517cdfbe6f9 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_6_3.yaml @@ -54,7 +54,7 @@ tests: response: saveAs: ColorTempPhysicalMinMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -65,7 +65,7 @@ tests: response: saveAs: ColorTempPhysicalMaxMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -75,7 +75,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: ColorTempPhysicalMinMiredsValue maxValue: ColorTempPhysicalMaxMiredsValue @@ -113,7 +113,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -131,7 +131,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -149,7 +149,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -187,7 +187,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -205,7 +205,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -223,7 +223,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml index df050ae7924d0c..67fea5a4dd70dc 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_1.yaml @@ -20,19 +20,19 @@ config: endpoint: 1 timeout: 150 EnhancedHueConfigValue: - type: INT16U + type: int16u defaultValue: 1025 EnhancedHueShortestDistanceConfigValue: - type: INT16U + type: int16u defaultValue: 1050 EnhancedHueLongestDistanceConfigValue: - type: INT16U + type: int16u defaultValue: 1200 EnhancedHueDirectionUpConfigValue: - type: INT16U + type: int16u defaultValue: 1300 EnhancedHueDirectionDownConfigValue: - type: INT16U + type: int16u defaultValue: 1100 tests: @@ -85,7 +85,7 @@ tests: response: value: EnhancedHueConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -119,7 +119,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -137,7 +137,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -156,7 +156,7 @@ tests: response: value: EnhancedHueShortestDistanceConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -190,7 +190,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -208,7 +208,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -227,7 +227,7 @@ tests: response: value: EnhancedHueLongestDistanceConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -261,7 +261,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -279,7 +279,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -298,7 +298,7 @@ tests: response: value: EnhancedHueDirectionUpConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -332,7 +332,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -350,7 +350,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -369,7 +369,7 @@ tests: response: value: EnhancedHueDirectionDownConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml index 7f946b8108d348..dc0ddd96cd6f9a 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_2.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 RateConfigValue: - type: INT16U + type: int16u defaultValue: 50 tests: @@ -55,7 +55,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -87,7 +87,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -105,7 +105,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -123,7 +123,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -148,7 +148,7 @@ tests: response: saveAs: EnhancedCurrentHueStep3b constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -167,7 +167,7 @@ tests: response: value: EnhancedCurrentHueStep3b constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -199,7 +199,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -217,7 +217,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -235,7 +235,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -260,7 +260,7 @@ tests: response: saveAs: EnhancedCurrentHueStep5b constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -279,7 +279,7 @@ tests: response: value: EnhancedCurrentHueStep5b constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml index 18b1be3cece7fc..d76467b3616b92 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_3.yaml @@ -19,7 +19,7 @@ config: cluster: "Color Control" endpoint: 1 StepSizeConfigValue: - type: INT16U + type: int16u defaultValue: 50 tests: @@ -55,7 +55,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -89,7 +89,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -123,7 +123,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml index 7c747be7eb5575..5d6f66ba87aaaf 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_7_4.yaml @@ -21,10 +21,10 @@ config: cluster: "Color Control" endpoint: 1 EnhancedHueConfigValue: - type: INT16U + type: int16u defaultValue: 1200 SaturationConfigValue: - type: INT8U + type: int8u defaultValue: 90 tests: @@ -60,7 +60,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -97,7 +97,7 @@ tests: response: value: EnhancedHueConfigValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 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 e7411fb6c87cbf..87e6c8a8aa22ad 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 @@ -19,19 +19,19 @@ config: cluster: "Color Control" endpoint: 1 RateConfigValue: - type: INT8U + type: int8u defaultValue: 50 RateXConfigValue: - type: INT16S + type: int16s defaultValue: 50 RateYConfigValue: - type: INT16S + type: int16s defaultValue: 50 ColorTemperatureMinMiredsConfigValue: - type: INT16U + type: int16u defaultValue: 1 ColorTemperatureMaxMiredsConfigValue: - type: INT16U + type: int16u defaultValue: 255 tests: @@ -81,7 +81,7 @@ tests: attribute: "CurrentHue" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -102,7 +102,7 @@ tests: response: saveAs: CurrentHueValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -121,7 +121,7 @@ tests: response: value: CurrentHueValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -145,7 +145,7 @@ tests: attribute: "CurrentSaturation" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -166,7 +166,7 @@ tests: response: saveAs: CurrentSaturationValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -185,7 +185,7 @@ tests: response: value: CurrentSaturationValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -217,7 +217,7 @@ tests: attribute: "CurrentX" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -227,7 +227,7 @@ tests: attribute: "CurrentY" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -248,7 +248,7 @@ tests: response: saveAs: CurrentXValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -259,7 +259,7 @@ tests: response: saveAs: CurrentYValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -278,7 +278,7 @@ tests: response: value: CurrentXValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -289,7 +289,7 @@ tests: response: value: CurrentYValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -325,7 +325,7 @@ tests: attribute: "ColorTemperature" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -346,7 +346,7 @@ tests: response: saveAs: ColorTemperatureMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -367,7 +367,7 @@ tests: response: value: ColorTemperatureMiredsValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65279 @@ -391,7 +391,7 @@ tests: attribute: "EnhancedCurrentHue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -412,7 +412,7 @@ tests: response: saveAs: EnhancedCurrentHueValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -431,7 +431,7 @@ tests: response: value: EnhancedCurrentHueValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml index be9e05812e5298..24486901098f3a 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_9_1.yaml @@ -237,7 +237,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep5d maxValue: 65535 @@ -255,7 +255,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep5d maxValue: 65535 @@ -382,7 +382,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep8d maxValue: 65535 @@ -400,7 +400,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep8d maxValue: 65535 @@ -558,7 +558,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep12d maxValue: 65535 @@ -576,7 +576,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep12d maxValue: 65535 @@ -703,7 +703,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep15d maxValue: 65535 @@ -721,7 +721,7 @@ tests: PICS: CC.S.F02 && CC.S.F01 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueStep15d maxValue: 65535 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 65cac0bef43279..1f1a465ff68c34 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 @@ -178,7 +178,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueValue maxValue: 65535 @@ -196,7 +196,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueValue maxValue: 65535 @@ -248,7 +248,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHue maxValue: 65535 @@ -266,7 +266,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHue maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml index 3a38d1b23cc858..771c1c1b265790 100644 --- a/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CC_9_3.yaml @@ -177,7 +177,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueValue maxValue: 65535 @@ -195,7 +195,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: ColorLoopStartEnhancedHueValue maxValue: 65535 @@ -240,7 +240,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -258,7 +258,7 @@ tests: PICS: CC.S.F01 && CC.S.F02 && CC.S.A4000 && CC.S.C44.Rsp response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml index 983145e592e4b8..77e61062328056 100644 --- a/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CGEN_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml index 9f318bb7e44166..c31563daf2a7ff 100644 --- a/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CGEN_2_1.yaml @@ -37,7 +37,7 @@ tests: attribute: "Breadcrumb" response: constraints: - type: uint64 + type: int64u - label: "TH1 writes the BreadCrumb attribute as 1 to the DUT" PICS: CGEN.S.A0000 @@ -88,4 +88,4 @@ tests: attribute: "SupportsConcurrentConnection" response: constraints: - type: bool + type: boolean diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml index db0e92fae503a6..95dfa5593d8b90 100644 --- a/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_1_6.yaml @@ -35,7 +35,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: CHANNEL.S.CL || CHANNEL.S.LI @@ -43,7 +43,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 3 diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml index 5164e3b55f9f55..9e4cf9a9ea418b 100644 --- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_2.yaml @@ -19,10 +19,10 @@ config: cluster: "Channel" endpoint: 1 majornumber: - type: INT16U + type: int16u defaultValue: 9 minornumber: - type: INT16U + type: int16u defaultValue: 1 tests: diff --git a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml index 032adb8c97b8b1..f23782ec436c38 100644 --- a/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_CHANNEL_5_3.yaml @@ -19,10 +19,10 @@ config: cluster: "Channel" endpoint: 1 majornumber: - type: INT16U + type: int16u defaultValue: 9 minornumber: - type: INT16U + type: int16u defaultValue: 1 tests: @@ -84,4 +84,4 @@ tests: response: value: [majorNumber: majornumber, minorNumber: minornumber + 1] constraints: - type: list + type: ChannelInfo diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml index c068e3ec2618d0..f2a2d722d37d95 100644 --- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_10_1.yaml @@ -42,4 +42,4 @@ tests: attribute: "SupportedStreamingProtocols" response: constraints: - type: map32 + type: bitmap32 diff --git a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml index 706496f82a2721..6ee6404350dc37 100644 --- a/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml +++ b/src/app/tests/suites/certification/Test_TC_CONTENTLAUNCHER_1_11.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: CONTENTLAUNCHER.S.CS || CONTENTLAUNCHER.S.UP @@ -44,7 +44,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 3 diff --git a/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml index de618503146889..1b76ec8d242429 100644 --- a/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DESC_1_1.yaml @@ -35,7 +35,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -43,7 +43,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml index a94faa0ebda955..8b6243027a7699 100644 --- a/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGETH_2_1.yaml @@ -44,7 +44,7 @@ tests: attribute: "FullDuplex" response: constraints: - type: bool + type: boolean #issue #13648 - label: "Read PacketRxCount attribute constraints" @@ -53,7 +53,7 @@ tests: attribute: "PacketRxCount" response: constraints: - type: uint64 + type: int64u - label: "Read PacketRxCount value from DUT and verify the number of packets @@ -80,7 +80,7 @@ tests: attribute: "PacketTxCount" response: constraints: - type: uint64 + type: int64u - label: "Read PacketTxCount value from DUT and verify the number of packets @@ -107,7 +107,7 @@ tests: attribute: "TxErrCount" response: constraints: - type: uint64 + type: int64u - label: "Read TxErrCount value from DUT and verify value indicates the number @@ -134,7 +134,7 @@ tests: attribute: "CollisionCount" response: constraints: - type: uint64 + type: int64u - label: "Read CollisionCount value from DUT and verify value indicates the @@ -162,7 +162,7 @@ tests: attribute: "OverrunCount" response: constraints: - type: uint64 + type: int64u - label: "Read OverrunCount value from DUT and verify value indicates the @@ -189,7 +189,7 @@ tests: attribute: "CarrierDetect" response: constraints: - type: bool + type: boolean - label: "Read CarrierDetect value from DUT and verify value indicates the @@ -217,7 +217,7 @@ tests: attribute: "TimeSinceReset" response: constraints: - type: uint64 + type: int64u - label: "Read TimeSinceReset value from DUT and verify the value indicates the diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml index d27e6f29454356..290189a2deb587 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_1_1.yaml @@ -35,7 +35,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -43,7 +43,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml index 968cccaffe22ca..478959957c5b08 100644 --- a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml @@ -43,7 +43,7 @@ tests: attribute: "RebootCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -99,7 +99,7 @@ tests: attribute: "UpTime" response: constraints: - type: uint64 + type: int64u - label: "TH reads a TotalOperationalHours attribute value from DUT." PICS: DGGEN.S.A0003 @@ -107,7 +107,7 @@ tests: attribute: "TotalOperationalHours" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFE diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml index 9eacb0943f6fa3..6b68769f96fb79 100644 --- a/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGSW_2_1.yaml @@ -44,7 +44,7 @@ tests: PICS: DGSW.S.A0001 response: constraints: - type: uint64 + type: int64u - label: "Reads CurrentHeapUsed non-global attribute value from DUT" command: "readAttribute" @@ -52,7 +52,7 @@ tests: PICS: DGSW.S.A0002 response: constraints: - type: uint64 + type: int64u - label: "Reads CurrentHeapHighWaterMark non-global attribute value from DUT" @@ -61,4 +61,4 @@ tests: PICS: DGSW.S.A0003 response: constraints: - type: uint64 + type: int64u diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml index b0d2902ff36b70..0c6fb332e0f795 100644 --- a/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml @@ -47,7 +47,7 @@ tests: PICS: DGSW.S.A0002 response: constraints: - type: uint64 + type: int64u #issue #830 - label: "Reads CurrentHeapHighWaterMark attribute value from DUT" @@ -56,4 +56,4 @@ tests: PICS: DGSW.S.A0003 response: constraints: - type: uint64 + type: int64u diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml index 0835823ecfb43d..cf675507724109 100644 --- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "channel" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -44,7 +44,7 @@ tests: attribute: "RoutingRole" response: constraints: - type: RoutingRole + type: enum8 minValue: 0 maxValue: 6 @@ -56,7 +56,7 @@ tests: attribute: "NetworkName" response: constraints: - type: string + type: char_string - label: "Read NetworkName attribute from DUT and verify response value, If @@ -90,7 +90,7 @@ tests: attribute: "PanId" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -125,7 +125,7 @@ tests: attribute: "ExtendedPanId" response: constraints: - type: uint64 + type: int64u - label: "Read ExtendedPanId attribute from DUT and verify response value, If @@ -180,7 +180,7 @@ tests: attribute: "OverrunCount" response: constraints: - type: uint64 + type: int64u - label: "read OverrunCount attribute from DUT and verify response value, If @@ -271,7 +271,7 @@ tests: attribute: "PartitionId" response: constraints: - type: uint32 + type: int32u - label: "TH reads Weighting attribute value from DUT" PICS: DGTHREAD.S.A000a @@ -279,7 +279,7 @@ tests: attribute: "weighting" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -289,7 +289,7 @@ tests: attribute: "DataVersion" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -299,7 +299,7 @@ tests: attribute: "StableDataVersion" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -309,7 +309,7 @@ tests: attribute: "LeaderRouterId" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -319,7 +319,7 @@ tests: attribute: "DetachedRoleCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -329,7 +329,7 @@ tests: attribute: "ChildRoleCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -339,7 +339,7 @@ tests: attribute: "RouterRoleCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -349,7 +349,7 @@ tests: attribute: "LeaderRoleCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -359,7 +359,7 @@ tests: attribute: "AttachAttemptCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -369,7 +369,7 @@ tests: attribute: "PartitionIdChangeCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -380,7 +380,7 @@ tests: attribute: "BetterPartitionAttachAttemptCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -390,7 +390,7 @@ tests: attribute: "ParentChangeCount" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -400,7 +400,7 @@ tests: attribute: "ActiveTimestamp" response: constraints: - type: uint64 + type: int64u - label: "TH reads PendingTimestamp attribute value from DUT" PICS: DGTHREAD.S.A0039 @@ -408,7 +408,7 @@ tests: attribute: "PendingTimestamp" response: constraints: - type: uint64 + type: int64u - label: "TH reads Delay attribute value from DUT" PICS: DGTHREAD.S.A003a @@ -416,7 +416,7 @@ tests: attribute: "delay" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -452,7 +452,7 @@ tests: attribute: "ChannelMask" response: constraints: - type: octstr + type: octet_string #issue #14097 - label: diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml index 6e2836a4a23a69..b2271fe4109bda 100644 --- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_2.yaml @@ -34,7 +34,7 @@ tests: attribute: "TxTotalCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -44,7 +44,7 @@ tests: attribute: "TxUnicastCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -54,7 +54,7 @@ tests: attribute: "TxBroadcastCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -64,7 +64,7 @@ tests: attribute: "TxAckRequestedCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -74,7 +74,7 @@ tests: attribute: "TxAckedCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -84,7 +84,7 @@ tests: attribute: "TxNoAckRequestedCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -94,7 +94,7 @@ tests: attribute: "TxDataCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -104,7 +104,7 @@ tests: attribute: "TxDataPollCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -114,7 +114,7 @@ tests: attribute: "TxBeaconCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -124,7 +124,7 @@ tests: attribute: "TxBeaconRequestCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -134,7 +134,7 @@ tests: attribute: "TxOtherCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -144,7 +144,7 @@ tests: attribute: "TxRetryCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -154,7 +154,7 @@ tests: attribute: "TxDirectMaxRetryExpiryCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -164,7 +164,7 @@ tests: attribute: "TxIndirectMaxRetryExpiryCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -174,7 +174,7 @@ tests: attribute: "TxErrCcaCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -184,7 +184,7 @@ tests: attribute: "TxErrAbortCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -194,6 +194,6 @@ tests: attribute: "TxErrBusyChannelCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF diff --git a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml index 670d8413c70862..b0d995e9aee70b 100644 --- a/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGTHREAD_2_3.yaml @@ -34,7 +34,7 @@ tests: attribute: "RxTotalCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -44,7 +44,7 @@ tests: attribute: "RxUnicastCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -54,7 +54,7 @@ tests: attribute: "RxBroadcastCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -64,7 +64,7 @@ tests: attribute: "RxDataCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -74,7 +74,7 @@ tests: attribute: "RxDataPollCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -84,7 +84,7 @@ tests: attribute: "RxBeaconCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -94,7 +94,7 @@ tests: attribute: "RxBeaconRequestCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -104,7 +104,7 @@ tests: attribute: "RxOtherCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -114,7 +114,7 @@ tests: attribute: "RxAddressFilteredCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -124,7 +124,7 @@ tests: attribute: "RxDestAddrFilteredCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -134,7 +134,7 @@ tests: attribute: "RxDuplicatedCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -144,7 +144,7 @@ tests: attribute: "RxErrNoFrameCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -154,7 +154,7 @@ tests: attribute: "RxErrUnknownNeighborCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -186,7 +186,7 @@ tests: attribute: "RxErrSecCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -196,7 +196,7 @@ tests: attribute: "RxErrFcsCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -206,6 +206,6 @@ tests: attribute: "RxErrOtherCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml index 4b3250de88e642..f6a0ab3ad1b014 100644 --- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "BSSID" response: constraints: - type: octstr + type: octet_string #issue #13645 - label: "Reads SecurityType attribute constraints" @@ -43,7 +43,7 @@ tests: attribute: "SecurityType" response: constraints: - type: enum + type: enum8 - label: "Reads WiFiVersion attribute constraints" PICS: DGWIFI.S.A0002 @@ -51,7 +51,7 @@ tests: attribute: "WiFiVersion" response: constraints: - type: enum + type: enum8 minValue: 0 maxValue: 5 @@ -61,7 +61,7 @@ tests: attribute: "ChannelNumber" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -71,7 +71,7 @@ tests: attribute: "RSSI" response: constraints: - type: int8 + type: int8s minValue: -120 maxValue: 0 @@ -81,7 +81,7 @@ tests: attribute: "BeaconLostCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -91,7 +91,7 @@ tests: attribute: "BeaconRxCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -101,7 +101,7 @@ tests: attribute: "PacketMulticastRxCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -111,7 +111,7 @@ tests: attribute: "PacketMulticastTxCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -121,7 +121,7 @@ tests: attribute: "PacketUnicastRxCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -131,7 +131,7 @@ tests: attribute: "PacketUnicastTxCount" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -141,7 +141,7 @@ tests: attribute: "CurrentMaxRate" response: constraints: - type: uint64 + type: int64u - label: "Reads OverrunCount attribute constraints" PICS: PICS_SKIP_SAMPLE_APP && DGWIFI.S.A000c @@ -149,4 +149,4 @@ tests: attribute: "OverrunCount" response: constraints: - type: uint64 + type: int64u diff --git a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml index c8520908ff3a39..71dc3d4f640376 100644 --- a/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_DGWIFI_2_3.yaml @@ -41,7 +41,7 @@ tests: attribute: "BeaconLostCount" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 @@ -51,7 +51,7 @@ tests: attribute: "BeaconRxCount" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 @@ -61,7 +61,7 @@ tests: attribute: "PacketMulticastRxCount" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 @@ -71,7 +71,7 @@ tests: attribute: "PacketMulticastTxCount" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 @@ -81,7 +81,7 @@ tests: attribute: "PacketUnicastRxCount" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 @@ -91,6 +91,6 @@ tests: attribute: "PacketUnicastTxCount" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 diff --git a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml index a8f56a9df5d383..3bc234e80b85c3 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 3 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml index 24b69a92b0e3c3..8f8abadc6dcbad 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "MeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -44,7 +44,7 @@ tests: attribute: "MinMeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -54,7 +54,7 @@ tests: attribute: "MaxMeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -64,6 +64,6 @@ tests: attribute: "Tolerance" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 2048 diff --git a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml index 5bbd6c9197ab24..d2ca220cf4519f 100644 --- a/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_FLW_2_2.yaml @@ -35,7 +35,7 @@ tests: response: saveAs: ValueBeforeChange constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -56,7 +56,7 @@ tests: attribute: "MeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 notValue: ValueBeforeChange diff --git a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml index b5c7f29532ce5d..66e4cf05eb1f44 100644 --- a/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ILL_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 3 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml index 1d209e6a774514..4f6348cde9a247 100644 --- a/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ILL_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "MeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65534 @@ -44,7 +44,7 @@ tests: attribute: "MinMeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 1 maxValue: 65533 @@ -54,7 +54,7 @@ tests: attribute: "MaxMeasuredValue" response: constraints: - type: uint16 + type: int16u minValue: 2 maxValue: 65534 @@ -64,7 +64,7 @@ tests: attribute: "Tolerance" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 2048 diff --git a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml index 296cbb8e9ab00e..ba3faef871404c 100644 --- a/src/app/tests/suites/certification/Test_TC_I_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 4 constraints: - type: uint16 + type: int16u - label: "TH reads the FeatureMap attribute from the DUT" PICS: " !I.S.F00 " @@ -43,7 +43,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "TH reads the FeatureMap attribute from the DUT" PICS: I.S.F00 @@ -52,7 +52,7 @@ tests: response: value: 1 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_I_2_1.yaml b/src/app/tests/suites/certification/Test_TC_I_2_1.yaml index d34a86313d7fdf..695e0ba4b057cc 100644 --- a/src/app/tests/suites/certification/Test_TC_I_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_I_2_1.yaml @@ -33,7 +33,7 @@ tests: attribute: "identify time" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml index 7d7aa0e979a0e8..aa7df448634208 100644 --- a/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_KEYPADINPUT_1_2.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: KEYPADINPUT.S.NV || KEYPADINPUT.S.LK || KEYPADINPUT.S.NK @@ -44,7 +44,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 7 diff --git a/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml index c9bb5e1803c760..7232c912e86270 100644 --- a/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LOWPOWER_1_1.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -44,7 +44,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml index fe3bd7f1e55b46..51b0774a98f30f 100644 --- a/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LUNIT_3_1.yaml @@ -37,7 +37,7 @@ tests: attribute: "TemperatureUnit" response: constraints: - type: uint8 + type: enum8 - label: "TH writes 0 (Fahrenheit) to TemperatureUnit attribute" PICS: LUNIT.C.A0000.Fahrenheit diff --git a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml index a6f918ae210968..599a74ca31c732 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 5 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: LVL.S.F00 || LVL.S.F01 || LVL.S.F02 @@ -42,7 +42,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 7 diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml index 5a5cbfe3c5fb47..179ba1b5b9ecbb 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_2_1.yaml @@ -35,7 +35,7 @@ tests: response: saveAs: CurrentLevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -45,7 +45,7 @@ tests: attribute: "remaining time" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -57,7 +57,7 @@ tests: value: 1 saveAs: MinLevelValue constraints: - type: uint8 + type: int8u - label: "Reads the MinLevel attribute" PICS: LVL.S.A0002 && !LVL.S.F01 @@ -66,7 +66,7 @@ tests: response: saveAs: MinLevelFeatureMapNotSupportedValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -78,7 +78,7 @@ tests: value: 254 saveAs: MaxLevelValue constraints: - type: uint8 + type: int8u minValue: MinLevelValue - label: "Reads the MaxLevel attribute" @@ -88,7 +88,7 @@ tests: response: saveAs: MaxLevelFeatureMapNotSupportedValue constraints: - type: uint8 + type: int8u minValue: MinLevelFeatureMapNotSupportedValue maxValue: 254 @@ -98,7 +98,7 @@ tests: attribute: "current level" response: constraints: - type: uint8 + type: int8u minValue: MinLevelValue maxValue: MaxLevelValue @@ -108,7 +108,7 @@ tests: attribute: "current level" response: constraints: - type: uint8 + type: int8u minValue: MinLevelFeatureMapNotSupportedValue maxValue: MaxLevelFeatureMapNotSupportedValue @@ -118,7 +118,7 @@ tests: attribute: "current frequency" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -129,7 +129,7 @@ tests: response: saveAs: MinFrequencyValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -140,7 +140,7 @@ tests: response: saveAs: MaxFrequencyValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -150,7 +150,7 @@ tests: attribute: "current frequency" response: constraints: - type: uint16 + type: int16u minValue: MinFrequencyValue maxValue: MaxFrequencyValue @@ -160,7 +160,7 @@ tests: attribute: "on off transition time" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -170,7 +170,7 @@ tests: attribute: "on level" response: constraints: - type: uint8 + type: int8u minValue: MinLevelValue maxValue: MaxLevelValue @@ -180,7 +180,7 @@ tests: attribute: "on level" response: constraints: - type: uint8 + type: int8u minValue: MinLevelFeatureMapNotSupportedValue maxValue: MaxLevelFeatureMapNotSupportedValue @@ -190,7 +190,7 @@ tests: attribute: "on transition time" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -200,7 +200,7 @@ tests: attribute: "off transition time" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -210,7 +210,7 @@ tests: attribute: "default move rate" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -221,7 +221,7 @@ tests: response: value: 0 constraints: - type: map8 + type: bitmap8 - label: "Reads the StartUpCurrentLevel attribute " PICS: LVL.S.A4000 @@ -229,6 +229,6 @@ tests: attribute: "start up current level" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml index 44a5da74096567..d6a3ae0b17a032 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_2_2.yaml @@ -19,22 +19,22 @@ config: cluster: "Level Control" endpoint: 1 OnOffTransitionTimeConfigValue: - type: INT16U + type: int16u defaultValue: 10 OnLevelConfigValue: - type: INT8U + type: int8u defaultValue: 5 OnTransitionTimeConfigValue: - type: INT16U + type: int16u defaultValue: 5 OffTransitionTimeConfigValue: - type: INT16U + type: int16u defaultValue: 10 DefaultMoveRateConfigValue: - type: INT8U + type: int8u defaultValue: 111 StartUpCurrentLevelConfigValue: - type: INT8U + type: int8u defaultValue: 5 tests: @@ -53,7 +53,7 @@ tests: response: saveAs: OnOffTransitionTimeValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -71,7 +71,7 @@ tests: response: value: OnOffTransitionTimeConfigValue constraints: - type: uint16 + type: int16u notValue: OnOffTransitionTimeValue - label: "Reads the OnLevel attribute from the DUT" @@ -81,7 +81,7 @@ tests: response: saveAs: OnLevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -99,7 +99,7 @@ tests: response: value: OnLevelConfigValue constraints: - type: uint8 + type: int8u notValue: OnLevelValue - label: "Reads the OnTransitionTime attribute from the DUT" @@ -109,7 +109,7 @@ tests: response: saveAs: OnTransitionTimeValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -127,7 +127,7 @@ tests: response: value: OnTransitionTimeConfigValue constraints: - type: uint16 + type: int16u notValue: OnTransitionTimeValue - label: "Reads the OffTransitionTime attribute from the DUT" @@ -137,7 +137,7 @@ tests: response: saveAs: OffTransitionTimeValue constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -155,7 +155,7 @@ tests: response: value: OffTransitionTimeConfigValue constraints: - type: uint16 + type: int16u notValue: OffTransitionTimeValue - label: "Reads the DefaultMoveRate attribute from the DUT" @@ -165,7 +165,7 @@ tests: response: saveAs: DefaultMoveRatevalue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -183,7 +183,7 @@ tests: response: value: DefaultMoveRateConfigValue constraints: - type: uint8 + type: int8u notValue: DefaultMoveRatevalue - label: "Reads the StartUpCurrentLevel attribute from the DUT" @@ -193,7 +193,7 @@ tests: response: saveAs: StartUpCurrentLevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -211,7 +211,7 @@ tests: response: value: StartUpCurrentLevelConfigValue constraints: - type: uint8 + type: int8u notValue: StartUpCurrentLevelValue #This is a reset step that is needed to reset the value of the attribute to the default values so as to not effect other test cases. diff --git a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml index c71f7451a494cd..b1bafbe1a9c3ce 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_3_1.yaml @@ -54,7 +54,7 @@ tests: attribute: "min level" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -64,7 +64,7 @@ tests: attribute: "max level" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -161,7 +161,7 @@ tests: attribute: "on off transition time" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml index dfc9ae5e397817..f03caa284c3927 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_4_1.yaml @@ -55,7 +55,7 @@ tests: response: saveAs: MinlevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -80,7 +80,7 @@ tests: response: saveAs: MaxlevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -180,7 +180,7 @@ tests: response: saveAs: DefaultMoveRateValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml index e5690f1c9d704d..600b487af75e70 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_5_1.yaml @@ -55,7 +55,7 @@ tests: response: saveAs: MinlevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -95,7 +95,7 @@ tests: value: MinlevelValue + 1 saveAs: CurrentlevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -106,7 +106,7 @@ tests: response: value: 2 constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 254 @@ -157,7 +157,7 @@ tests: response: value: 66 constraints: - type: uint8 + type: int8u - label: "Reads current level attribute from DUT" PICS: LVL.S.A0000 && LVL.S.C02.Rsp && !LVL.S.M.VarRate @@ -166,7 +166,7 @@ tests: response: value: 66 constraints: - type: uint8 + type: int8u - label: "Sends a StepWithOnOff command" PICS: LVL.S.C06.Rsp && LVL.S.M.VarRate diff --git a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml index 98748b28b1a995..f68f33ec310669 100644 --- a/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_LVL_6_1.yaml @@ -55,7 +55,7 @@ tests: response: saveAs: MinlevelValue constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml index e6a22e1205adeb..54cab6a3183249 100644 --- a/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_MEDIAINPUT_1_4.yaml @@ -36,14 +36,14 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 1 diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml index 0c2daf8ee39088..1f8e0acd5f5ade 100644 --- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml +++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_1_7.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: MEDIAPLAYBACK.S.AS || MEDIAPLAYBACK.S.VS @@ -44,7 +44,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 3 diff --git a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml index c143a2a91b7cd8..cdf3b92190c987 100644 --- a/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_MEDIAPLAYBACK_6_3.yaml @@ -19,7 +19,7 @@ config: cluster: "Media Playback" endpoint: 1 SeekPosition: - type: INT64U + type: int64u defaultValue: 100000000 tests: diff --git a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml index 5852934e541aac..f4deeee328d384 100644 --- a/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_MOD_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "TH reads the FeatureMap attribute from the DUT" PICS: MOD.S.F00 @@ -43,7 +43,7 @@ tests: response: value: 1 constraints: - type: map32 + type: bitmap32 - label: "TH reads the FeatureMap attribute from the DUT" PICS: " !MOD.S.F00 " @@ -52,7 +52,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "TH reads the AttributeList attribute from the DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml index ef2633b626f18c..f30a3b1cc381bb 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 3 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml index 228b64c7dbbb78..c559eea82eb7f8 100644 --- a/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OCC_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "occupancy" response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 1 @@ -54,7 +54,7 @@ tests: attribute: "occupancy sensor type bitmap" response: constraints: - type: map8 + type: bitmap8 minValue: 1 maxValue: 273 @@ -65,7 +65,7 @@ tests: response: value: 0 constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -76,7 +76,7 @@ tests: response: value: 0 constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -88,7 +88,7 @@ tests: response: value: 1 constraints: - type: uint8 + type: int8u minValue: 1 maxValue: 254 @@ -99,7 +99,7 @@ tests: response: value: 0 constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -110,7 +110,7 @@ tests: response: value: 0 constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -121,7 +121,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int8u minValue: 1 maxValue: 254 @@ -134,7 +134,7 @@ tests: response: value: 0 constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -147,7 +147,7 @@ tests: response: value: 0 constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -160,6 +160,6 @@ tests: response: value: 1 constraints: - type: uint8 + type: int8u minValue: 1 maxValue: 254 diff --git a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml index 2b2b11d863e00f..6c811f34c153d2 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 4 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -43,7 +43,7 @@ tests: response: value: 1 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -52,7 +52,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml index bb6a000e8367a9..a471f39e6bce2f 100644 --- a/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_OO_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "OnOff" response: constraints: - type: bool + type: boolean - label: "Read LT attribute: GlobalSceneControl" PICS: OO.S.A4000 @@ -42,7 +42,7 @@ tests: attribute: "GlobalSceneControl" response: constraints: - type: bool + type: boolean - label: "Read LT attribute: OnTime" PICS: OO.S.A4001 @@ -50,7 +50,7 @@ tests: attribute: "OnTime" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -60,7 +60,7 @@ tests: attribute: "OffWaitTime" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml index 1e2cbc501d9a90..a095cc771d2219 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 3 constraints: - type: uint16 + type: int16u - label: "TH reads the FeatureMap attribute from the DUT" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "TH reads the AttributeList attribute from the DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml index 178930fc1754b5..d69ef7d98629e5 100644 --- a/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PCC_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "MaxPressure" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -44,7 +44,7 @@ tests: attribute: "MaxSpeed" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -54,7 +54,7 @@ tests: attribute: "MaxFlow" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -64,7 +64,7 @@ tests: attribute: "MinConstPressure" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -74,7 +74,7 @@ tests: attribute: "MaxConstPressure" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -84,7 +84,7 @@ tests: attribute: "MinCompPressure" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -94,7 +94,7 @@ tests: attribute: "MaxCompPressure" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -104,7 +104,7 @@ tests: attribute: "MinConstSpeed" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -114,7 +114,7 @@ tests: attribute: "MaxConstSpeed" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -124,7 +124,7 @@ tests: attribute: "MinConstFlow" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -134,7 +134,7 @@ tests: attribute: "MaxConstFlow" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -144,7 +144,7 @@ tests: attribute: "MinConstTemp" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -154,7 +154,7 @@ tests: attribute: "MaxConstTemp" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -164,7 +164,7 @@ tests: attribute: "PumpStatus" response: constraints: - type: map16 + type: bitmap16 minValue: 0 maxValue: 8 @@ -194,7 +194,7 @@ tests: attribute: "Capacity" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -204,7 +204,7 @@ tests: attribute: "Speed" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -214,7 +214,7 @@ tests: attribute: "LifetimeRunningHours" response: constraints: - type: uint24 + type: int24u minValue: 0 maxValue: 16777215 @@ -224,7 +224,7 @@ tests: attribute: "Power" response: constraints: - type: uint24 + type: int24u minValue: 0 maxValue: 16777215 @@ -234,7 +234,7 @@ tests: attribute: "LifetimeEnergyConsumed" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 4294967295 diff --git a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml index dd99ae2d50de7a..e7e8a142285b62 100644 --- a/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PRS_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 3 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: PRS.S.F00 @@ -43,7 +43,7 @@ tests: response: value: 1 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: FeatureMap" PICS: " !PRS.S.F00 " @@ -52,7 +52,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global mandatory attribute: AttributeList" command: "readAttribute" 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 86c74bfb54f6a6..cc541918a4bccc 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 @@ -34,7 +34,7 @@ tests: attribute: "MeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -44,7 +44,7 @@ tests: attribute: "MinMeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -54,7 +54,7 @@ tests: attribute: "MaxMeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -64,7 +64,7 @@ tests: attribute: "Tolerance" response: constraints: - type: int16 + type: int16u minValue: 0 maxValue: 2048 @@ -74,7 +74,7 @@ tests: attribute: "ScaledValue" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -84,7 +84,7 @@ tests: attribute: "MinScaledValue" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -94,7 +94,7 @@ tests: attribute: "MaxScaledValue" response: constraints: - type: int16 + type: int16s minValue: -32768 maxValue: 32767 @@ -104,7 +104,7 @@ tests: attribute: "ScaledTolerance" response: constraints: - type: int16 + type: int16u minValue: 0 maxValue: 2048 @@ -114,6 +114,6 @@ tests: attribute: "Scale" response: constraints: - type: int8 + type: int8s minValue: -127 maxValue: 127 diff --git a/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml index c355fc10682848..4053ea3195a19a 100644 --- a/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PSCFG_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "TH reads the FeatureMap attribute from the DUT" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "TH reads the AttributeList attribute from the DUT" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml index ceeb27f0b3ba38..dc766658a7594c 100644 --- a/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PS_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: PS.S.F00 || PS.S.F01 || PS.S.F02 || PS.S.F03 @@ -42,7 +42,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 0 maxValue: 15 diff --git a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml index e76b9e49f9a167..969e453c6d1373 100644 --- a/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_PS_2_1.yaml @@ -44,7 +44,7 @@ tests: attribute: "Order" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -54,7 +54,7 @@ tests: attribute: "Description" response: constraints: - type: string + type: char_string - label: "Test Harness Client reads WiredAssessedInputVoltage attribue from @@ -64,7 +64,7 @@ tests: attribute: "WiredAssessedInputVoltage" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -76,7 +76,7 @@ tests: attribute: "WiredAssessedInputFrequency" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -99,7 +99,7 @@ tests: attribute: "WiredAssessedCurrent" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -109,7 +109,7 @@ tests: attribute: "WiredNominalVoltage" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -119,7 +119,7 @@ tests: attribute: "WiredMaximumCurrent" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -129,7 +129,7 @@ tests: attribute: "WiredPresent" response: constraints: - type: bool + type: boolean - label: "Test Harness Client reads ActiveWiredFaults from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A000a @@ -146,7 +146,7 @@ tests: attribute: "BatVoltage" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -156,7 +156,7 @@ tests: attribute: "BatPercentRemaining" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 200 @@ -166,7 +166,7 @@ tests: attribute: "BatTimeRemaining" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -186,7 +186,7 @@ tests: attribute: "BatReplacementNeeded" response: constraints: - type: bool + type: boolean - label: "Test Harness Client reads BatReplaceability from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0010 @@ -204,7 +204,7 @@ tests: attribute: "BatPresent" response: constraints: - type: bool + type: boolean - label: "Test Harness Client readsActiveBatFaults from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A0012 @@ -222,7 +222,7 @@ tests: attribute: "BatReplacementDescription" response: constraints: - type: string + type: char_string maxLength: 60 - label: "Test Harness Client reads BatCommonDesignation from Server DUT" @@ -231,7 +231,7 @@ tests: attribute: "BatCommonDesignation" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 80 @@ -241,7 +241,7 @@ tests: attribute: "BatANSIDesignation" response: constraints: - type: string + type: char_string maxLength: 20 - label: "Test Harness Client reads BatIECDesignation from Server DUT" @@ -250,7 +250,7 @@ tests: attribute: "BatIECDesignation" response: constraints: - type: string + type: char_string maxLength: 20 - label: "Test Harness Client reads BatApprovedChemistry from Server DUT" @@ -259,7 +259,7 @@ tests: attribute: "BatApprovedChemistry" response: constraints: - type: uint32 + type: int32u minValue: 0 maxValue: 32 @@ -269,7 +269,7 @@ tests: attribute: "BatCapacity" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -279,7 +279,7 @@ tests: attribute: "BatQuantity" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -299,7 +299,7 @@ tests: attribute: "BatTimeToFullCharge" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF @@ -310,7 +310,7 @@ tests: attribute: "BatFunctionalWhileCharging" response: constraints: - type: bool + type: boolean - label: "Test Harness Client reads BatChargingCurrent from Server DUT" PICS: PICS_SKIP_SAMPLE_APP && PS.S.A001d @@ -318,7 +318,7 @@ tests: attribute: "BatChargingCurrent" response: constraints: - type: uint32 + type: int32u minValue: 0x0 maxValue: 0xFFFFFFFF diff --git a/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml index 8fd7e9a9723d27..79362ca7f613da 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 3 constraints: - type: list + type: int16u - label: "Read FeatureMap attribute from the DUT" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml index 87f3ed0c826485..588190de738f6f 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "measured value" response: constraints: - type: int16 + type: int16u minValue: 0 maxValue: 10000 @@ -44,7 +44,7 @@ tests: attribute: "min measured value" response: constraints: - type: int16 + type: int16u minValue: 0 maxValue: 9999 @@ -54,7 +54,7 @@ tests: attribute: "max measured value" response: constraints: - type: int16 + type: int16u minValue: 1 maxValue: 10000 @@ -64,6 +64,6 @@ tests: attribute: "tolerance" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 2048 diff --git a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml index 023deb509bcc01..fc4a8ab535f6f1 100644 --- a/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_RH_2_2.yaml @@ -34,7 +34,7 @@ tests: attribute: "min measured value" response: constraints: - type: int16 + type: int16u minValue: 0 maxValue: 9999 @@ -44,7 +44,7 @@ tests: attribute: "max measured value" response: constraints: - type: int16 + type: int16u minValue: 1 maxValue: 10000 @@ -55,7 +55,7 @@ tests: response: saveAs: ValueBeforeChange constraints: - type: int16 + type: int16u minValue: 0 maxValue: 10000 @@ -76,5 +76,5 @@ tests: PICS: RH.S.A0000 && RH.M.ManuallyControlled response: constraints: - type: uint16 + type: int16u notValue: ValueBeforeChange diff --git a/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml b/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml index 5f42808dd13eaf..536019ae31e03c 100644 --- a/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_SC_4_2.yaml @@ -21,16 +21,16 @@ config: cluster: "Secure Channel" endpoint: 0 discriminator: - type: INT16U + type: int16u defaultValue: 3840 vendorId: - type: INT16U + type: int16u defaultValue: 65521 productId: - type: INT16U + type: int16u defaultValue: 32769 deviceType: - type: INT16U + type: int16u defaultValue: 5 tests: diff --git a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml index 5f0653034876bf..d66ad3aa45f22a 100644 --- a/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_SWTCH_2_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 2 constraints: - type: uint8 + type: int8u minValue: 2 - label: "Read CurrentPosition attribute" @@ -43,7 +43,7 @@ tests: response: value: 0 constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -54,6 +54,6 @@ tests: response: value: 2 constraints: - type: uint8 + type: int8u minValue: 2 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml b/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml index bae52b9de71736..8bbfe298a9748e 100644 --- a/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml +++ b/src/app/tests/suites/certification/Test_TC_TGTNAV_1_9.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -44,7 +44,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml b/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml index e6cebc4d550dc2..c7ffec68e69bd4 100644 --- a/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TGTNAV_8_1.yaml @@ -19,10 +19,10 @@ config: cluster: "Target Navigator" endpoint: 1 targetvalue1: - type: INT8U + type: int8u defaultValue: 1 targetvalue2: - type: INT8U + type: int8u defaultValue: 2 tests: @@ -40,7 +40,7 @@ tests: attribute: "CurrentTarget" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 diff --git a/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml index 541d2fc3f3a233..c3e466ff57ca6c 100644 --- a/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TMP_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 4 constraints: - type: unit16 + type: int16u - label: "Read FeatureMap attribute from the DUT" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml index 6f724f1a2ce0be..37baa132bb605b 100644 --- a/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TMP_2_1.yaml @@ -34,7 +34,7 @@ tests: attribute: "MeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -44,7 +44,7 @@ tests: attribute: "MinMeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -54,7 +54,7 @@ tests: attribute: "MaxMeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -27314 maxValue: 32767 @@ -64,6 +64,6 @@ tests: attribute: "Tolerance" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 2048 diff --git a/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml index 6f3613bf9c8e19..1caecd702318e1 100644 --- a/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TMP_2_2.yaml @@ -34,7 +34,7 @@ tests: attribute: "MinMeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32766 @@ -44,7 +44,7 @@ tests: attribute: "MaxMeasuredValue" response: constraints: - type: int16 + type: int16s minValue: -27314 maxValue: 32767 @@ -55,9 +55,9 @@ tests: response: saveAs: valueBeforeChange constraints: - type: uint16 - minValue: 0 - maxValue: 65535 + type: int16s + minValue: -27314 + maxValue: 32767 - label: "Operate on device to change the temperature significantly" cluster: "LogCommands" @@ -76,7 +76,7 @@ tests: PICS: TMP.S.A0000 && TMP.M.ManuallyControlled response: constraints: - type: uint16 - minValue: 0 - maxValue: 65535 + type: int16s + minValue: -27314 + maxValue: 32767 notValue: valueBeforeChange diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml index df0aabef7cabff..ba9181bc229551 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 5 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" PICS: @@ -44,7 +44,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: map32 + type: bitmap32 minValue: 1 maxValue: 63 diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml index 1ddc6392d490df..a0ffea63eb050f 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_1.yaml @@ -33,7 +33,7 @@ tests: attribute: "LocalTemperature" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -43,7 +43,7 @@ tests: attribute: "OutdoorTemperature" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -53,7 +53,7 @@ tests: attribute: "Occupancy" response: constraints: - type: int16 + type: bitmap8 minValue: 0 maxValue: 1 @@ -63,7 +63,7 @@ tests: attribute: "AbsMinHeatSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -73,7 +73,7 @@ tests: attribute: "AbsMaxHeatSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -83,7 +83,7 @@ tests: attribute: "AbsMinCoolSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -93,7 +93,7 @@ tests: attribute: "AbsMaxCoolSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -103,7 +103,7 @@ tests: attribute: "PICoolingDemand" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 100 @@ -113,7 +113,7 @@ tests: attribute: "PIHeatingDemand" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 100 @@ -123,7 +123,7 @@ tests: attribute: "HVACSystemTypeConfiguration" response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 63 @@ -133,7 +133,7 @@ tests: attribute: "LocalTemperatureCalibration" response: constraints: - type: int8 + type: int8s minValue: 25 maxValue: -25 @@ -143,7 +143,7 @@ tests: attribute: "OccupiedCoolingSetpoint" response: constraints: - type: int16 + type: int16s minValue: 1600 maxValue: 3200 @@ -153,7 +153,7 @@ tests: attribute: "OccupiedHeatingSetpoint" response: constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -163,7 +163,7 @@ tests: attribute: "UnoccupiedCoolingSetpoint" response: constraints: - type: int16 + type: int16s minValue: 1600 maxValue: 3200 @@ -173,7 +173,7 @@ tests: attribute: "UnoccupiedHeatingSetpoint" response: constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -183,7 +183,7 @@ tests: attribute: "MinHeatSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -193,7 +193,7 @@ tests: attribute: "MaxHeatSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -203,7 +203,7 @@ tests: attribute: "MinCoolSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -213,7 +213,7 @@ tests: attribute: "MaxCoolSetpointLimit" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -223,7 +223,7 @@ tests: attribute: "MinSetpointDeadBand" response: constraints: - type: int8 + type: int8s minValue: 0 maxValue: 25 @@ -233,7 +233,7 @@ tests: attribute: "RemoteSensing" response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 7 @@ -281,7 +281,7 @@ tests: attribute: "NumberOfWeeklyTransitions" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -291,7 +291,7 @@ tests: attribute: "NumberOfDailyTransitions" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -311,7 +311,7 @@ tests: attribute: "TemperatureSetpointHoldDuration" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 1440 @@ -321,7 +321,7 @@ tests: attribute: "ThermostatProgrammingOperationMode" response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 7 @@ -331,7 +331,7 @@ tests: attribute: "ThermostatRunningState" response: constraints: - type: map16 + type: bitmap16 minValue: 0 maxValue: 127 @@ -351,7 +351,7 @@ tests: attribute: "SetpointChangeAmount" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 @@ -369,7 +369,7 @@ tests: attribute: "OccupiedSetback" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -379,7 +379,7 @@ tests: attribute: "OccupiedSetbackMin" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -389,7 +389,7 @@ tests: attribute: "OccupiedSetbackMax" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -399,7 +399,7 @@ tests: attribute: "UnoccupiedSetback" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -409,7 +409,7 @@ tests: attribute: "UnoccupiedSetbackMin" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -419,7 +419,7 @@ tests: attribute: "UnoccupiedSetbackMax" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -429,7 +429,7 @@ tests: attribute: "EmergencyHeatDelta" response: constraints: - type: uint8 + type: int8u minValue: 0 maxValue: 255 @@ -449,7 +449,7 @@ tests: attribute: "ACCapacity" response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -479,7 +479,7 @@ tests: attribute: "ACErrorCode" response: constraints: - type: map32 + type: bitmap32 - label: "Read ACLouverPosition attribute from the DUT" PICS: TSTAT.S.A0045 @@ -497,7 +497,7 @@ tests: attribute: "ACCoilTemperature" response: constraints: - type: int16 + type: int16s minValue: -27315 maxValue: 32767 diff --git a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml index b6ef39e12cb377..4b0328d502a885 100644 --- a/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSTAT_2_2.yaml @@ -36,7 +36,7 @@ tests: PICS: TSTAT.S.F01 response: constraints: - type: int16 + type: int16s minValue: 1600 maxValue: 3200 @@ -117,7 +117,7 @@ tests: PICS: TSTAT.S.F00 response: constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -208,7 +208,7 @@ tests: response: value: 2600 constraints: - type: int16 + type: int16s minValue: 1600 maxValue: 3200 @@ -279,7 +279,7 @@ tests: response: value: 2000 constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -351,7 +351,7 @@ tests: response: value: 700 constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -431,7 +431,7 @@ tests: response: value: 3000 constraints: - type: int16 + type: int16s minValue: 700 maxValue: 3000 @@ -522,7 +522,7 @@ tests: response: value: 1600 constraints: - type: int16 + type: int16s minValue: 1600 maxValue: 3200 @@ -601,7 +601,7 @@ tests: response: value: 3200 constraints: - type: int16 + type: int16s minValue: 1600 maxValue: 3200 @@ -706,7 +706,7 @@ tests: response: value: 25 constraints: - type: temp-s8 + type: int8s minValue: 0 maxValue: 25 diff --git a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml index fabe547f94e490..34cb80974ef93e 100644 --- a/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_TSUIC_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 2 constraints: - type: uint16 + type: int16u - label: "Read FeatureMap attribute from the DUT" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml index e78deaba7ee13e..894da6642d1112 100644 --- a/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_ULABEL_1_1.yaml @@ -34,7 +34,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -42,7 +42,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml b/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml index fe2d8887d782d3..ec2c6b4a0a79b9 100644 --- a/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_WAKEONLAN_1_5.yaml @@ -36,7 +36,7 @@ tests: response: value: 1 constraints: - type: uint16 + type: int16u - label: "Read the global attribute: FeatureMap" command: "readAttribute" @@ -44,7 +44,7 @@ tests: response: value: 0 constraints: - type: map32 + type: bitmap32 - label: "Read the global attribute: AttributeList" command: "readAttribute" diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml index 377dd159bc0032..6062b499fc8e12 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_1_1.yaml @@ -37,7 +37,7 @@ tests: response: value: 5 constraints: - type: uint16 + type: int16u minValue: 5 maxValue: 200 @@ -47,7 +47,7 @@ tests: attribute: "FeatureMap" response: constraints: - type: uint32 + type: bitmap32 minValue: 0 maxValue: 32768 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 19843f0ab28679..6b30454bb892f2 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 @@ -50,7 +50,7 @@ tests: PICS: WNCV.S.A0007 response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 63 @@ -61,7 +61,7 @@ tests: PICS: WNCV.S.A000a response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 63 @@ -83,7 +83,7 @@ tests: PICS: WNCV.S.A0017 response: constraints: - type: map8 + type: bitmap8 minValue: 0 maxValue: 15 @@ -155,7 +155,7 @@ tests: PICS: WNCV.S.A0010 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -167,7 +167,7 @@ tests: PICS: WNCV.S.A0011 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -179,7 +179,7 @@ tests: PICS: WNCV.S.A0012 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -191,7 +191,7 @@ tests: PICS: WNCV.S.A0013 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -203,7 +203,7 @@ tests: PICS: WNCV.S.A001a response: constraints: - type: map16 + type: bitmap16 minValue: 0 maxValue: 2047 @@ -215,7 +215,7 @@ tests: PICS: WNCV.S.A0001 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -227,7 +227,7 @@ tests: PICS: WNCV.S.A0002 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -238,7 +238,7 @@ tests: PICS: WNCV.S.A0003 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -249,7 +249,7 @@ tests: PICS: WNCV.S.A0004 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -261,7 +261,7 @@ tests: PICS: WNCV.S.A0005 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 @@ -273,7 +273,7 @@ tests: PICS: WNCV.S.A0006 response: constraints: - type: uint16 + type: int16u minValue: 0 maxValue: 65535 diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml index a6381b88223273..80cb89614f5230 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_1.yaml @@ -59,7 +59,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A000e response: constraints: - type: uint16 + type: Percent100ths minValue: 1 maxValue: 10000 @@ -72,7 +72,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A0008 response: constraints: - type: uint8 + type: Percent minValue: 1 maxValue: 100 @@ -85,7 +85,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A000f response: constraints: - type: uint16 + type: Percent100ths minValue: 1 maxValue: 10000 @@ -98,7 +98,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A0009 response: constraints: - type: uint8 + type: Percent minValue: 1 maxValue: 100 @@ -112,7 +112,7 @@ tests: maxInterval: 5 response: constraints: - type: map8 + type: bitmap8 ### MANDATORY Command - label: "2a: TH sends UpOrOpen command to DUT" @@ -169,7 +169,7 @@ tests: PICS: WNCV.S.A000a response: constraints: - type: map8 + type: bitmap8 minValue: 5 maxValue: 21 @@ -191,7 +191,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A000e response: constraints: - type: uint16 + type: Percent100ths minValue: 0 maxValue: 9999 @@ -204,7 +204,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A0008 response: constraints: - type: uint8 + type: Percent minValue: 0 maxValue: 99 @@ -217,7 +217,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A000f response: constraints: - type: uint16 + type: Percent100ths minValue: 0 maxValue: 9999 @@ -230,7 +230,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A0009 response: constraints: - type: uint8 + type: Percent minValue: 0 maxValue: 99 @@ -280,7 +280,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A000b response: constraints: - type: uint16 + type: Percent100ths minValue: 0 maxValue: 9999 @@ -293,6 +293,6 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A000c response: constraints: - type: uint16 + type: Percent100ths minValue: 0 maxValue: 9999 diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml index 65a06134cee02b..de551662f251b8 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_2.yaml @@ -59,7 +59,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A000e response: constraints: - type: uint16 + type: Percent100ths minValue: 0 maxValue: 9999 @@ -72,7 +72,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A0008 response: constraints: - type: uint8 + type: Percent minValue: 0 maxValue: 99 @@ -85,7 +85,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A000f response: constraints: - type: uint16 + type: Percent100ths minValue: 0 maxValue: 9999 @@ -98,7 +98,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A0009 response: constraints: - type: uint8 + type: Percent minValue: 0 maxValue: 99 @@ -112,7 +112,7 @@ tests: maxInterval: 5 response: constraints: - type: map8 + type: bitmap8 ### MANDATORY Command - label: "2a: TH sends DownOrClose command to DUT" @@ -169,7 +169,7 @@ tests: PICS: WNCV.S.A000a response: constraints: - type: map8 + type: bitmap8 minValue: 10 maxValue: 42 @@ -191,7 +191,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A000e response: constraints: - type: uint16 + type: Percent100ths minValue: 1 maxValue: 10000 @@ -204,7 +204,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A0008 response: constraints: - type: uint8 + type: Percent minValue: 1 maxValue: 100 @@ -217,7 +217,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A000f response: constraints: - type: uint16 + type: Percent100ths minValue: 1 maxValue: 10000 @@ -230,7 +230,7 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A0009 response: constraints: - type: uint8 + type: Percent minValue: 1 maxValue: 100 @@ -280,7 +280,7 @@ tests: PICS: WNCV.S.F00 && WNCV.S.F02 && WNCV.S.A000b response: constraints: - type: uint16 + type: Percent100ths minValue: 1 maxValue: 10000 @@ -293,6 +293,6 @@ tests: PICS: WNCV.S.F01 && WNCV.S.F04 && WNCV.S.A000c response: constraints: - type: uint16 + type: Percent100ths minValue: 1 maxValue: 10000 diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml index 92cf1e63f7e46b..8e5f69b279ad53 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_3.yaml @@ -71,7 +71,7 @@ tests: maxInterval: 5 response: constraints: - type: map8 + type: bitmap8 ### MANDATORY Command - label: "2a: TH sends a StopMotion command to DUT" diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml index 49f015acee6085..608d5d39a31814 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_4.yaml @@ -21,10 +21,10 @@ config: cluster: "Window Covering" endpoint: 1 fastMotionDuration: - type: INT16U + type: int16u defaultValue: 3000 fullMotionDuration: - type: INT16U + type: int16u defaultValue: 6000 tests: diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml index dab1669cb7adb2..2208f81bdfb8f1 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_3_5.yaml @@ -21,10 +21,10 @@ config: cluster: "Window Covering" endpoint: 1 fastMotionDuration: - type: INT16U + type: int16u defaultValue: 3000 fullMotionDuration: - type: INT16U + type: int16u defaultValue: 6000 tests: diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml index d2e1a79ac88a6f..85f93558ad6348 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_1.yaml @@ -21,7 +21,7 @@ config: cluster: "Window Covering" endpoint: 1 fullMotionDuration: - type: INT16U + type: int16u defaultValue: 6000 tests: diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml index b7d2df44d95fe8..a429d1206e9879 100644 --- a/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml +++ b/src/app/tests/suites/certification/Test_TC_WNCV_4_2.yaml @@ -21,7 +21,7 @@ config: cluster: "Window Covering" endpoint: 1 fullMotionDuration: - type: INT16U + type: int16u defaultValue: 6000 tests: diff --git a/src/app/tests/suites/include/ConstraintsChecker.h b/src/app/tests/suites/include/ConstraintsChecker.h index 3eff23d80ac761..6578a4d7610e61 100644 --- a/src/app/tests/suites/include/ConstraintsChecker.h +++ b/src/app/tests/suites/include/ConstraintsChecker.h @@ -34,7 +34,13 @@ class ConstraintsChecker bool CheckConstraintType(const char * itemName, const char * current, const char * expected) { - ChipLogError(chipTool, "Warning: %s type checking is not implemented yet. Expected type: '%s'", itemName, expected); + if (strcmp(current, expected) != 0) + { + Exit(std::string(itemName) + " type (" + std::string(current) + ") is different than the expected type (" + + std::string(expected) + ")."); + return false; + } + return true; } diff --git a/src/app/zap-templates/common/ClusterTestGeneration.js b/src/app/zap-templates/common/ClusterTestGeneration.js index 6a3afd703992bc..88b15d029d6e29 100644 --- a/src/app/zap-templates/common/ClusterTestGeneration.js +++ b/src/app/zap-templates/common/ClusterTestGeneration.js @@ -25,6 +25,9 @@ const path = require('path'); // Import helpers from zap core const templateUtil = require(zapPath + 'dist/src-electron/generator/template-util.js') +const zclHelper = require(zapPath + 'dist/src-electron/generator/helper-zcl.js'); +const queryEnum = require(zapPath + 'dist/src-electron/db/query-enum'); +const queryBitmap = require(zapPath + 'dist/src-electron/db/query-bitmap'); const { getClusters, getCommands, getAttributes, getEvents, isTestOnlyCluster } = require('./simulated-clusters/SimulatedClusters.js'); @@ -1025,6 +1028,30 @@ function chip_tests_iterate_constraints(constraints, options) return asBlocks.call(this, Promise.resolve(values), options) } +async function asTestType(type, isList) +{ + if (isList) { + return 'list'; + } + + const pkgId = await templateUtil.ensureZclPackageId(this); + const db = this.global.db; + + const isEnum = await zclHelper.isEnum(db, type, pkgId); + if (isEnum != 'unknown') { + const enumObj = await queryEnum.selectEnumByName(db, type, pkgId); + return 'enum' + (8 * enumObj.size); + } + + const isBitmap = await zclHelper.isBitmap(db, type, pkgId); + if (isBitmap != 'unknown') { + const bitmapObj = await queryBitmap.selectBitmapByName(db, pkgId, type); + return 'bitmap' + (8 * bitmapObj.size); + } + + return type; +} + // // Module exports // @@ -1057,3 +1084,4 @@ exports.octetStringLengthFromHexString = octetStringLengthFromHexSt exports.octetStringFromHexString = octetStringFromHexString; exports.chip_tests_iterate_expected_list = chip_tests_iterate_expected_list; exports.chip_tests_iterate_constraints = chip_tests_iterate_constraints; +exports.asTestType = asTestType; diff --git a/src/app/zap-templates/common/override.js b/src/app/zap-templates/common/override.js index 429c37c9d4f41c..381db17a5ebae3 100644 --- a/src/app/zap-templates/common/override.js +++ b/src/app/zap-templates/common/override.js @@ -73,6 +73,7 @@ function atomicType(arg) case 'epoch_us': return 'uint64_t'; case 'epoch_s': + case 'utc': return 'uint32_t'; default: throw 'not overriding'; diff --git a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml index 25f79b10d73e59..b9ef8a0b06a4bd 100644 --- a/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/application-basic-cluster.xml @@ -25,7 +25,7 @@ limitations under the License. true This cluster provides information about an application running on a TV or media player device which is represented as an endpoint. VendorName - VendorID + VendorID ApplicationName ProductID Application diff --git a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml index ce0c3d27ce4faf..a7356263f60138 100644 --- a/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/operational-credentials-cluster.xml @@ -61,7 +61,7 @@ limitations under the License. SupportedFabrics CommissionedFabrics TrustedRootCertificates - CurrentFabricIndex + CurrentFabricIndex Sender is requesting attestation information from the receiver. diff --git a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml index b1f0608e9f0be5..00d568567a8ddc 100644 --- a/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml +++ b/src/app/zap-templates/zcl/data-model/chip/thermostat-cluster.xml @@ -111,7 +111,7 @@ limitations under the License. ThermostatRunningState SetpointChangeSource SetpointChangeAmount - SetpointChangeSourceTimestamp + SetpointChangeSourceTimestamp OccupiedSetback diff --git a/src/controller/data_model/controller-clusters.matter b/src/controller/data_model/controller-clusters.matter index f72c864b365bfd..d423ab0497bdf8 100644 --- a/src/controller/data_model/controller-clusters.matter +++ b/src/controller/data_model/controller-clusters.matter @@ -1808,7 +1808,7 @@ client cluster OperationalCredentials = 62 { readonly attribute int8u supportedFabrics = 2; readonly attribute int8u commissionedFabrics = 3; readonly attribute OCTET_STRING trustedRootCertificates[] = 4; - readonly attribute fabric_idx currentFabricIndex = 5; + readonly attribute int8u currentFabricIndex = 5; readonly attribute command_id generatedCommandList[] = 65528; readonly attribute command_id acceptedCommandList[] = 65529; readonly attribute attrib_id attributeList[] = 65531; @@ -4012,7 +4012,7 @@ client cluster ApplicationBasic = 1293 { } readonly attribute char_string<32> vendorName = 0; - readonly attribute int16u vendorID = 1; + readonly attribute vendor_id vendorID = 1; readonly attribute char_string<32> applicationName = 2; readonly attribute int16u productID = 3; readonly attribute ApplicationBasicApplication application = 4; diff --git a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp index af18e87a079d4f..c21a0947ccea70 100644 --- a/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp +++ b/src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp @@ -16388,7 +16388,7 @@ jobject DecodeAttributeValue(const app::ConcreteAttributePath & aPath, TLV::TLVR std::string valueClassName = "java/lang/Integer"; std::string valueCtorSignature = "(I)V"; chip::JniReferences::GetInstance().CreateBoxedObject(valueClassName.c_str(), valueCtorSignature.c_str(), - cppValue, value); + static_cast(cppValue), value); return value; } case Attributes::ApplicationName::Id: { diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp index c9bbe64cc955f9..2cf7e3f32c7e26 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.cpp +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.cpp @@ -12245,65 +12245,6 @@ void CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback::Callbac env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } -CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback( - jobject javaCallback, bool keepAlive) : - chip::Callback::Callback(CallbackFn, this), - keepAlive(keepAlive) -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - return; - } - - javaCallbackRef = env->NewGlobalRef(javaCallback); - if (javaCallbackRef == nullptr) - { - ChipLogError(Zcl, "Could not create global reference for Java callback"); - } -} - -CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::~CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback() -{ - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - if (env == nullptr) - { - ChipLogError(Zcl, "Could not delete global reference for Java callback"); - return; - } - env->DeleteGlobalRef(javaCallbackRef); -} - -void CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback::CallbackFn(void * context, chip::FabricIndex value) -{ - chip::DeviceLayer::StackUnlock unlock; - CHIP_ERROR err = CHIP_NO_ERROR; - JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); - jobject javaCallbackRef; - - VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); - std::unique_ptr cppCallback( - reinterpret_cast(context), maybeDestroy); - - // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. - javaCallbackRef = cppCallback.get()->javaCallbackRef; - VerifyOrReturn(javaCallbackRef != nullptr, - ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); - - jmethodID javaMethod; - err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); - - jobject javaValue; - std::string javaValueClassName = "java/lang/Integer"; - std::string javaValueCtorSignature = "(I)V"; - chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), value, - javaValue); - - env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); -} - CHIPOperationalCredentialsGeneratedCommandListAttributeCallback::CHIPOperationalCredentialsGeneratedCommandListAttributeCallback( jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), @@ -24323,6 +24264,63 @@ void CHIPApplicationLauncherAttributeListAttributeCallback::CallbackFn( env->CallVoidMethod(javaCallbackRef, javaMethod, arrayListObj); } +CHIPApplicationBasicVendorIDAttributeCallback::CHIPApplicationBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive) : + chip::Callback::Callback(CallbackFn, this), keepAlive(keepAlive) +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + return; + } + + javaCallbackRef = env->NewGlobalRef(javaCallback); + if (javaCallbackRef == nullptr) + { + ChipLogError(Zcl, "Could not create global reference for Java callback"); + } +} + +CHIPApplicationBasicVendorIDAttributeCallback::~CHIPApplicationBasicVendorIDAttributeCallback() +{ + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + if (env == nullptr) + { + ChipLogError(Zcl, "Could not delete global reference for Java callback"); + return; + } + env->DeleteGlobalRef(javaCallbackRef); +} + +void CHIPApplicationBasicVendorIDAttributeCallback::CallbackFn(void * context, chip::VendorId value) +{ + chip::DeviceLayer::StackUnlock unlock; + CHIP_ERROR err = CHIP_NO_ERROR; + JNIEnv * env = chip::JniReferences::GetInstance().GetEnvForCurrentThread(); + jobject javaCallbackRef; + + VerifyOrReturn(env != nullptr, ChipLogError(Zcl, "Could not get JNI env")); + std::unique_ptr cppCallback( + reinterpret_cast(context), maybeDestroy); + + // It's valid for javaCallbackRef to be nullptr if the Java code passed in a null callback. + javaCallbackRef = cppCallback.get()->javaCallbackRef; + VerifyOrReturn(javaCallbackRef != nullptr, + ChipLogProgress(Zcl, "Early return from attribute callback since Java callback is null")); + + jmethodID javaMethod; + err = chip::JniReferences::GetInstance().FindMethod(env, javaCallbackRef, "onSuccess", "(Ljava/lang/Integer;)V", &javaMethod); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Could not find onSuccess() method")); + + jobject javaValue; + std::string javaValueClassName = "java/lang/Integer"; + std::string javaValueCtorSignature = "(I)V"; + chip::JniReferences::GetInstance().CreateBoxedObject(javaValueClassName.c_str(), javaValueCtorSignature.c_str(), + static_cast(value), javaValue); + + env->CallVoidMethod(javaCallbackRef, javaMethod, javaValue); +} + CHIPApplicationBasicAllowedVendorListAttributeCallback::CHIPApplicationBasicAllowedVendorListAttributeCallback(jobject javaCallback, bool keepAlive) : chip::Callback::Callback(CallbackFn, this), diff --git a/src/controller/java/zap-generated/CHIPReadCallbacks.h b/src/controller/java/zap-generated/CHIPReadCallbacks.h index ebce0164633adc..992e58ddaf34de 100644 --- a/src/controller/java/zap-generated/CHIPReadCallbacks.h +++ b/src/controller/java/zap-generated/CHIPReadCallbacks.h @@ -5054,36 +5054,6 @@ class CHIPOperationalCredentialsTrustedRootCertificatesAttributeCallback bool keepAlive; }; -class CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback - : public chip::Callback::Callback -{ -public: - CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback(jobject javaCallback, bool keepAlive = false); - - ~CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback(); - - static void maybeDestroy(CHIPOperationalCredentialsCurrentFabricIndexAttributeCallback * callback) - { - if (!callback->keepAlive) - { - callback->Cancel(); - chip::Platform::Delete(callback); - } - } - - static void CallbackFn(void * context, chip::FabricIndex value); - static void OnSubscriptionEstablished(void * context) - { - CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( - reinterpret_cast(context)->javaCallbackRef); - VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); - }; - -private: - jobject javaCallbackRef; - bool keepAlive; -}; - class CHIPOperationalCredentialsGeneratedCommandListAttributeCallback : public chip::Callback::Callback { @@ -10172,6 +10142,36 @@ class CHIPApplicationLauncherAttributeListAttributeCallback bool keepAlive; }; +class CHIPApplicationBasicVendorIDAttributeCallback + : public chip::Callback::Callback +{ +public: + CHIPApplicationBasicVendorIDAttributeCallback(jobject javaCallback, bool keepAlive = false); + + ~CHIPApplicationBasicVendorIDAttributeCallback(); + + static void maybeDestroy(CHIPApplicationBasicVendorIDAttributeCallback * callback) + { + if (!callback->keepAlive) + { + callback->Cancel(); + chip::Platform::Delete(callback); + } + } + + static void CallbackFn(void * context, chip::VendorId value); + static void OnSubscriptionEstablished(void * context) + { + CHIP_ERROR err = chip::JniReferences::GetInstance().CallSubscriptionEstablished( + reinterpret_cast(context)->javaCallbackRef); + VerifyOrReturn(err == CHIP_NO_ERROR, ChipLogError(Zcl, "Error calling onSubscriptionEstablished: %s", ErrorStr(err))); + }; + +private: + jobject javaCallbackRef; + bool keepAlive; +}; + class CHIPApplicationBasicAllowedVendorListAttributeCallback : public chip::Callback::Callback { diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java index 6ca633c3564afe..6a3e45eca10dc1 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ChipClusters.java @@ -10038,14 +10038,6 @@ public interface TrustedRootCertificatesAttributeCallback { default void onSubscriptionEstablished() {} } - public interface CurrentFabricIndexAttributeCallback { - void onSuccess(Integer value); - - void onError(Exception ex); - - default void onSubscriptionEstablished() {} - } - public interface GeneratedCommandListAttributeCallback { void onSuccess(List valueList); @@ -10116,12 +10108,12 @@ public void subscribeTrustedRootCertificatesAttribute( subscribeTrustedRootCertificatesAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readCurrentFabricIndexAttribute(CurrentFabricIndexAttributeCallback callback) { + public void readCurrentFabricIndexAttribute(IntegerAttributeCallback callback) { readCurrentFabricIndexAttribute(chipClusterPtr, callback); } public void subscribeCurrentFabricIndexAttribute( - CurrentFabricIndexAttributeCallback callback, int minInterval, int maxInterval) { + IntegerAttributeCallback callback, int minInterval, int maxInterval) { subscribeCurrentFabricIndexAttribute(chipClusterPtr, callback, minInterval, maxInterval); } @@ -10203,13 +10195,10 @@ private native void subscribeTrustedRootCertificatesAttribute( int maxInterval); private native void readCurrentFabricIndexAttribute( - long chipClusterPtr, CurrentFabricIndexAttributeCallback callback); + long chipClusterPtr, IntegerAttributeCallback callback); private native void subscribeCurrentFabricIndexAttribute( - long chipClusterPtr, - CurrentFabricIndexAttributeCallback callback, - int minInterval, - int maxInterval); + long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); private native void readGeneratedCommandListAttribute( long chipClusterPtr, GeneratedCommandListAttributeCallback callback); @@ -21090,6 +21079,14 @@ public ApplicationBasicCluster(long devicePtr, int endpointId) { @Override public native long initWithDevice(long devicePtr, int endpointId); + public interface VendorIDAttributeCallback { + void onSuccess(Integer value); + + void onError(Exception ex); + + default void onSubscriptionEstablished() {} + } + public interface AllowedVendorListAttributeCallback { void onSuccess(List valueList); @@ -21131,12 +21128,12 @@ public void subscribeVendorNameAttribute( subscribeVendorNameAttribute(chipClusterPtr, callback, minInterval, maxInterval); } - public void readVendorIDAttribute(IntegerAttributeCallback callback) { + public void readVendorIDAttribute(VendorIDAttributeCallback callback) { readVendorIDAttribute(chipClusterPtr, callback); } public void subscribeVendorIDAttribute( - IntegerAttributeCallback callback, int minInterval, int maxInterval) { + VendorIDAttributeCallback callback, int minInterval, int maxInterval) { subscribeVendorIDAttribute(chipClusterPtr, callback, minInterval, maxInterval); } @@ -21240,10 +21237,10 @@ private native void subscribeVendorNameAttribute( int maxInterval); private native void readVendorIDAttribute( - long chipClusterPtr, IntegerAttributeCallback callback); + long chipClusterPtr, VendorIDAttributeCallback callback); private native void subscribeVendorIDAttribute( - long chipClusterPtr, IntegerAttributeCallback callback, int minInterval, int maxInterval); + long chipClusterPtr, VendorIDAttributeCallback callback, int minInterval, int maxInterval); private native void readApplicationNameAttribute( long chipClusterPtr, CharStringAttributeCallback callback); diff --git a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java index 6ad1a6f0886652..b38fa1876d9b89 100644 --- a/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java +++ b/src/controller/java/zap-generated/chip/devicecontroller/ClusterReadMapping.java @@ -5439,9 +5439,7 @@ public Map> getReadAttributeMap() { (cluster, callback, commandArguments) -> { ((ChipClusters.OperationalCredentialsCluster) cluster) .readCurrentFabricIndexAttribute( - (ChipClusters.OperationalCredentialsCluster - .CurrentFabricIndexAttributeCallback) - callback); + (ChipClusters.IntegerAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readOperationalCredentialsCurrentFabricIndexCommandParams); @@ -10852,7 +10850,8 @@ public Map> getReadAttributeMap() { new InteractionInfo( (cluster, callback, commandArguments) -> { ((ChipClusters.ApplicationBasicCluster) cluster) - .readVendorIDAttribute((ChipClusters.IntegerAttributeCallback) callback); + .readVendorIDAttribute( + (ChipClusters.ApplicationBasicCluster.VendorIDAttributeCallback) callback); }, () -> new ClusterInfoMapping.DelegatedIntegerAttributeCallback(), readApplicationBasicVendorIDCommandParams); diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm index 4b61ec50ed0351..1e7efee40675ef 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm @@ -14216,7 +14216,7 @@ id MTRDecodeAttributeValue(const ConcreteAttributePath & aPath, TLV::TLVReader & return nil; } NSNumber * _Nonnull value; - value = [NSNumber numberWithUnsignedShort:cppValue]; + value = [NSNumber numberWithUnsignedShort:chip::to_underlying(cppValue)]; return value; } case Attributes::ApplicationName::Id: { diff --git a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm index a4d48da55aa9c1..c34aa77a252490 100644 --- a/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm +++ b/src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm @@ -65231,9 +65231,9 @@ new MTRCharStringAttributeCallbackBridge(queue, completionHandler, ^(Cancelable - (void)readAttributeVendorIDWithCompletionHandler:(void (^)( NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new MTRInt16uAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new MTRVendorIdAttributeCallbackBridge(self.callbackQueue, completionHandler, ^(Cancelable * success, Cancelable * failure) { using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster->ReadAttribute(successFn->mContext, successFn->mCall, failureFn->mCall); }); @@ -65245,7 +65245,7 @@ - (void)subscribeAttributeVendorIDWithMinInterval:(NSNumber * _Nonnull)minInterv subscriptionEstablished:(SubscriptionEstablishedHandler _Nullable)subscriptionEstablishedHandler reportHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))reportHandler { - new MTRInt16uAttributeCallbackSubscriptionBridge( + new MTRVendorIdAttributeCallbackSubscriptionBridge( self.callbackQueue, reportHandler, ^(Cancelable * success, Cancelable * failure) { if (params != nil && params.autoResubscribe != nil && ![params.autoResubscribe boolValue]) { @@ -65253,11 +65253,11 @@ new MTRInt16uAttributeCallbackSubscriptionBridge( return CHIP_ERROR_INVALID_ARGUMENT; } using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo; - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); auto failureFn = Callback::FromCancelable(failure); return self.cppCluster->SubscribeAttribute(successFn->mContext, successFn->mCall, failureFn->mCall, [minInterval unsignedShortValue], [maxInterval unsignedShortValue], - MTRInt16uAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil, + MTRVendorIdAttributeCallbackSubscriptionBridge::OnSubscriptionEstablished, nil, params == nil || params.fabricFiltered == nil || [params.fabricFiltered boolValue], params != nil && params.keepPreviousSubscriptions != nil && [params.keepPreviousSubscriptions boolValue]); }, @@ -65269,7 +65269,7 @@ + (void)readAttributeVendorIDWithAttributeCache:(MTRAttributeCacheContainer *)at queue:(dispatch_queue_t)queue completionHandler:(void (^)(NSNumber * _Nullable value, NSError * _Nullable error))completionHandler { - new MTRInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { + new MTRVendorIdAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * success, Cancelable * failure) { if (attributeCacheContainer.cppAttributeCache) { chip::app::ConcreteAttributePath path; using TypeInfo = ApplicationBasic::Attributes::VendorID::TypeInfo; @@ -65278,7 +65278,7 @@ new MTRInt16uAttributeCallbackBridge(queue, completionHandler, ^(Cancelable * su path.mAttributeId = TypeInfo::GetAttributeId(); TypeInfo::DecodableType value; CHIP_ERROR err = attributeCacheContainer.cppAttributeCache->Get(path, value); - auto successFn = Callback::FromCancelable(success); + auto successFn = Callback::FromCancelable(success); if (err == CHIP_NO_ERROR) { successFn->mCall(successFn->mContext, value); } diff --git a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h index bf73c8371b1f7a..c815d6432ffbf9 100644 --- a/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-app/zap-generated/endpoint_config.h @@ -721,7 +721,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ @@ -1257,7 +1257,7 @@ \ /* Endpoint: 1, Cluster: Application Basic (server) */ \ { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ - { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ + { 0x00000001, ZAP_TYPE(VENDOR_ID), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationName */ \ { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* ProductID */ \ { 0x00000005, ZAP_TYPE(ENUM8), 1, 0, ZAP_EMPTY_DEFAULT() }, /* Status */ \ diff --git a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h index 7da5f608c4d2e0..ea5df11f3c0d4e 100644 --- a/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h +++ b/zzz_generated/all-clusters-minimal-app/zap-generated/endpoint_config.h @@ -527,7 +527,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp index ef79df312b8fc1..bb816fa71b9696 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp @@ -9937,9 +9937,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) namespace CurrentFabricIndex { -EmberAfStatus Get(chip::EndpointId endpoint, chip::FabricIndex * value) +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::OperationalCredentials::Id, Id, readable, sizeof(temp)); @@ -9951,9 +9951,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, chip::FabricIndex * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, chip::FabricIndex value) +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -9961,7 +9961,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::FabricIndex value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::OperationalCredentials::Id, Id, writable, ZCL_FABRIC_IDX_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::OperationalCredentials::Id, Id, writable, ZCL_INT8U_ATTRIBUTE_TYPE); } } // namespace CurrentFabricIndex @@ -15802,7 +15802,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_EPOCH_S_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::Thermostat::Id, Id, writable, ZCL_UTC_ATTRIBUTE_TYPE); } } // namespace SetpointChangeSourceTimestamp @@ -22788,9 +22788,9 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value) namespace VendorID { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) +EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; Traits::StorageType temp; uint8_t * readable = Traits::ToAttributeStoreRepresentation(temp); EmberAfStatus status = emberAfReadServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, readable, sizeof(temp)); @@ -22802,9 +22802,9 @@ EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value) *value = Traits::StorageToWorking(temp); return status; } -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) +EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value) { - using Traits = NumericAttributeTraits; + using Traits = NumericAttributeTraits; if (!Traits::CanRepresentValue(/* isNullable = */ false, value)) { return EMBER_ZCL_STATUS_CONSTRAINT_ERROR; @@ -22812,7 +22812,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value) Traits::StorageType storageValue; Traits::WorkingToStorage(value, storageValue); uint8_t * writable = Traits::ToAttributeStoreRepresentation(storageValue); - return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_INT16U_ATTRIBUTE_TYPE); + return emberAfWriteServerAttribute(endpoint, Clusters::ApplicationBasic::Id, Id, writable, ZCL_VENDOR_ID_ATTRIBUTE_TYPE); } } // namespace VendorID diff --git a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h index 4f45aeed5e5810..3223dd34192ddf 100644 --- a/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h +++ b/zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h @@ -1745,8 +1745,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace CommissionedFabrics namespace CurrentFabricIndex { -EmberAfStatus Get(chip::EndpointId endpoint, chip::FabricIndex * value); // fabric_idx -EmberAfStatus Set(chip::EndpointId endpoint, chip::FabricIndex value); +EmberAfStatus Get(chip::EndpointId endpoint, uint8_t * value); // int8u +EmberAfStatus Set(chip::EndpointId endpoint, uint8_t value); } // namespace CurrentFabricIndex namespace FeatureMap { @@ -2706,7 +2706,7 @@ EmberAfStatus Set(chip::EndpointId endpoint, const chip::app::DataModel::Nullabl } // namespace SetpointChangeAmount namespace SetpointChangeSourceTimestamp { -EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // epoch_s +EmberAfStatus Get(chip::EndpointId endpoint, uint32_t * value); // utc EmberAfStatus Set(chip::EndpointId endpoint, uint32_t value); } // namespace SetpointChangeSourceTimestamp @@ -3866,8 +3866,8 @@ EmberAfStatus Set(chip::EndpointId endpoint, chip::CharSpan value); } // namespace VendorName namespace VendorID { -EmberAfStatus Get(chip::EndpointId endpoint, uint16_t * value); // int16u -EmberAfStatus Set(chip::EndpointId endpoint, uint16_t value); +EmberAfStatus Get(chip::EndpointId endpoint, chip::VendorId * value); // vendor_id +EmberAfStatus Set(chip::EndpointId endpoint, chip::VendorId value); } // namespace VendorID namespace ApplicationName { diff --git a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h index 397bb8960d9de4..69612378441571 100644 --- a/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h +++ b/zzz_generated/app-common/app-common/zap-generated/cluster-objects.h @@ -11481,9 +11481,9 @@ struct TypeInfo namespace CurrentFabricIndex { struct TypeInfo { - using Type = chip::FabricIndex; - using DecodableType = chip::FabricIndex; - using DecodableArgType = chip::FabricIndex; + using Type = uint8_t; + using DecodableType = uint8_t; + using DecodableArgType = uint8_t; static constexpr ClusterId GetClusterId() { return Clusters::OperationalCredentials::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::CurrentFabricIndex::Id; } @@ -11534,7 +11534,7 @@ struct TypeInfo Attributes::SupportedFabrics::TypeInfo::DecodableType supportedFabrics = static_cast(0); Attributes::CommissionedFabrics::TypeInfo::DecodableType commissionedFabrics = static_cast(0); Attributes::TrustedRootCertificates::TypeInfo::DecodableType trustedRootCertificates; - Attributes::CurrentFabricIndex::TypeInfo::DecodableType currentFabricIndex = static_cast(0); + Attributes::CurrentFabricIndex::TypeInfo::DecodableType currentFabricIndex = static_cast(0); Attributes::GeneratedCommandList::TypeInfo::DecodableType generatedCommandList; Attributes::AcceptedCommandList::TypeInfo::DecodableType acceptedCommandList; Attributes::AttributeList::TypeInfo::DecodableType attributeList; @@ -22645,9 +22645,9 @@ struct TypeInfo namespace VendorID { struct TypeInfo { - using Type = uint16_t; - using DecodableType = uint16_t; - using DecodableArgType = uint16_t; + using Type = chip::VendorId; + using DecodableType = chip::VendorId; + using DecodableArgType = chip::VendorId; static constexpr ClusterId GetClusterId() { return Clusters::ApplicationBasic::Id; } static constexpr AttributeId GetAttributeId() { return Attributes::VendorID::Id; } @@ -22768,7 +22768,7 @@ struct TypeInfo CHIP_ERROR Decode(TLV::TLVReader & reader, const ConcreteAttributePath & path); Attributes::VendorName::TypeInfo::DecodableType vendorName; - Attributes::VendorID::TypeInfo::DecodableType vendorID = static_cast(0); + Attributes::VendorID::TypeInfo::DecodableType vendorID = static_cast(0); Attributes::ApplicationName::TypeInfo::DecodableType applicationName; Attributes::ProductID::TypeInfo::DecodableType productID = static_cast(0); Attributes::Application::TypeInfo::DecodableType application; diff --git a/zzz_generated/bridge-app/zap-generated/endpoint_config.h b/zzz_generated/bridge-app/zap-generated/endpoint_config.h index b94e0d3dc0f3ab..e0ac99ebe511d2 100644 --- a/zzz_generated/bridge-app/zap-generated/endpoint_config.h +++ b/zzz_generated/bridge-app/zap-generated/endpoint_config.h @@ -414,7 +414,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h index 6f1df065451ab7..d2cdcf6f8f4f20 100644 --- a/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-noip_rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h @@ -382,7 +382,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h index 720d1f510d6ac8..bcc942c9abadf3 100644 --- a/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_contactsensor_lFAGG1bfRO/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h index 021eb8abc20846..7badcd7019d4dd 100644 --- a/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_dimmablelight_bCwGYSDpoe/zap-generated/endpoint_config.h @@ -394,7 +394,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h index 4e01a3f3e186d1..91350e91ff9f31 100644 --- a/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_flowsensor_1zVxHedlaV/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h index 7915e261cd5d6d..7e8552964f48e3 100644 --- a/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_heatingcoolingunit_ncdGai1E5a/zap-generated/endpoint_config.h @@ -397,7 +397,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h index 01a76aa0e643da..b3758058fd10cf 100644 --- a/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_humiditysensor_Xyj4gda6Hb/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h index 34697a561e01d5..237b41ab14f7f9 100644 --- a/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_lightsensor_lZQycTFcJK/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h index 9c0cede84b8154..777e3e925bb60f 100644 --- a/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_occupancysensor_iHyVgifZuo/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h index 17e77f9a6c34ad..80ac5467089dad 100644 --- a/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onofflight_bbs1b7IaOV/zap-generated/endpoint_config.h @@ -394,7 +394,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h index 777c9b1217935a..b6c18a45f323e5 100644 --- a/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onofflightswitch_FsPlMr090Q/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h index 4e06d72cd55ee4..bbe523e4b88f85 100644 --- a/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_onoffpluginunit_Wtf8ss5EBY/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h index b8b1bf0427bff6..dc52e758ac44de 100644 --- a/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_pressuresensor_s0qC9wLH4k/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h index 3b140fa88a0aa9..4d8abdc6628cae 100644 --- a/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_speaker_RpzeXdimqA/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h index 22a567ed0e9fd2..9b53c9f83db383 100644 --- a/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_temperaturesensor_Qy1zkNW7c3/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h index 9d7c4c63106df6..bebb2854973bb1 100644 --- a/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_thermostat_bm3fb8dhYi/zap-generated/endpoint_config.h @@ -411,7 +411,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h index 4bc1ccb9e3ef03..a0233a76958356 100644 --- a/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h +++ b/zzz_generated/chef-rootnode_windowcovering_RLCxaGi9Yx/zap-generated/endpoint_config.h @@ -391,7 +391,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0001) }, /* ClusterRevision */ \ diff --git a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp index 295dde68968614..56946e74d7efe5 100644 --- a/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp +++ b/zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp @@ -6281,7 +6281,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("TrustedRootCertificates", 1, value); } case OperationalCredentials::Attributes::CurrentFabricIndex::Id: { - chip::FabricIndex value; + uint8_t value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("CurrentFabricIndex", 1, value); } @@ -8714,7 +8714,7 @@ CHIP_ERROR DataModelLogger::LogAttribute(const chip::app::ConcreteDataAttributeP return DataModelLogger::LogValue("VendorName", 1, value); } case ApplicationBasic::Attributes::VendorID::Id: { - uint16_t value; + chip::VendorId value; ReturnErrorOnFailure(chip::app::DataModel::Decode(*data, value)); return DataModelLogger::LogValue("VendorID", 1, value); } diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index 85b525d92b0364..3096464c7ce996 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -1917,7 +1917,7 @@ class Test_TC_BOOL_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -1926,7 +1926,7 @@ class Test_TC_BOOL_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -1934,7 +1934,7 @@ class Test_TC_BOOL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); @@ -1952,7 +1952,7 @@ class Test_TC_BOOL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -1964,7 +1964,7 @@ class Test_TC_BOOL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -2079,7 +2079,7 @@ class Test_TC_BOOL_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; default: @@ -2161,7 +2161,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -2170,7 +2170,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -2178,7 +2178,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } @@ -2188,7 +2188,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -2199,7 +2199,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 11)); } break; @@ -2212,7 +2212,7 @@ class Test_TC_ACT_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -2334,7 +2334,7 @@ class Test_TC_CC_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -2342,7 +2342,7 @@ class Test_TC_CC_1_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 31UL)); } @@ -2352,7 +2352,7 @@ class Test_TC_CC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 8UL)); VerifyOrReturn(CheckConstraintContains("value", value, 15UL)); VerifyOrReturn(CheckConstraintContains("value", value, 16385UL)); @@ -2369,7 +2369,7 @@ class Test_TC_CC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -2381,7 +2381,7 @@ class Test_TC_CC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -2500,7 +2500,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -2510,7 +2510,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -2520,7 +2520,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -2530,7 +2530,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2540,7 +2540,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2550,7 +2550,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4U)); } @@ -2560,7 +2560,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 254)); } break; @@ -2569,7 +2569,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2579,7 +2579,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2U)); } @@ -2589,7 +2589,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bitmap8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4U)); } @@ -2599,7 +2599,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -2609,7 +2609,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -2619,7 +2619,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -2629,7 +2629,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -2639,7 +2639,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -2649,7 +2649,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -2659,7 +2659,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -2678,7 +2678,7 @@ class Test_TC_CC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorCapabilities", value, FeatureMapValue)); - VerifyOrReturn(CheckConstraintType("value", "", "map16")); + VerifyOrReturn(CheckConstraintType("value", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 31U)); } @@ -2688,7 +2688,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2698,7 +2698,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2708,7 +2708,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2718,7 +2718,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2728,7 +2728,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 6U)); } @@ -2810,7 +2810,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2820,7 +2820,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2830,7 +2830,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2840,7 +2840,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2850,7 +2850,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -2860,7 +2860,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2870,7 +2870,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2880,7 +2880,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -2890,7 +2890,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2900,7 +2900,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -2910,7 +2910,7 @@ class Test_TC_CC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -3431,7 +3431,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3448,7 +3448,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3462,7 +3462,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3476,7 +3476,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3493,7 +3493,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentHueValue = value; @@ -3523,7 +3523,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3537,7 +3537,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3551,7 +3551,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3568,7 +3568,7 @@ class Test_TC_CC_3_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentHueValueAfterStopmode = value; @@ -3910,7 +3910,7 @@ class Test_TC_CC_3_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3927,7 +3927,7 @@ class Test_TC_CC_3_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 5U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -3944,7 +3944,7 @@ class Test_TC_CC_3_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 249U)); } @@ -4143,7 +4143,7 @@ class Test_TC_CC_4_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4162,7 +4162,7 @@ class Test_TC_CC_4_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentSaturation", value, mSaturationConfigValue.HasValue() ? mSaturationConfigValue.Value() : 90U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4336,7 +4336,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4353,7 +4353,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4367,7 +4367,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4381,7 +4381,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4398,7 +4398,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4412,7 +4412,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4426,7 +4426,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4443,7 +4443,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4460,7 +4460,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentSaturationStep4d = value; @@ -4490,7 +4490,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentSaturationStep5b = value; @@ -4505,7 +4505,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, CurrentSaturationStep5b)); } @@ -4522,7 +4522,7 @@ class Test_TC_CC_4_2Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentSaturationStep5d = value; @@ -4931,7 +4931,7 @@ class Test_TC_CC_4_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4948,7 +4948,7 @@ class Test_TC_CC_4_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -4965,7 +4965,7 @@ class Test_TC_CC_4_3Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -5166,7 +5166,7 @@ class Test_TC_CC_4_4Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -5176,7 +5176,7 @@ class Test_TC_CC_4_4Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -5194,7 +5194,7 @@ class Test_TC_CC_4_4Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentHue", value, mHueConfigValue.HasValue() ? mHueConfigValue.Value() : 40U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -5206,7 +5206,7 @@ class Test_TC_CC_4_4Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentSaturation", value, mSaturationConfigValue.HasValue() ? mSaturationConfigValue.Value() : 160U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -5391,7 +5391,7 @@ class Test_TC_CC_5_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5401,7 +5401,7 @@ class Test_TC_CC_5_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5419,7 +5419,7 @@ class Test_TC_CC_5_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentX", value, mColorXConfigValue.HasValue() ? mColorXConfigValue.Value() : 400U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5430,7 +5430,7 @@ class Test_TC_CC_5_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentY", value, mColorYConfigValue.HasValue() ? mColorYConfigValue.Value() : 500U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5620,7 +5620,7 @@ class Test_TC_CC_5_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentXValue = value; @@ -5631,7 +5631,7 @@ class Test_TC_CC_5_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentYValue = value; @@ -5649,7 +5649,7 @@ class Test_TC_CC_5_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, CurrentXValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentXBeforeStopCommand = value; @@ -5660,7 +5660,7 @@ class Test_TC_CC_5_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, CurrentYValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentYBeforeStopCommand = value; @@ -5674,7 +5674,7 @@ class Test_TC_CC_5_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, CurrentXBeforeStopCommand)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5684,7 +5684,7 @@ class Test_TC_CC_5_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, CurrentYBeforeStopCommand)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5895,7 +5895,7 @@ class Test_TC_CC_5_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentXValue = value; @@ -5906,7 +5906,7 @@ class Test_TC_CC_5_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentYValue = value; @@ -5924,7 +5924,7 @@ class Test_TC_CC_5_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, CurrentXValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -5934,7 +5934,7 @@ class Test_TC_CC_5_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, CurrentYValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -6118,7 +6118,7 @@ class Test_TC_CC_6_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTempPhysicalMinMiredsValue = value; @@ -6129,7 +6129,7 @@ class Test_TC_CC_6_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTempPhysicalMaxMiredsValue = value; @@ -6140,7 +6140,7 @@ class Test_TC_CC_6_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6158,7 +6158,7 @@ class Test_TC_CC_6_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorTemperature", value, ColorTempPhysicalMaxMiredsValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6343,7 +6343,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTempPhysicalMinMiredsValue = value; @@ -6354,7 +6354,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTempPhysicalMaxMiredsValue = value; @@ -6365,7 +6365,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6382,7 +6382,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6396,7 +6396,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6410,7 +6410,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6427,7 +6427,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6441,7 +6441,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6455,7 +6455,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6475,7 +6475,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); ColorTemperatureValue = value; @@ -6491,7 +6491,7 @@ class Test_TC_CC_6_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6506,7 +6506,7 @@ class Test_TC_CC_6_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6526,7 +6526,7 @@ class Test_TC_CC_6_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); ColorTemperatureMoveModeStop = value; @@ -6542,7 +6542,7 @@ class Test_TC_CC_6_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureMoveModeStop)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6557,7 +6557,7 @@ class Test_TC_CC_6_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -6965,7 +6965,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTempPhysicalMinMiredsValue = value; @@ -6976,7 +6976,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTempPhysicalMaxMiredsValue = value; @@ -6987,7 +6987,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorTempPhysicalMinMiredsValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, ColorTempPhysicalMaxMiredsValue)); } @@ -7004,7 +7004,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -7018,7 +7018,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -7032,7 +7032,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -7049,7 +7049,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -7063,7 +7063,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -7077,7 +7077,7 @@ class Test_TC_CC_6_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -7347,7 +7347,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7364,7 +7364,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7378,7 +7378,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7392,7 +7392,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7405,7 +7405,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); EnhancedCurrentHueStep3b = value; @@ -7421,7 +7421,7 @@ class Test_TC_CC_7_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enhancedCurrentHue", value, EnhancedCurrentHueStep3b)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7438,7 +7438,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7452,7 +7452,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7466,7 +7466,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7479,7 +7479,7 @@ class Test_TC_CC_7_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); EnhancedCurrentHueStep5b = value; @@ -7495,7 +7495,7 @@ class Test_TC_CC_7_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enhancedCurrentHue", value, EnhancedCurrentHueStep5b)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7810,7 +7810,7 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7827,7 +7827,7 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -7844,7 +7844,7 @@ class Test_TC_CC_7_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -8045,7 +8045,7 @@ class Test_TC_CC_7_4Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -8064,7 +8064,7 @@ class Test_TC_CC_7_4Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enhancedCurrentHue", value, mEnhancedHueConfigValue.HasValue() ? mEnhancedHueConfigValue.Value() : 1200U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -8253,7 +8253,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -8266,7 +8266,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentHueValue = value; @@ -8282,7 +8282,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentHue", value, CurrentHueValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -8295,7 +8295,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -8308,7 +8308,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentSaturationValue = value; @@ -8324,7 +8324,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentSaturation", value, CurrentSaturationValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -8341,7 +8341,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -8351,7 +8351,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -8364,7 +8364,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentXValue = value; @@ -8375,7 +8375,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); CurrentYValue = value; @@ -8391,7 +8391,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentX", value, CurrentXValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -8402,7 +8402,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentY", value, CurrentYValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -8419,7 +8419,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -8432,7 +8432,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); ColorTemperatureMiredsValue = value; @@ -8448,7 +8448,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("colorTemperature", value, ColorTemperatureMiredsValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65279U)); } @@ -8461,7 +8461,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -8474,7 +8474,7 @@ class Test_TC_CC_8_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); EnhancedCurrentHueValue = value; @@ -8490,7 +8490,7 @@ class Test_TC_CC_8_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enhancedCurrentHue", value, EnhancedCurrentHueValue)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -8992,7 +8992,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U)); DataModelRevisionValue = value; @@ -9014,7 +9014,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); if (VendorNameValueBuffer != nullptr) { @@ -9041,7 +9041,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "vendor_id", "vendor_id")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65521U)); VendorIDValue = value; @@ -9063,7 +9063,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); if (ProductNameValueBuffer != nullptr) { @@ -9090,7 +9090,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U)); ProductIDValue = value; @@ -9112,7 +9112,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); if (NodeLabelValueBuffer != nullptr) { @@ -9139,7 +9139,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 16)); } break; @@ -9163,7 +9163,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U)); HardwareVersionValue = value; @@ -9185,7 +9185,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMinLength("value", value, 1)); VerifyOrReturn(CheckConstraintMaxLength("value", value, 64)); if (HardwareVersionStringValueBuffer != nullptr) @@ -9265,7 +9265,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMinLength("value", value, 8)); VerifyOrReturn(CheckConstraintMaxLength("value", value, 16)); if (ManufacturingDateValueBuffer != nullptr) @@ -9297,7 +9297,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); if (PartNumberValueBuffer != nullptr) { @@ -9324,7 +9324,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "long_char_string", "long_char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 256)); if (ProductURLValueBuffer != nullptr) { @@ -9355,7 +9355,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 64)); if (ProductLabelValueBuffer != nullptr) { @@ -9386,7 +9386,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); if (SerialNumberValueBuffer != nullptr) { @@ -9414,7 +9414,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("localConfigDisabled", value, false)); - VerifyOrReturn(CheckConstraintType("value", "", "boolean")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 56: @@ -9434,7 +9434,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("reachable", value, true)); - VerifyOrReturn(CheckConstraintType("value", "", "boolean")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 59: @@ -9445,7 +9445,7 @@ class Test_TC_BINFO_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); if (UniqueIDValueBuffer != nullptr) { @@ -10055,7 +10055,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -10064,7 +10064,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -10072,7 +10072,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -10093,7 +10093,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -10105,7 +10105,7 @@ class Test_TC_DESC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -10220,7 +10220,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10230,7 +10230,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 3: @@ -10238,7 +10238,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 4: @@ -10250,7 +10250,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 6: @@ -10262,7 +10262,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 8: @@ -10274,7 +10274,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 10: @@ -10286,7 +10286,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 12: @@ -10298,7 +10298,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 14: @@ -10310,7 +10310,7 @@ class Test_TC_DGETH_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 16: @@ -10527,7 +10527,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10537,7 +10537,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10547,7 +10547,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10557,7 +10557,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10567,7 +10567,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10577,7 +10577,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10587,7 +10587,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10597,7 +10597,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10607,7 +10607,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10617,7 +10617,7 @@ class Test_TC_DGETH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -10908,7 +10908,7 @@ class Test_TC_FLW_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 3U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -10917,7 +10917,7 @@ class Test_TC_FLW_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -10925,7 +10925,7 @@ class Test_TC_FLW_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -10941,7 +10941,7 @@ class Test_TC_FLW_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -10954,7 +10954,7 @@ class Test_TC_FLW_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -10966,7 +10966,7 @@ class Test_TC_FLW_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -11087,7 +11087,7 @@ class Test_TC_FLW_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -11097,7 +11097,7 @@ class Test_TC_FLW_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -11107,7 +11107,7 @@ class Test_TC_FLW_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -11117,7 +11117,7 @@ class Test_TC_FLW_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2048U)); } @@ -11219,7 +11219,7 @@ class Test_TC_CGEN_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -11228,7 +11228,7 @@ class Test_TC_CGEN_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -11236,7 +11236,7 @@ class Test_TC_CGEN_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -11254,7 +11254,7 @@ class Test_TC_CGEN_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); @@ -11265,7 +11265,7 @@ class Test_TC_CGEN_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); @@ -11383,7 +11383,7 @@ class Test_TC_CGEN_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 2: @@ -11427,7 +11427,7 @@ class Test_TC_CGEN_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; default: @@ -11550,7 +11550,7 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -11559,7 +11559,7 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -11567,7 +11567,7 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 8UL)); @@ -11582,7 +11582,7 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -11595,7 +11595,7 @@ class Test_TC_DGGEN_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; default: @@ -11697,7 +11697,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand chip::app::Clusters::GeneralDiagnostics::Structs::NetworkInterfaceType::DecodableType> value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 2: @@ -11705,7 +11705,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -11735,7 +11735,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 9: @@ -11743,7 +11743,7 @@ class Test_TC_DGGEN_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967294UL)); } @@ -11983,7 +11983,7 @@ class Test_TC_I_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 4U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -11992,7 +11992,7 @@ class Test_TC_I_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -12001,7 +12001,7 @@ class Test_TC_I_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 1UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 4: @@ -12009,7 +12009,7 @@ class Test_TC_I_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); @@ -12024,7 +12024,7 @@ class Test_TC_I_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -12033,7 +12033,7 @@ class Test_TC_I_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 64UL)); } break; @@ -12042,7 +12042,7 @@ class Test_TC_I_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -12055,7 +12055,7 @@ class Test_TC_I_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 9: @@ -12069,7 +12069,7 @@ class Test_TC_I_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("generatedCommandList[0]", iter_0.GetValue(), 0UL)); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 10: @@ -12209,7 +12209,7 @@ class Test_TC_I_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -12219,7 +12219,7 @@ class Test_TC_I_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U)); } @@ -12904,7 +12904,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 3U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -12913,7 +12913,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -12921,7 +12921,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -12937,7 +12937,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -12946,7 +12946,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); } break; @@ -12959,7 +12959,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -12971,7 +12971,7 @@ class Test_TC_ILL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 8: @@ -13098,7 +13098,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U)); } @@ -13108,7 +13108,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65533U)); } @@ -13118,7 +13118,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 2U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65534U)); } @@ -13128,7 +13128,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2048U)); } @@ -13138,7 +13138,7 @@ class Test_TC_ILL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -13246,7 +13246,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -13254,7 +13254,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 7UL)); } @@ -13264,7 +13264,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 15UL)); VerifyOrReturn(CheckConstraintContains("value", value, 17UL)); @@ -13275,7 +13275,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 16384UL)); } @@ -13285,7 +13285,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); VerifyOrReturn(CheckConstraintContains("value", value, 6UL)); @@ -13296,7 +13296,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); } break; @@ -13305,7 +13305,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -13314,7 +13314,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 16UL)); } break; @@ -13323,7 +13323,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 18UL)); } break; @@ -13332,7 +13332,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 19UL)); } break; @@ -13341,7 +13341,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 20UL)); } break; @@ -13350,7 +13350,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -13366,7 +13366,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 8UL)); } break; @@ -13379,7 +13379,7 @@ class Test_TC_LVL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 15: @@ -13557,7 +13557,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); CurrentLevelValue = value; @@ -13568,7 +13568,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -13579,7 +13579,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("minLevel", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); MinLevelValue = value; } break; @@ -13588,7 +13588,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); MinLevelFeatureMapNotSupportedValue = value; @@ -13600,7 +13600,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("maxLevel", value, 254U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinLevelValue)); MaxLevelValue = value; } @@ -13610,7 +13610,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinLevelFeatureMapNotSupportedValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); MaxLevelFeatureMapNotSupportedValue = value; @@ -13621,7 +13621,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinLevelValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxLevelValue)); } @@ -13631,7 +13631,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinLevelFeatureMapNotSupportedValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxLevelFeatureMapNotSupportedValue)); } @@ -13641,7 +13641,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -13651,7 +13651,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); MinFrequencyValue = value; @@ -13662,7 +13662,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); MaxFrequencyValue = value; @@ -13673,7 +13673,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinFrequencyValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxFrequencyValue)); } @@ -13683,7 +13683,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -13693,7 +13693,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinLevelValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxLevelValue)); } @@ -13703,7 +13703,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, MinLevelFeatureMapNotSupportedValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, MaxLevelFeatureMapNotSupportedValue)); } @@ -13713,7 +13713,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -13723,7 +13723,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -13733,7 +13733,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -13744,7 +13744,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("options", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); } break; case 20: @@ -13752,7 +13752,7 @@ class Test_TC_LVL_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -13968,7 +13968,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); OnOffTransitionTimeValue = value; @@ -13985,7 +13985,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand VerifyOrReturn( CheckValue("onOffTransitionTime", value, mOnOffTransitionTimeConfigValue.HasValue() ? mOnOffTransitionTimeConfigValue.Value() : 10U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintNotValue("value", value, OnOffTransitionTimeValue)); } break; @@ -13994,7 +13994,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); OnLevelValue = value; @@ -14011,7 +14011,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand VerifyOrReturn(CheckValueNonNull("onLevel", value)); VerifyOrReturn(CheckValue("onLevel.Value()", value.Value(), mOnLevelConfigValue.HasValue() ? mOnLevelConfigValue.Value() : 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintNotValue("value", value, OnLevelValue)); } break; @@ -14020,7 +14020,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); OnTransitionTimeValue = value; @@ -14037,7 +14037,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand VerifyOrReturn(CheckValueNonNull("onTransitionTime", value)); VerifyOrReturn(CheckValue("onTransitionTime.Value()", value.Value(), mOnTransitionTimeConfigValue.HasValue() ? mOnTransitionTimeConfigValue.Value() : 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintNotValue("value", value, OnTransitionTimeValue)); } break; @@ -14046,7 +14046,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); OffTransitionTimeValue = value; @@ -14063,7 +14063,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand VerifyOrReturn(CheckValueNonNull("offTransitionTime", value)); VerifyOrReturn(CheckValue("offTransitionTime.Value()", value.Value(), mOffTransitionTimeConfigValue.HasValue() ? mOffTransitionTimeConfigValue.Value() : 10U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintNotValue("value", value, OffTransitionTimeValue)); } break; @@ -14072,7 +14072,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); DefaultMoveRatevalue = value; @@ -14089,7 +14089,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand VerifyOrReturn(CheckValueNonNull("defaultMoveRate", value)); VerifyOrReturn(CheckValue("defaultMoveRate.Value()", value.Value(), mDefaultMoveRateConfigValue.HasValue() ? mDefaultMoveRateConfigValue.Value() : 111U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintNotValue("value", value, DefaultMoveRatevalue)); } break; @@ -14098,7 +14098,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); StartUpCurrentLevelValue = value; @@ -14116,7 +14116,7 @@ class Test_TC_LVL_2_2Suite : public TestCommand VerifyOrReturn( CheckValue("startUpCurrentLevel.Value()", value.Value(), mStartUpCurrentLevelConfigValue.HasValue() ? mStartUpCurrentLevelConfigValue.Value() : 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintNotValue("value", value, StartUpCurrentLevelValue)); } break; @@ -14349,7 +14349,7 @@ class Test_TC_LVL_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -14359,7 +14359,7 @@ class Test_TC_LVL_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -14414,7 +14414,7 @@ class Test_TC_LVL_3_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -14699,7 +14699,7 @@ class Test_TC_LVL_4_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); MinlevelValue = value; @@ -14713,7 +14713,7 @@ class Test_TC_LVL_4_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); MaxlevelValue = value; @@ -14764,7 +14764,7 @@ class Test_TC_LVL_4_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); DefaultMoveRateValue = value; @@ -15062,7 +15062,7 @@ class Test_TC_LVL_5_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); MinlevelValue = value; @@ -15080,7 +15080,7 @@ class Test_TC_LVL_5_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentLevel", value, static_cast(MinlevelValue + 1))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); CurrentlevelValue = value; @@ -15092,7 +15092,7 @@ class Test_TC_LVL_5_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentLevel", value, 2U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -15113,7 +15113,7 @@ class Test_TC_LVL_5_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentLevel", value, 66U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); } break; case 13: @@ -15122,7 +15122,7 @@ class Test_TC_LVL_5_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentLevel", value, 66U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); } break; case 14: @@ -15466,7 +15466,7 @@ class Test_TC_LVL_6_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); MinlevelValue = value; @@ -15781,7 +15781,7 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -15790,7 +15790,7 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -15812,7 +15812,7 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("attributeList[4]", iter_0.GetValue(), 65533UL)); VerifyOrReturn(CheckNoMoreListItems("attributeList", iter_0, 5)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 4: @@ -15826,7 +15826,7 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand VerifyOrReturn(CheckValue("acceptedCommandList[0]", iter_0.GetValue(), 0UL)); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -15838,7 +15838,7 @@ class Test_TC_LOWPOWER_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -15955,7 +15955,7 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -15963,7 +15963,7 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 7UL)); } @@ -15973,7 +15973,7 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -15986,7 +15986,7 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -15995,7 +15995,7 @@ class Test_TC_KEYPADINPUT_1_2Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -16115,7 +16115,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -16124,7 +16124,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 1UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -16133,7 +16133,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 4: @@ -16141,7 +16141,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -16154,7 +16154,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -16163,7 +16163,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -16172,7 +16172,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -16183,7 +16183,7 @@ class Test_TC_APPLAUNCHER_1_3Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -16320,7 +16320,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -16328,7 +16328,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1UL)); } @@ -16338,7 +16338,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -16351,7 +16351,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -16360,7 +16360,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -16369,7 +16369,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -16385,7 +16385,7 @@ class Test_TC_MEDIAINPUT_1_4Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 8: @@ -16514,7 +16514,7 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -16523,7 +16523,7 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -16531,7 +16531,7 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -16548,7 +16548,7 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -16560,7 +16560,7 @@ class Test_TC_WAKEONLAN_1_5Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -16677,7 +16677,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -16685,7 +16685,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3UL)); } @@ -16695,7 +16695,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -16708,7 +16708,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -16717,7 +16717,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -16726,7 +16726,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); } break; @@ -16735,7 +16735,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -16744,7 +16744,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); } break; @@ -16753,7 +16753,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -16766,7 +16766,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 11: @@ -16774,7 +16774,7 @@ class Test_TC_CHANNEL_1_6Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -16931,7 +16931,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -16939,7 +16939,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3UL)); } @@ -16949,7 +16949,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); @@ -16963,7 +16963,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -16972,7 +16972,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); } break; @@ -16981,7 +16981,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -16990,7 +16990,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); } break; @@ -16999,7 +16999,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); } break; @@ -17008,7 +17008,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 6UL)); } break; @@ -17017,7 +17017,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -17028,7 +17028,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -17037,7 +17037,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); } break; @@ -17046,7 +17046,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); } break; @@ -17055,7 +17055,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 6UL)); } break; @@ -17064,7 +17064,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 7UL)); } break; @@ -17073,7 +17073,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 8UL)); } break; @@ -17082,7 +17082,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 9UL)); } break; @@ -17091,7 +17091,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 11UL)); } break; @@ -17100,7 +17100,7 @@ class Test_TC_MEDIAPLAYBACK_1_7Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 10UL)); } break; @@ -17303,7 +17303,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -17311,7 +17311,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3UL)); } @@ -17321,7 +17321,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); @@ -17336,7 +17336,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -17351,7 +17351,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand VerifyOrReturn(CheckValue("generatedCommandList[0]", iter_0.GetValue(), 1UL)); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -17363,7 +17363,7 @@ class Test_TC_AUDIOOUTPUT_1_8Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -17486,7 +17486,7 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -17495,7 +17495,7 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -17503,7 +17503,7 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); @@ -17517,7 +17517,7 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -17526,7 +17526,7 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -17535,7 +17535,7 @@ class Test_TC_TGTNAV_1_9Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -17658,7 +17658,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -17667,7 +17667,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -17675,7 +17675,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); @@ -17693,7 +17693,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -17702,7 +17702,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -17711,7 +17711,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -17724,7 +17724,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 8: @@ -17736,7 +17736,7 @@ class Test_TC_APBSC_1_10Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 9: @@ -17871,7 +17871,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -17879,7 +17879,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3UL)); } @@ -17889,7 +17889,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -17902,7 +17902,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -17911,7 +17911,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -17920,7 +17920,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -17929,7 +17929,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -17938,7 +17938,7 @@ class Test_TC_CONTENTLAUNCHER_1_11Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); } break; @@ -18076,7 +18076,7 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -18085,7 +18085,7 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -18093,7 +18093,7 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65531UL)); @@ -18106,7 +18106,7 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); @@ -18117,7 +18117,7 @@ class Test_TC_ALOGIN_1_12Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); } break; @@ -19673,7 +19673,7 @@ class Test_TC_CHANNEL_5_2Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 2: @@ -19810,7 +19810,7 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 3: @@ -19834,7 +19834,7 @@ class Test_TC_CHANNEL_5_3Suite : public TestCommand chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueNonNull("currentChannel", value)); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "ChannelInfo", "ChannelInfo")); } break; default: @@ -21099,7 +21099,7 @@ class Test_TC_AUDIOOUTPUT_7_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "OutPutInfo")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 2: @@ -21211,7 +21211,7 @@ class Test_TC_AUDIOOUTPUT_7_2Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "OutPutInfo")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); audioOutputListValues = value; } break; @@ -21330,7 +21330,7 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -21340,7 +21340,7 @@ class Test_TC_TGTNAV_8_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); TargetListValues = value; } break; @@ -21439,7 +21439,7 @@ class Test_TC_APBSC_9_1Suite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; - uint16_t vendorID; + chip::VendorId vendorID; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -21462,16 +21462,16 @@ class Test_TC_APBSC_9_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - uint16_t value; + chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "vendor-id")); + VerifyOrReturn(CheckConstraintType("value", "vendor_id", "vendor_id")); vendorID = value; } break; @@ -21480,7 +21480,7 @@ class Test_TC_APBSC_9_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 256)); } break; @@ -21489,7 +21489,7 @@ class Test_TC_APBSC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -21499,7 +21499,7 @@ class Test_TC_APBSC_9_1Suite : public TestCommand { chip::app::Clusters::ApplicationBasic::Structs::ApplicationBasicApplication::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "struct")); + VerifyOrReturn(CheckConstraintType("value", "ApplicationBasicApplication", "ApplicationBasicApplication")); } break; case 6: @@ -21516,7 +21516,7 @@ class Test_TC_APBSC_9_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -21525,7 +21525,7 @@ class Test_TC_APBSC_9_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; default: @@ -21649,7 +21649,7 @@ class Test_TC_CONTENTLAUNCHER_10_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 2: @@ -21657,7 +21657,7 @@ class Test_TC_CONTENTLAUNCHER_10_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; default: @@ -21745,7 +21745,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -21754,7 +21754,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 1UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -21763,7 +21763,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 4: @@ -21771,7 +21771,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -21788,7 +21788,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); } break; @@ -21797,7 +21797,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); } break; @@ -21806,7 +21806,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -21819,7 +21819,7 @@ class Test_TC_MOD_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 9: @@ -22216,7 +22216,7 @@ class Test_TC_OCC_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 3U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -22225,7 +22225,7 @@ class Test_TC_OCC_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -22233,7 +22233,7 @@ class Test_TC_OCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -22253,7 +22253,7 @@ class Test_TC_OCC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -22265,7 +22265,7 @@ class Test_TC_OCC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -22380,7 +22380,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1U)); } @@ -22390,7 +22390,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -22400,7 +22400,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 273U)); } @@ -22411,7 +22411,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("pirOccupiedToUnoccupiedDelay", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22422,7 +22422,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedDelay", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22433,7 +22433,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedThreshold", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -22444,7 +22444,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("ultrasonicOccupiedToUnoccupiedDelay", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22455,7 +22455,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedDelay", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22466,7 +22466,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedThreshold", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -22477,7 +22477,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("physicalContactOccupiedToUnoccupiedDelay", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22488,7 +22488,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedDelay", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22499,7 +22499,7 @@ class Test_TC_OCC_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedThreshold", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -22653,7 +22653,7 @@ class Test_TC_OO_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 4U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -22662,7 +22662,7 @@ class Test_TC_OO_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 1UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -22671,7 +22671,7 @@ class Test_TC_OO_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 4: @@ -22679,7 +22679,7 @@ class Test_TC_OO_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); @@ -22693,7 +22693,7 @@ class Test_TC_OO_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 16384UL)); VerifyOrReturn(CheckConstraintContains("value", value, 16385UL)); VerifyOrReturn(CheckConstraintContains("value", value, 16386UL)); @@ -22705,7 +22705,7 @@ class Test_TC_OO_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -22716,7 +22716,7 @@ class Test_TC_OO_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 64UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65UL)); VerifyOrReturn(CheckConstraintContains("value", value, 66UL)); @@ -22731,7 +22731,7 @@ class Test_TC_OO_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 9: @@ -22865,7 +22865,7 @@ class Test_TC_OO_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 2: @@ -22873,7 +22873,7 @@ class Test_TC_OO_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 3: @@ -22881,7 +22881,7 @@ class Test_TC_OO_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22891,7 +22891,7 @@ class Test_TC_OO_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -22901,7 +22901,7 @@ class Test_TC_OO_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; default: @@ -23795,7 +23795,7 @@ class Test_TC_PS_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -23803,7 +23803,7 @@ class Test_TC_PS_1_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 15UL)); } @@ -23813,7 +23813,7 @@ class Test_TC_PS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -23829,7 +23829,7 @@ class Test_TC_PS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); } break; @@ -23838,7 +23838,7 @@ class Test_TC_PS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 14UL)); VerifyOrReturn(CheckConstraintContains("value", value, 15UL)); VerifyOrReturn(CheckConstraintContains("value", value, 16UL)); @@ -23849,7 +23849,7 @@ class Test_TC_PS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 26UL)); VerifyOrReturn(CheckConstraintContains("value", value, 28UL)); } @@ -23859,7 +23859,7 @@ class Test_TC_PS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 19UL)); VerifyOrReturn(CheckConstraintContains("value", value, 25UL)); } @@ -23873,7 +23873,7 @@ class Test_TC_PS_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 9: @@ -23885,7 +23885,7 @@ class Test_TC_PS_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 10: @@ -24025,7 +24025,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::Clusters::PowerSource::PowerSourceStatus value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -24035,7 +24035,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -24045,7 +24045,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); } break; case 4: @@ -24053,7 +24053,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24063,7 +24063,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -24073,7 +24073,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::Clusters::PowerSource::WiredCurrentType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1U)); } @@ -24083,7 +24083,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24093,7 +24093,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24103,7 +24103,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24113,7 +24113,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 11: @@ -24121,7 +24121,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 8)); } break; @@ -24130,7 +24130,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24140,7 +24140,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 200U)); } @@ -24150,7 +24150,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24160,7 +24160,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::Clusters::PowerSource::BatChargeLevel value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2U)); } @@ -24170,7 +24170,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 17: @@ -24178,7 +24178,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::Clusters::PowerSource::BatReplaceability value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -24188,7 +24188,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 19: @@ -24196,7 +24196,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 8)); } break; @@ -24205,7 +24205,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 60)); } break; @@ -24214,7 +24214,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 80UL)); } @@ -24224,7 +24224,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 20)); } break; @@ -24233,7 +24233,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 20)); } break; @@ -24242,7 +24242,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32UL)); } @@ -24252,7 +24252,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24262,7 +24262,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -24272,7 +24272,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::Clusters::PowerSource::BatChargeState value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -24282,7 +24282,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24292,7 +24292,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; case 30: @@ -24300,7 +24300,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -24310,7 +24310,7 @@ class Test_TC_PS_2_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; default: @@ -24572,7 +24572,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 3U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -24581,7 +24581,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 1UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -24590,7 +24590,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 4: @@ -24598,7 +24598,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -24614,7 +24614,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 16UL)); } break; @@ -24623,7 +24623,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 17UL)); } break; @@ -24632,7 +24632,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 18UL)); } break; @@ -24641,7 +24641,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 20UL)); } break; @@ -24650,7 +24650,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -24659,7 +24659,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 19UL)); } break; @@ -24672,7 +24672,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 12: @@ -24684,7 +24684,7 @@ class Test_TC_PRS_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 13: @@ -24842,7 +24842,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -24852,7 +24852,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -24862,7 +24862,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -24872,7 +24872,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2048U)); } @@ -24882,7 +24882,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -24892,7 +24892,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -24902,7 +24902,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -24912,7 +24912,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2048U)); } @@ -24922,7 +24922,7 @@ class Test_TC_PRS_2_1Suite : public TestCommand { int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int8")); + VerifyOrReturn(CheckConstraintType("value", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -127)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 127)); } @@ -25054,7 +25054,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 3U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -25063,7 +25063,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -25071,7 +25071,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -25091,7 +25091,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -25100,7 +25100,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 4UL)); } break; @@ -25109,7 +25109,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 5UL)); } break; @@ -25118,7 +25118,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 6UL)); } break; @@ -25127,7 +25127,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 7UL)); } break; @@ -25136,7 +25136,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 8UL)); } break; @@ -25145,7 +25145,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 9UL)); } break; @@ -25154,7 +25154,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 10UL)); } break; @@ -25163,7 +25163,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 11UL)); } break; @@ -25172,7 +25172,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 12UL)); } break; @@ -25181,7 +25181,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 16UL)); } break; @@ -25190,7 +25190,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 20UL)); } break; @@ -25199,7 +25199,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 21UL)); } break; @@ -25208,7 +25208,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 22UL)); } break; @@ -25217,7 +25217,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 23UL)); } break; @@ -25226,7 +25226,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 33UL)); } break; @@ -25239,7 +25239,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 21: @@ -25251,7 +25251,7 @@ class Test_TC_PCC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 22: @@ -25461,7 +25461,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25471,7 +25471,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25481,7 +25481,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25491,7 +25491,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25501,7 +25501,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25511,7 +25511,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25521,7 +25521,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25531,7 +25531,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25541,7 +25541,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25551,7 +25551,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25561,7 +25561,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25571,7 +25571,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25581,7 +25581,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25591,7 +25591,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map16")); + VerifyOrReturn(CheckConstraintType("value", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 8U)); } @@ -25601,7 +25601,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -25611,7 +25611,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 7U)); } @@ -25621,7 +25621,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -32768)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -25631,7 +25631,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -25641,7 +25641,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint24")); + VerifyOrReturn(CheckConstraintType("value", "int24u", "int24u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 16777215UL)); } @@ -25651,7 +25651,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint24")); + VerifyOrReturn(CheckConstraintType("value", "int24u", "int24u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 16777215UL)); } @@ -25661,7 +25661,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -25671,7 +25671,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::Clusters::PumpConfigurationAndControl::PumpOperationMode value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -25681,7 +25681,7 @@ class Test_TC_PCC_2_1Suite : public TestCommand { chip::app::Clusters::PumpConfigurationAndControl::PumpControlMode value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 7U)); } @@ -26571,7 +26571,7 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -26580,7 +26580,7 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -26588,7 +26588,7 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); @@ -26606,7 +26606,7 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -26618,7 +26618,7 @@ class Test_TC_PSCFG_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -26734,7 +26734,7 @@ class Test_TC_RH_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 3U)); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -26743,7 +26743,7 @@ class Test_TC_RH_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -26751,7 +26751,7 @@ class Test_TC_RH_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -26771,7 +26771,7 @@ class Test_TC_RH_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -26783,7 +26783,7 @@ class Test_TC_RH_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -26898,7 +26898,7 @@ class Test_TC_RH_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -26908,7 +26908,7 @@ class Test_TC_RH_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -26918,7 +26918,7 @@ class Test_TC_RH_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -26928,7 +26928,7 @@ class Test_TC_RH_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2048U)); } @@ -27920,7 +27920,7 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -27936,7 +27936,7 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); @@ -27951,7 +27951,7 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 11: @@ -27963,7 +27963,7 @@ class Test_TC_SWTCH_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 12: @@ -28132,7 +28132,7 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("numberOfPositions", value, 2U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 2U)); } break; @@ -28142,7 +28142,7 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("currentPosition", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -28153,7 +28153,7 @@ class Test_TC_SWTCH_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("multiPressMax", value, 2U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 2U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -28247,7 +28247,7 @@ class Test_TC_TMP_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 4U)); - VerifyOrReturn(CheckConstraintType("value", "", "unit16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -28256,7 +28256,7 @@ class Test_TC_TMP_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -28264,7 +28264,7 @@ class Test_TC_TMP_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -28280,7 +28280,7 @@ class Test_TC_TMP_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 3UL)); } break; @@ -28293,7 +28293,7 @@ class Test_TC_TMP_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -28305,7 +28305,7 @@ class Test_TC_TMP_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -28426,7 +28426,7 @@ class Test_TC_TMP_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28436,7 +28436,7 @@ class Test_TC_TMP_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28446,7 +28446,7 @@ class Test_TC_TMP_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27314)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28456,7 +28456,7 @@ class Test_TC_TMP_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2048U)); } @@ -28558,7 +28558,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -28566,7 +28566,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 63UL)); } @@ -28576,7 +28576,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 27UL)); VerifyOrReturn(CheckConstraintContains("value", value, 28UL)); @@ -28592,7 +28592,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 18UL)); } break; @@ -28601,7 +28601,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 17UL)); } break; @@ -28610,7 +28610,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); } break; @@ -28619,7 +28619,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 20UL)); } break; @@ -28628,7 +28628,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 19UL)); } break; @@ -28637,7 +28637,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 17UL)); VerifyOrReturn(CheckConstraintContains("value", value, 18UL)); VerifyOrReturn(CheckConstraintContains("value", value, 25UL)); @@ -28648,7 +28648,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 32UL)); VerifyOrReturn(CheckConstraintContains("value", value, 33UL)); VerifyOrReturn(CheckConstraintContains("value", value, 34UL)); @@ -28659,7 +28659,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 52UL)); VerifyOrReturn(CheckConstraintContains("value", value, 53UL)); VerifyOrReturn(CheckConstraintContains("value", value, 54UL)); @@ -28670,7 +28670,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 55UL)); VerifyOrReturn(CheckConstraintContains("value", value, 56UL)); VerifyOrReturn(CheckConstraintContains("value", value, 57UL)); @@ -28681,7 +28681,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -28693,7 +28693,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); } break; @@ -28702,7 +28702,7 @@ class Test_TC_TSTAT_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; default: @@ -28865,7 +28865,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28875,7 +28875,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28885,7 +28885,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1U)); } @@ -28895,7 +28895,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28905,7 +28905,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28915,7 +28915,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28925,7 +28925,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -28935,7 +28935,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -28945,7 +28945,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -28955,7 +28955,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 63U)); } @@ -28965,7 +28965,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int8")); + VerifyOrReturn(CheckConstraintType("value", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 25)); VerifyOrReturn(CheckConstraintMaxValue("value", value, -25)); } @@ -28975,7 +28975,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1600)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200)); } @@ -28985,7 +28985,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -28995,7 +28995,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1600)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200)); } @@ -29005,7 +29005,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -29015,7 +29015,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -29025,7 +29025,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -29035,7 +29035,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -29045,7 +29045,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -29055,7 +29055,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int8")); + VerifyOrReturn(CheckConstraintType("value", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 25)); } @@ -29065,7 +29065,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 7U)); } @@ -29075,7 +29075,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::Clusters::Thermostat::ThermostatControlSequence value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U)); } @@ -29085,7 +29085,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -29095,7 +29095,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -29105,7 +29105,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 6U)); } @@ -29115,7 +29115,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29125,7 +29125,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29135,7 +29135,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1U)); } @@ -29145,7 +29145,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1440U)); } @@ -29155,7 +29155,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 7U)); } @@ -29165,7 +29165,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map16")); + VerifyOrReturn(CheckConstraintType("value", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 127U)); } @@ -29175,7 +29175,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2U)); } @@ -29185,7 +29185,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -29195,7 +29195,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "utc")); + VerifyOrReturn(CheckConstraintType("value", "utc", "utc")); } break; case 35: @@ -29203,7 +29203,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29213,7 +29213,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29223,7 +29223,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29233,7 +29233,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29243,7 +29243,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29253,7 +29253,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29263,7 +29263,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -29273,7 +29273,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4U)); } @@ -29283,7 +29283,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -29293,7 +29293,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -29303,7 +29303,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3U)); } @@ -29313,7 +29313,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 47: @@ -29321,7 +29321,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U)); } @@ -29331,7 +29331,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -29342,7 +29342,7 @@ class Test_TC_TSTAT_2_1Suite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("ACCapacityformat", value, 0U)); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; default: @@ -29708,7 +29708,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1600)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200)); } @@ -29744,7 +29744,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand { int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -29789,7 +29789,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("unoccupiedCoolingSetpoint", value, 2600)); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1600)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200)); } @@ -29823,7 +29823,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("unoccupiedHeatingSetpoint", value, 2000)); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -29857,7 +29857,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("minHeatSetpointLimit", value, 700)); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -29894,7 +29894,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("maxHeatSetpointLimit", value, 3000)); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 700)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3000)); } @@ -29934,7 +29934,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("minCoolSetpointLimit", value, 1600)); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1600)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200)); } @@ -29971,7 +29971,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("maxCoolSetpointLimit", value, 3200)); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1600)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 3200)); } @@ -30020,7 +30020,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand int8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("minSetpointDeadBand", value, 25)); - VerifyOrReturn(CheckConstraintType("value", "", "temp-s8")); + VerifyOrReturn(CheckConstraintType("value", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 25)); } @@ -30054,7 +30054,7 @@ class Test_TC_TSTAT_2_2Suite : public TestCommand chip::app::Clusters::Thermostat::ThermostatControlSequence value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("controlSequenceOfOperation", value, 4U)); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U)); } @@ -31126,7 +31126,7 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 2U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -31135,7 +31135,7 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -31143,7 +31143,7 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -31163,7 +31163,7 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -31175,7 +31175,7 @@ class Test_TC_TSUIC_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -31292,7 +31292,7 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1U)); } @@ -31302,7 +31302,7 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U)); } @@ -31312,7 +31312,7 @@ class Test_TC_TSUIC_2_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 1U)); } @@ -31973,7 +31973,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -31983,7 +31983,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "RoutingRole")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 6U)); } @@ -31993,7 +31993,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); } break; case 4: @@ -32005,7 +32005,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32019,7 +32019,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 8: @@ -32035,7 +32035,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 11: @@ -32055,7 +32055,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); } break; case 15: @@ -32063,7 +32063,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -32073,7 +32073,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -32083,7 +32083,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -32093,7 +32093,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 255U)); } @@ -32103,7 +32103,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32113,7 +32113,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32123,7 +32123,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32133,7 +32133,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32143,7 +32143,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32153,7 +32153,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32163,7 +32163,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32173,7 +32173,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -32183,7 +32183,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 28: @@ -32191,7 +32191,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 29: @@ -32199,7 +32199,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32213,7 +32213,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "octstr")); + VerifyOrReturn(CheckConstraintType("value", "octet_string", "octet_string")); } break; case 32: @@ -32225,7 +32225,7 @@ class Test_TC_DGTHREAD_2_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; default: @@ -32550,7 +32550,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32560,7 +32560,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32570,7 +32570,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32580,7 +32580,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32590,7 +32590,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32600,7 +32600,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32610,7 +32610,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32620,7 +32620,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32630,7 +32630,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32640,7 +32640,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32650,7 +32650,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32660,7 +32660,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32670,7 +32670,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32680,7 +32680,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32690,7 +32690,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32700,7 +32700,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32710,7 +32710,7 @@ class Test_TC_DGTHREAD_2_2Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32890,7 +32890,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32900,7 +32900,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32910,7 +32910,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32920,7 +32920,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32930,7 +32930,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32940,7 +32940,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32950,7 +32950,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32960,7 +32960,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32970,7 +32970,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32980,7 +32980,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -32990,7 +32990,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33000,7 +33000,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33010,7 +33010,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33024,7 +33024,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33034,7 +33034,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33044,7 +33044,7 @@ class Test_TC_DGTHREAD_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33323,7 +33323,7 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); } break; case 2: @@ -33332,7 +33332,7 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("featureMap", value, 0UL)); - VerifyOrReturn(CheckConstraintType("value", "", "map32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); } break; case 3: @@ -33340,7 +33340,7 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("value", value, 65529UL)); @@ -33358,7 +33358,7 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("acceptedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 5: @@ -33370,7 +33370,7 @@ class Test_TC_ULABEL_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 6: @@ -33508,7 +33508,7 @@ class Test_TC_ULABEL_2_2Suite : public TestCommand VerifyOrReturn(CheckValueAsString("labelList[3].value", iter_0.GetValue().value, chip::CharSpan("bedroom", 7))); VerifyOrReturn(CheckNoMoreListItems("labelList", iter_0, 4)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintMinLength("value", value, 4)); } break; @@ -33890,7 +33890,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "octstr")); + VerifyOrReturn(CheckConstraintType("value", "octet_string", "octet_string")); } break; case 2: @@ -33898,7 +33898,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; case 3: @@ -33906,7 +33906,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 5U)); } @@ -33916,7 +33916,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -33926,7 +33926,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int8")); + VerifyOrReturn(CheckConstraintType("value", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -120)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 0)); } @@ -33936,7 +33936,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33946,7 +33946,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33956,7 +33956,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33966,7 +33966,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33976,7 +33976,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33986,7 +33986,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -33996,7 +33996,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 13: @@ -34004,7 +34004,7 @@ class Test_TC_DGWIFI_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; default: @@ -34160,7 +34160,7 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -34170,7 +34170,7 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -34180,7 +34180,7 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -34190,7 +34190,7 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -34200,7 +34200,7 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -34210,7 +34210,7 @@ class Test_TC_DGWIFI_2_3Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 4294967295UL)); } @@ -34334,7 +34334,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("clusterRevision", value, 5U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 5U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 200U)); } @@ -34344,7 +34344,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand { uint32_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint32")); + VerifyOrReturn(CheckConstraintType("value", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0UL)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32768UL)); } @@ -34354,7 +34354,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 7UL)); VerifyOrReturn(CheckConstraintContains("value", value, 10UL)); @@ -34372,7 +34372,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 26UL)); } break; @@ -34381,7 +34381,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand { chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintContains("value", value, 0UL)); VerifyOrReturn(CheckConstraintContains("value", value, 1UL)); VerifyOrReturn(CheckConstraintContains("value", value, 2UL)); @@ -34396,7 +34396,7 @@ class Test_TC_WNCV_1_1Suite : public TestCommand auto iter_0 = value.begin(); VerifyOrReturn(CheckNoMoreListItems("generatedCommandList", iter_0, 0)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -34521,7 +34521,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::Clusters::WindowCovering::Type value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9U)); } @@ -34531,7 +34531,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 63U)); } @@ -34541,7 +34541,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 63U)); } @@ -34551,7 +34551,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::Clusters::WindowCovering::EndProductType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 23U)); } @@ -34561,7 +34561,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 15U)); } @@ -34574,7 +34574,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -34584,7 +34584,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -34594,7 +34594,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -34604,7 +34604,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -34614,7 +34614,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34624,7 +34624,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34634,7 +34634,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34644,7 +34644,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34654,7 +34654,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map16")); + VerifyOrReturn(CheckConstraintType("value", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 2047U)); } @@ -34664,7 +34664,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34674,7 +34674,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34684,7 +34684,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34694,7 +34694,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34704,7 +34704,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34714,7 +34714,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -34724,7 +34724,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "Percent")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -34734,7 +34734,7 @@ class Test_TC_WNCV_2_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "Percent")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -35418,7 +35418,7 @@ class Test_TC_WNCV_2_5Suite : public TestCommand { chip::app::Clusters::WindowCovering::EndProductType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "enum8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 23U)); } @@ -35508,7 +35508,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -35518,7 +35518,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -35528,7 +35528,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -35538,7 +35538,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -35548,7 +35548,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); } break; case 8: @@ -35585,7 +35585,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 5U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 21U)); } @@ -35600,7 +35600,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -35610,7 +35610,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 99U)); } @@ -35620,7 +35620,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -35630,7 +35630,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 99U)); } @@ -35659,7 +35659,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -35669,7 +35669,7 @@ class Test_TC_WNCV_3_1Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -35914,7 +35914,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -35924,7 +35924,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 99U)); } @@ -35934,7 +35934,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -35944,7 +35944,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 99U)); } @@ -35954,7 +35954,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); } break; case 8: @@ -35991,7 +35991,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("value", value, 10U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 42U)); } @@ -36006,7 +36006,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -36016,7 +36016,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -36026,7 +36026,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -36036,7 +36036,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "Percent", "Percent")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 100U)); } @@ -36065,7 +36065,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -36075,7 +36075,7 @@ class Test_TC_WNCV_3_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -36330,7 +36330,7 @@ class Test_TC_WNCV_3_3Suite : public TestCommand { chip::BitMask value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "map8")); + VerifyOrReturn(CheckConstraintType("value", "bitmap8", "bitmap8")); } break; case 6: @@ -38915,7 +38915,7 @@ class TV_ApplicationBasicClusterSuite : public TestCommand case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - uint16_t value; + chip::VendorId value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("vendorID", value, 1U)); } @@ -51609,7 +51609,7 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand chip::Optional mPayload; chip::Optional mTimeout; - chip::FabricIndex ourFabricIndex; + uint8_t ourFabricIndex; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -51633,15 +51633,15 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("commissionedFabrics", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); } break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::FabricIndex value; + uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); ourFabricIndex = value; } @@ -51664,7 +51664,7 @@ class TestFabricRemovalWhileSubscribedSuite : public TestCommand chip::app::Clusters::OperationalCredentials::Structs::FabricDescriptor::DecodableType> value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -51994,7 +51994,7 @@ class TestGeneralCommissioningSuite : public TestCommand { bool value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "bool")); + VerifyOrReturn(CheckConstraintType("value", "boolean", "boolean")); } break; default: @@ -52348,7 +52348,7 @@ class TestOperationalCredentialsClusterSuite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; - chip::FabricIndex ourFabricIndex; + uint8_t ourFabricIndex; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -52371,7 +52371,7 @@ class TestOperationalCredentialsClusterSuite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 4U)); } break; @@ -52380,16 +52380,16 @@ class TestOperationalCredentialsClusterSuite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); } break; case 3: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::FabricIndex value; + uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); ourFabricIndex = value; } @@ -52620,7 +52620,7 @@ class TestModeSelectClusterSuite : public TestCommand } VerifyOrReturn(CheckNoMoreListItems("supportedModes", iter_0, 3)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); VerifyOrReturn(CheckConstraintMinLength("value", value, 3)); VerifyOrReturn(CheckConstraintMaxLength("value", value, 3)); } @@ -53035,7 +53035,7 @@ class TestSelfFabricRemovalSuite : public TestCommand chip::Optional mEndpoint; chip::Optional mTimeout; - chip::FabricIndex ourFabricIndex; + uint8_t ourFabricIndex; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -53059,15 +53059,15 @@ class TestSelfFabricRemovalSuite : public TestCommand uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("commissionedFabrics", value, 1U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); } break; case 2: VerifyOrReturn(CheckValue("status", chip::to_underlying(status.mStatus), 0)); { - chip::FabricIndex value; + uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); ourFabricIndex = value; } @@ -54074,7 +54074,7 @@ class TestArmFailSafeSuite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 3: @@ -55891,7 +55891,7 @@ class Test_TC_DGSW_2_1Suite : public TestCommand chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 2: @@ -55899,7 +55899,7 @@ class Test_TC_DGSW_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 3: @@ -55907,7 +55907,7 @@ class Test_TC_DGSW_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 4: @@ -55915,7 +55915,7 @@ class Test_TC_DGSW_2_1Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; default: @@ -56101,7 +56101,7 @@ class Test_TC_DGSW_2_3Suite : public TestCommand chip::app::DataModel::DecodableList value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 3: @@ -56109,7 +56109,7 @@ class Test_TC_DGSW_2_3Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; case 4: @@ -56117,7 +56117,7 @@ class Test_TC_DGSW_2_3Suite : public TestCommand { uint64_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint64")); + VerifyOrReturn(CheckConstraintType("value", "int64u", "int64u")); } break; default: @@ -64060,7 +64060,7 @@ class Test_TC_DRLK_2_9Suite : public TestCommand { chip::app::Clusters::DoorLock::Commands::GetCredentialStatusResponse::DecodableType value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value.credentialExists", "", "boolean")); + VerifyOrReturn(CheckConstraintType("value.credentialExists", "boolean", "boolean")); VerifyOrReturn(CheckValueNonNull("userIndex", value.userIndex)); VerifyOrReturn(CheckValue("userIndex.Value()", value.userIndex.Value(), 1U)); VerifyOrReturn(CheckValueNonNull("creatorFabricIndex", value.creatorFabricIndex)); @@ -76279,7 +76279,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest", 8))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -76304,7 +76304,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -76322,7 +76322,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[1].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 2)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 8: @@ -76334,7 +76334,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest1", 9))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -76347,7 +76347,7 @@ class Test_TC_CADMIN_1_3Suite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest2", 9))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -76612,7 +76612,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand { chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -76637,7 +76637,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 7: @@ -76653,7 +76653,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[0].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 1)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 8: @@ -76665,7 +76665,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest", 8))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -76678,7 +76678,7 @@ class Test_TC_CADMIN_1_4Suite : public TestCommand chip::CharSpan value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValueAsString("nodeLabel", value, chip::CharSpan("chiptest", 8))); - VerifyOrReturn(CheckConstraintType("value", "", "string")); + VerifyOrReturn(CheckConstraintType("value", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("value", value, 32)); } break; @@ -78301,7 +78301,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 10: @@ -78331,7 +78331,7 @@ class Test_TC_CADMIN_1_13Suite : public TestCommand VerifyOrReturn(CheckValueAsString("fabrics[2].label", iter_0.GetValue().label, chip::CharSpan("", 0))); VerifyOrReturn(CheckNoMoreListItems("fabrics", iter_0, 3)); } - VerifyOrReturn(CheckConstraintType("value", "", "list")); + VerifyOrReturn(CheckConstraintType("value", "list", "list")); } break; case 14: @@ -82089,7 +82089,7 @@ class Test_TC_FLW_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); ValueBeforeChange = value; @@ -82104,7 +82104,7 @@ class Test_TC_FLW_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); VerifyOrReturn(CheckConstraintNotValue("value", value, ValueBeforeChange)); @@ -83342,7 +83342,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83359,7 +83359,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83373,7 +83373,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83403,7 +83403,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83417,7 +83417,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83447,7 +83447,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83461,7 +83461,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83490,7 +83490,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83504,7 +83504,7 @@ class Test_TC_CC_3_1Suite : public TestCommand { uint8_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U)); } @@ -83885,7 +83885,7 @@ class Test_TC_CC_7_1Suite : public TestCommand VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); VerifyOrReturn(CheckValue("enhancedCurrentHue", value, mEnhancedHueConfigValue.HasValue() ? mEnhancedHueConfigValue.Value() : 1025U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83902,7 +83902,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83916,7 +83916,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83933,7 +83933,7 @@ class Test_TC_CC_7_1Suite : public TestCommand VerifyOrReturn(CheckValue( "enhancedCurrentHue", value, mEnhancedHueShortestDistanceConfigValue.HasValue() ? mEnhancedHueShortestDistanceConfigValue.Value() : 1050U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83950,7 +83950,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83964,7 +83964,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83981,7 +83981,7 @@ class Test_TC_CC_7_1Suite : public TestCommand VerifyOrReturn(CheckValue( "enhancedCurrentHue", value, mEnhancedHueLongestDistanceConfigValue.HasValue() ? mEnhancedHueLongestDistanceConfigValue.Value() : 1200U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -83998,7 +83998,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84012,7 +84012,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84029,7 +84029,7 @@ class Test_TC_CC_7_1Suite : public TestCommand VerifyOrReturn( CheckValue("enhancedCurrentHue", value, mEnhancedHueDirectionUpConfigValue.HasValue() ? mEnhancedHueDirectionUpConfigValue.Value() : 1300U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84046,7 +84046,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84060,7 +84060,7 @@ class Test_TC_CC_7_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84077,7 +84077,7 @@ class Test_TC_CC_7_1Suite : public TestCommand VerifyOrReturn(CheckValue( "enhancedCurrentHue", value, mEnhancedHueDirectionDownConfigValue.HasValue() ? mEnhancedHueDirectionDownConfigValue.Value() : 1100U)); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84540,7 +84540,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep5d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84554,7 +84554,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep5d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84633,7 +84633,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep8d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84647,7 +84647,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep8d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84741,7 +84741,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep12d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84755,7 +84755,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep12d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84834,7 +84834,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep15d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -84848,7 +84848,7 @@ class Test_TC_CC_9_1Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueStep15d)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -85719,7 +85719,7 @@ class Test_TC_CC_9_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -85733,7 +85733,7 @@ class Test_TC_CC_9_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -85766,7 +85766,7 @@ class Test_TC_CC_9_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -85780,7 +85780,7 @@ class Test_TC_CC_9_2Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -86245,7 +86245,7 @@ class Test_TC_CC_9_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -86259,7 +86259,7 @@ class Test_TC_CC_9_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, ColorLoopStartEnhancedHueValue)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -86284,7 +86284,7 @@ class Test_TC_CC_9_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -86298,7 +86298,7 @@ class Test_TC_CC_9_3Suite : public TestCommand { uint16_t value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U)); } @@ -89402,7 +89402,7 @@ class Test_TC_RH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 9999U)); } @@ -89412,7 +89412,7 @@ class Test_TC_RH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 1U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); } @@ -89422,7 +89422,7 @@ class Test_TC_RH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("value", value, 0U)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 10000U)); ValueBeforeChange = value; @@ -89437,7 +89437,7 @@ class Test_TC_RH_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); + VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u")); VerifyOrReturn(CheckConstraintNotValue("value", value, ValueBeforeChange)); } break; @@ -89773,7 +89773,7 @@ class Test_TC_TMP_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27315)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32766)); } @@ -89783,7 +89783,7 @@ class Test_TC_TMP_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "int16")); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("value", value, -27314)); VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); } @@ -89793,9 +89793,9 @@ class Test_TC_TMP_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); - VerifyOrReturn(CheckConstraintMinValue("value", value, 0)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535)); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); + VerifyOrReturn(CheckConstraintMinValue("value", value, -27314)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); valueBeforeChange = value; } break; @@ -89808,9 +89808,9 @@ class Test_TC_TMP_2_2Suite : public TestCommand { chip::app::DataModel::Nullable value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint16")); - VerifyOrReturn(CheckConstraintMinValue("value", value, 0)); - VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535)); + VerifyOrReturn(CheckConstraintType("value", "int16s", "int16s")); + VerifyOrReturn(CheckConstraintMinValue("value", value, -27314)); + VerifyOrReturn(CheckConstraintMaxValue("value", value, 32767)); VerifyOrReturn(CheckConstraintNotValue("value", value, valueBeforeChange)); } break; @@ -91159,7 +91159,7 @@ class Test_TC_LUNIT_3_1Suite : public TestCommand { chip::app::Clusters::UnitLocalization::TempUnit value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckConstraintType("value", "", "uint8")); + VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; case 2: 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 dc305cd1ae9f06..b2de0c17c387ae 100644 --- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h +++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h @@ -2236,7 +2236,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -2261,7 +2261,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -2281,7 +2281,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); @@ -2313,7 +2313,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -2338,7 +2338,7 @@ class Test_TC_BOOL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -2462,7 +2462,7 @@ class Test_TC_BOOL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("stateValue", "", "bool")); + VerifyOrReturn(CheckConstraintType("stateValue", "boolean", "boolean")); NextTest(); }]; @@ -2630,7 +2630,7 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -2655,7 +2655,7 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -2675,7 +2675,7 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); @@ -2698,7 +2698,7 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -2722,7 +2722,7 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintMaxLength("acceptedCommandList", value, 11)); NextTest(); }]; @@ -2748,7 +2748,7 @@ class Test_TC_ACT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -2918,7 +2918,7 @@ class Test_TC_CC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -2938,7 +2938,7 @@ class Test_TC_CC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 31UL)); @@ -2961,7 +2961,7 @@ class Test_TC_CC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 8UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 15UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16385UL)); @@ -2991,7 +2991,7 @@ class Test_TC_CC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -3016,7 +3016,7 @@ class Test_TC_CC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -3744,7 +3744,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 255U)); @@ -3767,7 +3767,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 255U)); @@ -3790,7 +3790,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("remainingTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("remainingTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("remainingTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("remainingTime", [value unsignedShortValue], 65535U)); @@ -3813,7 +3813,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -3836,7 +3836,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -3859,7 +3859,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("driftCompensation", "", "enum8")); + VerifyOrReturn(CheckConstraintType("driftCompensation", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("driftCompensation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("driftCompensation", [value unsignedCharValue], 4U)); @@ -3882,7 +3882,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("compensationText", "", "string")); + VerifyOrReturn(CheckConstraintType("compensationText", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("compensationText", value, 254)); NextTest(); }]; @@ -3903,7 +3903,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -3926,7 +3926,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("colorMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("colorMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorMode", [value unsignedCharValue], 2U)); @@ -3949,7 +3949,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("options", "", "bitmap8")); + VerifyOrReturn(CheckConstraintType("options", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("options", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("options", [value unsignedCharValue], 4U)); @@ -3972,7 +3972,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -3995,7 +3995,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedColorMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("enhancedColorMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("enhancedColorMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedColorMode", [value unsignedCharValue], 3U)); @@ -4018,7 +4018,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorLoopActive", "", "uint8")); + VerifyOrReturn(CheckConstraintType("colorLoopActive", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("colorLoopActive", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorLoopActive", [value unsignedCharValue], 255U)); @@ -4041,7 +4041,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorLoopDirection", "", "uint8")); + VerifyOrReturn(CheckConstraintType("colorLoopDirection", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("colorLoopDirection", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorLoopDirection", [value unsignedCharValue], 255U)); @@ -4064,7 +4064,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorLoopTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorLoopTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorLoopTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorLoopTime", [value unsignedShortValue], 65535U)); @@ -4088,7 +4088,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorLoopStartEnhancedHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorLoopStartEnhancedHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorLoopStartEnhancedHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorLoopStartEnhancedHue", [value unsignedShortValue], 65535U)); @@ -4112,7 +4112,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorLoopStoredEnhancedHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorLoopStoredEnhancedHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorLoopStoredEnhancedHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorLoopStoredEnhancedHue", [value unsignedShortValue], 65535U)); @@ -4164,7 +4164,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorCapabilities", actualValue, FeatureMapValue)); } - VerifyOrReturn(CheckConstraintType("colorCapabilities", "", "map16")); + VerifyOrReturn(CheckConstraintType("colorCapabilities", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("colorCapabilities", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorCapabilities", [value unsignedShortValue], 31U)); @@ -4188,7 +4188,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 65279U)); @@ -4212,7 +4212,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 65279U)); @@ -4236,7 +4236,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("coupleColorTempToLevelMinMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("coupleColorTempToLevelMinMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("coupleColorTempToLevelMinMireds", [value unsignedShortValue], 0U)); VerifyOrReturn( CheckConstraintMaxValue("coupleColorTempToLevelMinMireds", [value unsignedShortValue], 65279U)); @@ -4261,7 +4261,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("startUpColorTemperatureMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("startUpColorTemperatureMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("startUpColorTemperatureMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("startUpColorTemperatureMireds", [value unsignedShortValue], 65279U)); @@ -4286,7 +4286,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("numberOfPrimaries", "", "uint8")); + VerifyOrReturn(CheckConstraintType("numberOfPrimaries", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("numberOfPrimaries", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfPrimaries", [value unsignedCharValue], 6U)); } @@ -4490,7 +4490,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("whitePointX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("whitePointX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("whitePointX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("whitePointX", [value unsignedShortValue], 65279U)); @@ -4513,7 +4513,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("whitePointY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("whitePointY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("whitePointY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("whitePointY", [value unsignedShortValue], 65279U)); @@ -4536,7 +4536,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorPointRX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorPointRX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorPointRX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointRX", [value unsignedShortValue], 65279U)); @@ -4559,7 +4559,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorPointRY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorPointRY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorPointRY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointRY", [value unsignedShortValue], 65279U)); @@ -4584,7 +4584,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("colorPointRIntensity", "", "uint8")); + VerifyOrReturn(CheckConstraintType("colorPointRIntensity", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("colorPointRIntensity", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointRIntensity", [value unsignedCharValue], 255U)); } @@ -4608,7 +4608,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorPointGX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorPointGX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorPointGX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointGX", [value unsignedShortValue], 65279U)); @@ -4631,7 +4631,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorPointGY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorPointGY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorPointGY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointGY", [value unsignedShortValue], 65279U)); @@ -4656,7 +4656,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("colorPointGIntensity", "", "uint8")); + VerifyOrReturn(CheckConstraintType("colorPointGIntensity", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("colorPointGIntensity", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointGIntensity", [value unsignedCharValue], 255U)); } @@ -4680,7 +4680,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorPointBX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorPointBX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorPointBX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointBX", [value unsignedShortValue], 65279U)); @@ -4703,7 +4703,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorPointBY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorPointBY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorPointBY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointBY", [value unsignedShortValue], 65279U)); @@ -4728,7 +4728,7 @@ class Test_TC_CC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("colorPointBIntensity", "", "uint8")); + VerifyOrReturn(CheckConstraintType("colorPointBIntensity", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("colorPointBIntensity", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorPointBIntensity", [value unsignedCharValue], 255U)); } @@ -5173,7 +5173,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5229,7 +5229,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5259,7 +5259,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5289,7 +5289,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5346,7 +5346,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); { @@ -5436,7 +5436,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5466,7 +5466,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5496,7 +5496,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5553,7 +5553,7 @@ class Test_TC_CC_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); { @@ -5904,7 +5904,7 @@ class Test_TC_CC_3_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -5961,7 +5961,7 @@ class Test_TC_CC_3_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 5U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -6018,7 +6018,7 @@ class Test_TC_CC_3_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 249U)); @@ -6306,7 +6306,7 @@ class Test_TC_CC_4_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -6368,7 +6368,7 @@ class Test_TC_CC_4_1 : public TestCommandBridge { "CurrentSaturation", actualValue, mSaturationConfigValue.HasValue() ? mSaturationConfigValue.Value() : 90U)); } - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -6935,7 +6935,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -6991,7 +6991,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7021,7 +7021,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7051,7 +7051,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7107,7 +7107,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7137,7 +7137,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7167,7 +7167,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7225,7 +7225,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7284,7 +7284,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); { @@ -7378,7 +7378,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); { @@ -7411,7 +7411,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn( CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], CurrentSaturationStep5b)); @@ -7471,7 +7471,7 @@ class Test_TC_CC_4_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); { @@ -7822,7 +7822,7 @@ class Test_TC_CC_4_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7879,7 +7879,7 @@ class Test_TC_CC_4_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -7936,7 +7936,7 @@ class Test_TC_CC_4_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -8248,7 +8248,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -8271,7 +8271,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -8334,7 +8334,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("CurrentHue", actualValue, mHueConfigValue.HasValue() ? mHueConfigValue.Value() : 40U)); } - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -8363,7 +8363,7 @@ class Test_TC_CC_4_4 : public TestCommandBridge { "CurrentSaturation", actualValue, mSaturationConfigValue.HasValue() ? mSaturationConfigValue.Value() : 160U)); } - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -8675,7 +8675,7 @@ class Test_TC_CC_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -8698,7 +8698,7 @@ class Test_TC_CC_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -8762,7 +8762,7 @@ class Test_TC_CC_5_1 : public TestCommandBridge { CheckValue("CurrentX", actualValue, mColorXConfigValue.HasValue() ? mColorXConfigValue.Value() : 400U)); } - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -8791,7 +8791,7 @@ class Test_TC_CC_5_1 : public TestCommandBridge { CheckValue("CurrentY", actualValue, mColorYConfigValue.HasValue() ? mColorYConfigValue.Value() : 500U)); } - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -9137,7 +9137,7 @@ class Test_TC_CC_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); { @@ -9164,7 +9164,7 @@ class Test_TC_CC_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); { @@ -9223,7 +9223,7 @@ class Test_TC_CC_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], CurrentXValue)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); { @@ -9250,7 +9250,7 @@ class Test_TC_CC_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], CurrentYValue)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); { @@ -9299,7 +9299,7 @@ class Test_TC_CC_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], CurrentXBeforeStopCommand)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -9322,7 +9322,7 @@ class Test_TC_CC_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], CurrentYBeforeStopCommand)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -9635,7 +9635,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); { @@ -9662,7 +9662,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); { @@ -9723,7 +9723,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], CurrentXValue)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -9746,7 +9746,7 @@ class Test_TC_CC_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], CurrentYValue)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -10056,7 +10056,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 65279U)); { @@ -10084,7 +10084,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 65279U)); { @@ -10110,7 +10110,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -10172,7 +10172,7 @@ class Test_TC_CC_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorTemperature", actualValue, ColorTempPhysicalMaxMiredsValue)); } - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -10737,7 +10737,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 65279U)); { @@ -10765,7 +10765,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 65279U)); { @@ -10791,7 +10791,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -10850,7 +10850,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -10882,7 +10882,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -10914,7 +10914,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -10973,7 +10973,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11005,7 +11005,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11037,7 +11037,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11124,7 +11124,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11164,7 +11164,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorTemperature", actualValue, ColorTemperatureValue)); } - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11201,7 +11201,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorTemperature", actualValue, ColorTemperatureValue)); } - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11288,7 +11288,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11328,7 +11328,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorTemperature", actualValue, ColorTemperatureMoveModeStop)); } - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11365,7 +11365,7 @@ class Test_TC_CC_6_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorTemperature", actualValue, ColorTemperatureValue)); } - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11778,7 +11778,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMinMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMinMireds", [value unsignedShortValue], 65279U)); { @@ -11806,7 +11806,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTempPhysicalMaxMireds", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTempPhysicalMaxMireds", [value unsignedShortValue], 65279U)); { @@ -11832,7 +11832,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], ColorTempPhysicalMinMiredsValue)); VerifyOrReturn( @@ -11892,7 +11892,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -11922,7 +11922,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -11952,7 +11952,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -12010,7 +12010,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -12040,7 +12040,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -12070,7 +12070,7 @@ class Test_TC_CC_6_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -12539,7 +12539,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12595,7 +12595,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12625,7 +12625,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12655,7 +12655,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12704,7 +12704,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); { @@ -12742,7 +12742,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("EnhancedCurrentHue", actualValue, EnhancedCurrentHueStep3b)); } - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12798,7 +12798,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12828,7 +12828,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12858,7 +12858,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -12907,7 +12907,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); { @@ -12945,7 +12945,7 @@ class Test_TC_CC_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("EnhancedCurrentHue", actualValue, EnhancedCurrentHueStep5b)); } - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -13262,7 +13262,7 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -13319,7 +13319,7 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -13376,7 +13376,7 @@ class Test_TC_CC_7_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -13667,7 +13667,7 @@ class Test_TC_CC_7_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -13731,7 +13731,7 @@ class Test_TC_CC_7_4 : public TestCommandBridge { mEnhancedHueConfigValue.HasValue() ? mEnhancedHueConfigValue.Value() : 1200U)); } - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -14371,7 +14371,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -14418,7 +14418,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); { @@ -14456,7 +14456,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("CurrentHue", actualValue, CurrentHueValue)); } - VerifyOrReturn(CheckConstraintType("currentHue", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentHue", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentHue", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentHue", [value unsignedCharValue], 254U)); @@ -14505,7 +14505,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -14552,7 +14552,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); { @@ -14590,7 +14590,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("CurrentSaturation", actualValue, CurrentSaturationValue)); } - VerifyOrReturn(CheckConstraintType("currentSaturation", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentSaturation", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentSaturation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentSaturation", [value unsignedCharValue], 254U)); @@ -14647,7 +14647,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -14670,7 +14670,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -14717,7 +14717,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); { @@ -14744,7 +14744,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); { @@ -14782,7 +14782,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("CurrentX", actualValue, CurrentXValue)); } - VerifyOrReturn(CheckConstraintType("currentX", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentX", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentX", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentX", [value unsignedShortValue], 65279U)); @@ -14810,7 +14810,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("CurrentY", actualValue, CurrentYValue)); } - VerifyOrReturn(CheckConstraintType("currentY", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentY", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentY", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentY", [value unsignedShortValue], 65279U)); @@ -14872,7 +14872,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -14919,7 +14919,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); { @@ -14957,7 +14957,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ColorTemperature", actualValue, ColorTemperatureMiredsValue)); } - VerifyOrReturn(CheckConstraintType("colorTemperature", "", "uint16")); + VerifyOrReturn(CheckConstraintType("colorTemperature", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("colorTemperature", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("colorTemperature", [value unsignedShortValue], 65279U)); @@ -15006,7 +15006,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -15053,7 +15053,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); { @@ -15091,7 +15091,7 @@ class Test_TC_CC_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("EnhancedCurrentHue", actualValue, EnhancedCurrentHueValue)); } - VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("enhancedCurrentHue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("enhancedCurrentHue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("enhancedCurrentHue", [value unsignedShortValue], 65535U)); @@ -15290,7 +15290,7 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -15315,7 +15315,7 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -15335,7 +15335,7 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -15370,7 +15370,7 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -15395,7 +15395,7 @@ class Test_TC_DESC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -15699,7 +15699,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -15724,7 +15724,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("fullDuplex", "", "bool")); + VerifyOrReturn(CheckConstraintType("fullDuplex", "boolean", "boolean")); } NextTest(); @@ -15745,7 +15745,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetRxCount", "", "uint64")); + VerifyOrReturn(CheckConstraintType("packetRxCount", "int64u", "int64u")); NextTest(); }]; @@ -15773,7 +15773,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetTxCount", "", "uint64")); + VerifyOrReturn(CheckConstraintType("packetTxCount", "int64u", "int64u")); NextTest(); }]; @@ -15801,7 +15801,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("txErrCount", "", "uint64")); + VerifyOrReturn(CheckConstraintType("txErrCount", "int64u", "int64u")); NextTest(); }]; @@ -15830,7 +15830,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("collisionCount", "", "uint64")); + VerifyOrReturn(CheckConstraintType("collisionCount", "int64u", "int64u")); NextTest(); }]; @@ -15859,7 +15859,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("overrunCount", "", "uint64")); + VerifyOrReturn(CheckConstraintType("overrunCount", "int64u", "int64u")); NextTest(); }]; @@ -15890,7 +15890,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("carrierDetect", "", "bool")); + VerifyOrReturn(CheckConstraintType("carrierDetect", "boolean", "boolean")); } NextTest(); @@ -15921,7 +15921,7 @@ class Test_TC_DGETH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("timeSinceReset", "", "uint64")); + VerifyOrReturn(CheckConstraintType("timeSinceReset", "int64u", "int64u")); NextTest(); }]; @@ -16266,7 +16266,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16291,7 +16291,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16316,7 +16316,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16341,7 +16341,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16366,7 +16366,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16391,7 +16391,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16416,7 +16416,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16441,7 +16441,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16466,7 +16466,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16491,7 +16491,7 @@ class Test_TC_DGETH_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("PHYRate", "", "enum8")); + VerifyOrReturn(CheckConstraintType("PHYRate", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("PHYRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PHYRate", [value unsignedCharValue], 9U)); } @@ -16896,7 +16896,7 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -16921,7 +16921,7 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -16941,7 +16941,7 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -16970,7 +16970,7 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -16997,7 +16997,7 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -17022,7 +17022,7 @@ class Test_TC_FLW_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -17181,7 +17181,7 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("measuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value unsignedShortValue], 65535U)); } @@ -17207,7 +17207,7 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value unsignedShortValue], 65535U)); } @@ -17233,7 +17233,7 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value unsignedShortValue], 65535U)); } @@ -17257,7 +17257,7 @@ class Test_TC_FLW_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16")); + VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); @@ -17417,7 +17417,7 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -17442,7 +17442,7 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -17462,7 +17462,7 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -17493,7 +17493,7 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 4UL)); @@ -17517,7 +17517,7 @@ class Test_TC_CGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 3UL)); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 5UL)); @@ -17714,7 +17714,7 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("breadcrumb", "", "uint64")); + VerifyOrReturn(CheckConstraintType("breadcrumb", "int64u", "int64u")); NextTest(); }]; @@ -17849,7 +17849,7 @@ class Test_TC_CGEN_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("supportsConcurrentConnection", "", "bool")); + VerifyOrReturn(CheckConstraintType("supportsConcurrentConnection", "boolean", "boolean")); NextTest(); }]; @@ -17993,7 +17993,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -18018,7 +18018,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -18038,7 +18038,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 8UL)); @@ -18066,7 +18066,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -18093,7 +18093,7 @@ class Test_TC_DGGEN_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -18367,7 +18367,7 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("networkInterfaces", "", "list")); + VerifyOrReturn(CheckConstraintType("networkInterfaces", "list", "list")); NextTest(); }]; @@ -18387,7 +18387,7 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("rebootCount", "", "uint16")); + VerifyOrReturn(CheckConstraintType("rebootCount", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("rebootCount", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("rebootCount", [value unsignedShortValue], 65535U)); @@ -18451,7 +18451,7 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("upTime", "", "uint64")); + VerifyOrReturn(CheckConstraintType("upTime", "int64u", "int64u")); NextTest(); }]; @@ -18471,7 +18471,7 @@ class Test_TC_DGGEN_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("totalOperationalHours", "", "uint32")); + VerifyOrReturn(CheckConstraintType("totalOperationalHours", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("totalOperationalHours", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("totalOperationalHours", [value unsignedIntValue], 4294967294UL)); @@ -18750,7 +18750,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -18773,7 +18773,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -18796,7 +18796,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -18814,7 +18814,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); @@ -18840,7 +18840,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -18860,7 +18860,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 64UL)); NextTest(); @@ -18880,7 +18880,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); NextTest(); @@ -18905,7 +18905,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -18929,7 +18929,7 @@ class Test_TC_I_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("", actualValue[0], 0UL)); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -19054,7 +19054,7 @@ class Test_TC_I_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("identifyTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("identifyTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("identifyTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("identifyTime", [value unsignedShortValue], 65535U)); @@ -19075,7 +19075,7 @@ class Test_TC_I_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("identifyType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("identifyType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("identifyType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("identifyType", [value unsignedCharValue], 5U)); @@ -20290,7 +20290,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -20314,7 +20314,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -20333,7 +20333,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -20361,7 +20361,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -20382,7 +20382,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 4UL)); NextTest(); @@ -20408,7 +20408,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -20432,7 +20432,7 @@ class Test_TC_ILL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -20601,7 +20601,7 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("measuredValue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("measuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value unsignedShortValue], 65534U)); } @@ -20626,7 +20626,7 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value unsignedShortValue], 65533U)); } @@ -20651,7 +20651,7 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value unsignedShortValue], 2U)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value unsignedShortValue], 65534U)); } @@ -20674,7 +20674,7 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16")); + VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); @@ -20698,7 +20698,7 @@ class Test_TC_ILL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("lightSensorType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("lightSensorType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("lightSensorType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("lightSensorType", [value unsignedCharValue], 254U)); } @@ -20966,7 +20966,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -20986,7 +20986,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 7UL)); @@ -21009,7 +21009,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 15UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 17UL)); @@ -21033,7 +21033,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16384UL)); @@ -21056,7 +21056,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 4UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 5UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 6UL)); @@ -21080,7 +21080,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); NextTest(); @@ -21102,7 +21102,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -21124,7 +21124,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16UL)); NextTest(); @@ -21146,7 +21146,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 18UL)); NextTest(); @@ -21168,7 +21168,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 19UL)); NextTest(); @@ -21190,7 +21190,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 20UL)); NextTest(); @@ -21212,7 +21212,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -21241,7 +21241,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 8UL)); NextTest(); @@ -21268,7 +21268,7 @@ class Test_TC_LVL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -21602,7 +21602,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentLevel", [value unsignedCharValue], 255U)); { @@ -21628,7 +21628,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("remainingTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("remainingTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("remainingTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("remainingTime", [value unsignedShortValue], 65535U)); @@ -21657,7 +21657,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("min level", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("minLevel", "int8u", "int8u")); { MinLevelValue = value; } @@ -21682,7 +21682,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("minLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("minLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minLevel", [value unsignedCharValue], 255U)); { @@ -21714,7 +21714,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("max level", actualValue, 254U)); } - VerifyOrReturn(CheckConstraintType("maxLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("maxLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("maxLevel", [value unsignedCharValue], MinLevelValue)); { MaxLevelValue = value; @@ -21740,7 +21740,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("maxLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("maxLevel", "int8u", "int8u")); VerifyOrReturn( CheckConstraintMinValue("maxLevel", [value unsignedCharValue], MinLevelFeatureMapNotSupportedValue)); VerifyOrReturn(CheckConstraintMaxValue("maxLevel", [value unsignedCharValue], 254U)); @@ -21767,7 +21767,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentLevel", [value unsignedCharValue], MinLevelValue)); VerifyOrReturn(CheckConstraintMaxValue("currentLevel", [value unsignedCharValue], MaxLevelValue)); @@ -21790,7 +21790,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); VerifyOrReturn( CheckConstraintMinValue("currentLevel", [value unsignedCharValue], MinLevelFeatureMapNotSupportedValue)); VerifyOrReturn( @@ -21815,7 +21815,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentFrequency", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentFrequency", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentFrequency", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentFrequency", [value unsignedShortValue], 65535U)); @@ -21839,7 +21839,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minFrequency", "", "uint16")); + VerifyOrReturn(CheckConstraintType("minFrequency", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("minFrequency", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minFrequency", [value unsignedShortValue], 65535U)); { @@ -21866,7 +21866,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("maxFrequency", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxFrequency", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxFrequency", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxFrequency", [value unsignedShortValue], 65535U)); { @@ -21892,7 +21892,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentFrequency", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentFrequency", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentFrequency", [value unsignedShortValue], MinFrequencyValue)); VerifyOrReturn(CheckConstraintMaxValue("currentFrequency", [value unsignedShortValue], MaxFrequencyValue)); @@ -21915,7 +21915,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("onOffTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onOffTransitionTime", [value unsignedShortValue], 65535U)); @@ -21940,7 +21940,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("onLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("onLevel", [value unsignedCharValue], MinLevelValue)); VerifyOrReturn(CheckConstraintMaxValue("onLevel", [value unsignedCharValue], MaxLevelValue)); } @@ -21966,7 +21966,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("onLevel", "int8u", "int8u")); VerifyOrReturn( CheckConstraintMinValue("onLevel", [value unsignedCharValue], MinLevelFeatureMapNotSupportedValue)); VerifyOrReturn( @@ -21994,7 +21994,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("onTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onTransitionTime", [value unsignedShortValue], 65535U)); } @@ -22020,7 +22020,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("offTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("offTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("offTransitionTime", [value unsignedShortValue], 65535U)); } @@ -22046,7 +22046,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8")); + VerifyOrReturn(CheckConstraintType("defaultMoveRate", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("defaultMoveRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("defaultMoveRate", [value unsignedCharValue], 255U)); } @@ -22075,7 +22075,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("options", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("options", "", "map8")); + VerifyOrReturn(CheckConstraintType("options", "bitmap8", "bitmap8")); NextTest(); }]; @@ -22097,7 +22097,7 @@ class Test_TC_LVL_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("startUpCurrentLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("startUpCurrentLevel", [value unsignedCharValue], 255U)); } @@ -22427,7 +22427,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("onOffTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onOffTransitionTime", [value unsignedShortValue], 65535U)); { @@ -22483,7 +22483,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { mOnOffTransitionTimeConfigValue.HasValue() ? mOnOffTransitionTimeConfigValue.Value() : 10U)); } - VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintNotValue("onOffTransitionTime", value, OnOffTransitionTimeValue)); NextTest(); @@ -22508,7 +22508,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("onLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("onLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onLevel", [value unsignedCharValue], 255U)); } @@ -22566,7 +22566,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { } if (value != nil) { - VerifyOrReturn(CheckConstraintType("onLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("onLevel", "int8u", "int8u")); } VerifyOrReturn(CheckConstraintNotValue("onLevel", value, OnLevelValue)); @@ -22592,7 +22592,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("onTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onTransitionTime", [value unsignedShortValue], 65535U)); } @@ -22651,7 +22651,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { } if (value != nil) { - VerifyOrReturn(CheckConstraintType("onTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onTransitionTime", "int16u", "int16u")); } VerifyOrReturn(CheckConstraintNotValue("onTransitionTime", value, OnTransitionTimeValue)); @@ -22677,7 +22677,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("offTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("offTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("offTransitionTime", [value unsignedShortValue], 65535U)); } @@ -22736,7 +22736,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { } if (value != nil) { - VerifyOrReturn(CheckConstraintType("offTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("offTransitionTime", "int16u", "int16u")); } VerifyOrReturn(CheckConstraintNotValue("offTransitionTime", value, OffTransitionTimeValue)); @@ -22762,7 +22762,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8")); + VerifyOrReturn(CheckConstraintType("defaultMoveRate", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("defaultMoveRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("defaultMoveRate", [value unsignedCharValue], 255U)); } @@ -22821,7 +22821,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { } if (value != nil) { - VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8")); + VerifyOrReturn(CheckConstraintType("defaultMoveRate", "int8u", "int8u")); } VerifyOrReturn(CheckConstraintNotValue("defaultMoveRate", value, DefaultMoveRatevalue)); @@ -22847,7 +22847,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("startUpCurrentLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("startUpCurrentLevel", [value unsignedCharValue], 255U)); } @@ -22906,7 +22906,7 @@ class Test_TC_LVL_2_2 : public TestCommandBridge { } if (value != nil) { - VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("startUpCurrentLevel", "int8u", "int8u")); } VerifyOrReturn(CheckConstraintNotValue("startUpCurrentLevel", value, StartUpCurrentLevelValue)); @@ -23300,7 +23300,7 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("minLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("minLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minLevel", [value unsignedCharValue], 255U)); @@ -23323,7 +23323,7 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("maxLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("maxLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("maxLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxLevel", [value unsignedCharValue], 255U)); @@ -23514,7 +23514,7 @@ class Test_TC_LVL_3_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onOffTransitionTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("onOffTransitionTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onOffTransitionTime", [value unsignedShortValue], 65535U)); @@ -23992,7 +23992,7 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("minLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("minLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minLevel", [value unsignedCharValue], 255U)); { @@ -24044,7 +24044,7 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("maxLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("maxLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("maxLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxLevel", [value unsignedCharValue], 255U)); { @@ -24208,7 +24208,7 @@ class Test_TC_LVL_4_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("defaultMoveRate", "", "uint8")); + VerifyOrReturn(CheckConstraintType("defaultMoveRate", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("defaultMoveRate", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("defaultMoveRate", [value unsignedCharValue], 255U)); } @@ -24695,7 +24695,7 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("minLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("minLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minLevel", [value unsignedCharValue], 254U)); { @@ -24777,7 +24777,7 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("current level", actualValue, [MinlevelValue unsignedCharValue] + 1U)); } - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentLevel", [value unsignedCharValue], 254U)); { @@ -24808,7 +24808,7 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("current level", actualValue, 2U)); } - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentLevel", [value unsignedCharValue], 254U)); @@ -24895,7 +24895,7 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("current level", actualValue, 66U)); } - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); NextTest(); }]; @@ -24920,7 +24920,7 @@ class Test_TC_LVL_5_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("current level", actualValue, 66U)); } - VerifyOrReturn(CheckConstraintType("currentLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentLevel", "int8u", "int8u")); NextTest(); }]; @@ -25470,7 +25470,7 @@ class Test_TC_LVL_6_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minLevel", "", "uint8")); + VerifyOrReturn(CheckConstraintType("minLevel", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("minLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minLevel", [value unsignedCharValue], 255U)); { @@ -25895,7 +25895,7 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -25918,7 +25918,7 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -25946,7 +25946,7 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("", actualValue[4], 65533UL)); } - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); NextTest(); }]; @@ -25970,7 +25970,7 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("", actualValue[0], 0UL)); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -25993,7 +25993,7 @@ class Test_TC_LOWPOWER_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -26163,7 +26163,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -26183,7 +26183,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 7UL)); @@ -26206,7 +26206,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -26232,7 +26232,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -26254,7 +26254,7 @@ class Test_TC_KEYPADINPUT_1_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL)); NextTest(); @@ -26459,7 +26459,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -26484,7 +26484,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -26509,7 +26509,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -26529,7 +26529,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -26555,7 +26555,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); NextTest(); @@ -26577,7 +26577,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -26599,7 +26599,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -26623,7 +26623,7 @@ class Test_TC_APPLAUNCHER_1_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 3UL)); NextTest(); @@ -26813,7 +26813,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -26833,7 +26833,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 1UL)); @@ -26856,7 +26856,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -26882,7 +26882,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); NextTest(); @@ -26904,7 +26904,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -26926,7 +26926,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -26956,7 +26956,7 @@ class Test_TC_MEDIAINPUT_1_4 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -27120,7 +27120,7 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -27143,7 +27143,7 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -27161,7 +27161,7 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -27190,7 +27190,7 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -27213,7 +27213,7 @@ class Test_TC_WAKEONLAN_1_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -27456,7 +27456,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -27474,7 +27474,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 3UL)); @@ -27495,7 +27495,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -27519,7 +27519,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); NextTest(); @@ -27539,7 +27539,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -27559,7 +27559,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); NextTest(); @@ -27579,7 +27579,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -27599,7 +27599,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); NextTest(); @@ -27619,7 +27619,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 3UL)); NextTest(); @@ -27644,7 +27644,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -27662,7 +27662,7 @@ class Test_TC_CHANNEL_1_6 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL)); NextTest(); @@ -27988,7 +27988,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -28008,7 +28008,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 3UL)); @@ -28031,7 +28031,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); @@ -28058,7 +28058,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -28080,7 +28080,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); NextTest(); @@ -28102,7 +28102,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -28124,7 +28124,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 4UL)); NextTest(); @@ -28146,7 +28146,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 5UL)); NextTest(); @@ -28168,7 +28168,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 6UL)); NextTest(); @@ -28190,7 +28190,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -28214,7 +28214,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 3UL)); NextTest(); @@ -28236,7 +28236,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 4UL)); NextTest(); @@ -28258,7 +28258,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 5UL)); NextTest(); @@ -28280,7 +28280,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 6UL)); NextTest(); @@ -28302,7 +28302,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 7UL)); NextTest(); @@ -28324,7 +28324,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 8UL)); NextTest(); @@ -28346,7 +28346,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 9UL)); NextTest(); @@ -28368,7 +28368,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 11UL)); NextTest(); @@ -28390,7 +28390,7 @@ class Test_TC_MEDIAPLAYBACK_1_7 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 10UL)); NextTest(); @@ -28573,7 +28573,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -28593,7 +28593,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 3UL)); @@ -28616,7 +28616,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); @@ -28644,7 +28644,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -28672,7 +28672,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { VerifyOrReturn(CheckValue("", actualValue[0], 1UL)); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -28697,7 +28697,7 @@ class Test_TC_AUDIOOUTPUT_1_8 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -28874,7 +28874,7 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -28899,7 +28899,7 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -28919,7 +28919,7 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); @@ -28946,7 +28946,7 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -28968,7 +28968,7 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -28990,7 +28990,7 @@ class Test_TC_TGTNAV_1_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL)); NextTest(); @@ -29191,7 +29191,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -29216,7 +29216,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -29236,7 +29236,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 4UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 5UL)); @@ -29267,7 +29267,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); NextTest(); @@ -29289,7 +29289,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -29311,7 +29311,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -29338,7 +29338,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -29363,7 +29363,7 @@ class Test_TC_APBSC_1_10 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -29573,7 +29573,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -29593,7 +29593,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 3UL)); @@ -29616,7 +29616,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -29642,7 +29642,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); NextTest(); @@ -29664,7 +29664,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); NextTest(); @@ -29686,7 +29686,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -29708,7 +29708,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); NextTest(); @@ -29730,7 +29730,7 @@ class Test_TC_CONTENTLAUNCHER_1_11 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 2UL)); NextTest(); @@ -29898,7 +29898,7 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -29923,7 +29923,7 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -29943,7 +29943,7 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65531UL)); @@ -29969,7 +29969,7 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 3UL)); @@ -29993,7 +29993,7 @@ class Test_TC_ALOGIN_1_12 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("generatedCommandList", value, 1UL)); NextTest(); @@ -31881,7 +31881,7 @@ class Test_TC_CHANNEL_5_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("channelList", "", "list")); + VerifyOrReturn(CheckConstraintType("channelList", "list", "list")); NextTest(); }]; @@ -32132,7 +32132,7 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("channelList", "", "list")); + VerifyOrReturn(CheckConstraintType("channelList", "list", "list")); NextTest(); }]; @@ -32210,7 +32210,7 @@ class Test_TC_CHANNEL_5_3 : public TestCommandBridge { } if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentChannel", "", "list")); + VerifyOrReturn(CheckConstraintType("currentChannel", "ChannelInfo", "ChannelInfo")); } NextTest(); @@ -34354,7 +34354,7 @@ class Test_TC_AUDIOOUTPUT_7_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("outputList", "", "OutPutInfo")); + VerifyOrReturn(CheckConstraintType("outputList", "list", "list")); NextTest(); }]; @@ -34540,7 +34540,7 @@ class Test_TC_AUDIOOUTPUT_7_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("outputList", "", "OutPutInfo")); + VerifyOrReturn(CheckConstraintType("outputList", "list", "list")); { audioOutputListValues = value; } @@ -34728,7 +34728,7 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentTarget", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentTarget", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentTarget", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentTarget", [value unsignedCharValue], 255U)); @@ -34752,7 +34752,7 @@ class Test_TC_TGTNAV_8_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("targetList", "", "list")); + VerifyOrReturn(CheckConstraintType("targetList", "list", "list")); { TargetListValues = value; } @@ -34996,7 +34996,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("vendorName", "", "string")); + VerifyOrReturn(CheckConstraintType("vendorName", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("vendorName", value, 32)); NextTest(); }]; @@ -35018,7 +35018,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("vendorID", "", "vendor-id")); + VerifyOrReturn(CheckConstraintType("vendorID", "vendor_id", "vendor_id")); { vendorID = value; } @@ -35042,7 +35042,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("applicationName", "", "string")); + VerifyOrReturn(CheckConstraintType("applicationName", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("applicationName", value, 256)); NextTest(); }]; @@ -35063,7 +35063,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("productID", "", "uint16")); + VerifyOrReturn(CheckConstraintType("productID", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("productID", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("productID", [value unsignedShortValue], 65535U)); @@ -35087,7 +35087,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("application", "", "struct")); + VerifyOrReturn(CheckConstraintType("application", "ApplicationBasicApplication", "ApplicationBasicApplication")); NextTest(); }]; @@ -35129,7 +35129,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("applicationVersion", "", "string")); + VerifyOrReturn(CheckConstraintType("applicationVersion", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("applicationVersion", value, 32)); NextTest(); }]; @@ -35150,7 +35150,7 @@ class Test_TC_APBSC_9_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("allowedVendorList", "", "list")); + VerifyOrReturn(CheckConstraintType("allowedVendorList", "list", "list")); NextTest(); }]; @@ -35276,7 +35276,7 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptHeader", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptHeader", "list", "list")); NextTest(); }]; @@ -35297,7 +35297,7 @@ class Test_TC_CONTENTLAUNCHER_10_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("supportedStreamingProtocols", "", "map32")); + VerifyOrReturn(CheckConstraintType("supportedStreamingProtocols", "bitmap32", "bitmap32")); NextTest(); }]; @@ -35493,7 +35493,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -35518,7 +35518,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -35543,7 +35543,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -35563,7 +35563,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -35593,7 +35593,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 4UL)); NextTest(); @@ -35615,7 +35615,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 5UL)); NextTest(); @@ -35637,7 +35637,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -35664,7 +35664,7 @@ class Test_TC_MOD_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -36155,7 +36155,7 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -36180,7 +36180,7 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -36200,7 +36200,7 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -36234,7 +36234,7 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -36259,7 +36259,7 @@ class Test_TC_OCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -36508,7 +36508,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupancy", "", "map8")); + VerifyOrReturn(CheckConstraintType("occupancy", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("occupancy", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("occupancy", [value unsignedCharValue], 1U)); @@ -36531,7 +36531,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupancySensorType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("occupancySensorType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("occupancySensorType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("occupancySensorType", [value unsignedCharValue], 3U)); @@ -36555,7 +36555,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupancySensorTypeBitmap", "", "map8")); + VerifyOrReturn(CheckConstraintType("occupancySensorTypeBitmap", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("occupancySensorTypeBitmap", [value unsignedCharValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue("occupancySensorTypeBitmap", [value unsignedCharValue], 273U)); @@ -36584,7 +36584,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("PIR occupied to unoccupied delay", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("pirOccupiedToUnoccupiedDelay", "", "uint16")); + VerifyOrReturn(CheckConstraintType("pirOccupiedToUnoccupiedDelay", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 65535U)); @@ -36613,7 +36613,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("PIR unoccupied to occupied delay", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedDelay", "", "uint16")); + VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedDelay", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 65535U)); @@ -36642,7 +36642,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("PIR unoccupied to occupied threshold", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedThreshold", "", "uint8")); + VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedThreshold", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254U)); @@ -36671,7 +36671,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ultrasonic occupied to unoccupied delay", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("ultrasonicOccupiedToUnoccupiedDelay", "", "uint16")); + VerifyOrReturn(CheckConstraintType("ultrasonicOccupiedToUnoccupiedDelay", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("ultrasonicOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); VerifyOrReturn( @@ -36702,7 +36702,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied delay", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedDelay", "", "uint16")); + VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedDelay", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("ultrasonicUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); VerifyOrReturn( @@ -36733,7 +36733,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied threshold", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedThreshold", "", "uint16")); + VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedThreshold", "int8u", "int8u")); VerifyOrReturn( CheckConstraintMinValue("ultrasonicUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); VerifyOrReturn( @@ -36764,7 +36764,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("physical contact occupied to unoccupied delay", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("physicalContactOccupiedToUnoccupiedDelay", "", "uint16")); + VerifyOrReturn(CheckConstraintType("physicalContactOccupiedToUnoccupiedDelay", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("physicalContactOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U)); VerifyOrReturn( @@ -36795,7 +36795,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("physical contact unoccupied to occupied delay", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedDelay", "", "uint16")); + VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedDelay", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("physicalContactUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U)); VerifyOrReturn( @@ -36826,7 +36826,7 @@ class Test_TC_OCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("physical contact unoccupied to occupied threshold", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedThreshold", "", "uint8")); + VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedThreshold", "int8u", "int8u")); VerifyOrReturn( CheckConstraintMinValue("physicalContactUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U)); VerifyOrReturn( @@ -37024,7 +37024,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -37047,7 +37047,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -37070,7 +37070,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -37088,7 +37088,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); @@ -37113,7 +37113,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16384UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16385UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16386UL)); @@ -37136,7 +37136,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -37158,7 +37158,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 64UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 65UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 66UL)); @@ -37185,7 +37185,7 @@ class Test_TC_OO_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -37351,7 +37351,7 @@ class Test_TC_OO_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("onOff", "", "bool")); + VerifyOrReturn(CheckConstraintType("onOff", "boolean", "boolean")); NextTest(); }]; @@ -37369,7 +37369,7 @@ class Test_TC_OO_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("globalSceneControl", "", "bool")); + VerifyOrReturn(CheckConstraintType("globalSceneControl", "boolean", "boolean")); NextTest(); }]; @@ -37387,7 +37387,7 @@ class Test_TC_OO_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("onTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("onTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("onTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("onTime", [value unsignedShortValue], 65535U)); @@ -37408,7 +37408,7 @@ class Test_TC_OO_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("offWaitTime", "", "uint16")); + VerifyOrReturn(CheckConstraintType("offWaitTime", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("offWaitTime", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("offWaitTime", [value unsignedShortValue], 65535U)); @@ -37431,7 +37431,7 @@ class Test_TC_OO_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("startUpOnOff", "", "enum8")); + VerifyOrReturn(CheckConstraintType("startUpOnOff", "enum8", "enum8")); } NextTest(); @@ -39121,7 +39121,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -39141,7 +39141,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 15UL)); @@ -39164,7 +39164,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -39193,7 +39193,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 5UL)); NextTest(); @@ -39215,7 +39215,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 14UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 15UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16UL)); @@ -39239,7 +39239,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 26UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 28UL)); @@ -39262,7 +39262,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 19UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 25UL)); @@ -39290,7 +39290,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -39315,7 +39315,7 @@ class Test_TC_PS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -39775,7 +39775,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("status", "", "enum8")); + VerifyOrReturn(CheckConstraintType("status", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("status", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("status", [value unsignedCharValue], 3U)); @@ -39798,7 +39798,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("order", "", "uint8")); + VerifyOrReturn(CheckConstraintType("order", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("order", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("order", [value unsignedCharValue], 255U)); @@ -39821,7 +39821,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("description", "", "string")); + VerifyOrReturn(CheckConstraintType("description", "char_string", "char_string")); NextTest(); }]; @@ -39844,7 +39844,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("wiredAssessedInputVoltage", "", "uint32")); + VerifyOrReturn(CheckConstraintType("wiredAssessedInputVoltage", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("wiredAssessedInputVoltage", [value unsignedIntValue], 0UL)); VerifyOrReturn( CheckConstraintMaxValue("wiredAssessedInputVoltage", [value unsignedIntValue], 4294967295UL)); @@ -39872,7 +39872,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("wiredAssessedInputFrequency", "", "uint16")); + VerifyOrReturn(CheckConstraintType("wiredAssessedInputFrequency", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("wiredAssessedInputFrequency", [value unsignedShortValue], 0U)); VerifyOrReturn( CheckConstraintMaxValue("wiredAssessedInputFrequency", [value unsignedShortValue], 65535U)); @@ -39897,7 +39897,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("wiredCurrentType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("wiredCurrentType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("wiredCurrentType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("wiredCurrentType", [value unsignedCharValue], 1U)); @@ -39922,7 +39922,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("wiredAssessedCurrent", "", "uint32")); + VerifyOrReturn(CheckConstraintType("wiredAssessedCurrent", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("wiredAssessedCurrent", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("wiredAssessedCurrent", [value unsignedIntValue], 4294967295UL)); } @@ -39946,7 +39946,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("wiredNominalVoltage", "", "uint32")); + VerifyOrReturn(CheckConstraintType("wiredNominalVoltage", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("wiredNominalVoltage", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("wiredNominalVoltage", [value unsignedIntValue], 4294967295UL)); @@ -39969,7 +39969,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("wiredMaximumCurrent", "", "uint32")); + VerifyOrReturn(CheckConstraintType("wiredMaximumCurrent", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("wiredMaximumCurrent", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("wiredMaximumCurrent", [value unsignedIntValue], 4294967295UL)); @@ -39992,7 +39992,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("wiredPresent", "", "bool")); + VerifyOrReturn(CheckConstraintType("wiredPresent", "boolean", "boolean")); NextTest(); }]; @@ -40012,7 +40012,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("activeWiredFaults", "", "list")); + VerifyOrReturn(CheckConstraintType("activeWiredFaults", "list", "list")); VerifyOrReturn(CheckConstraintMaxLength("activeWiredFaults", value, 8)); NextTest(); }]; @@ -40035,7 +40035,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("batVoltage", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batVoltage", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batVoltage", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batVoltage", [value unsignedIntValue], 4294967295UL)); } @@ -40061,7 +40061,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("batPercentRemaining", "", "uint8")); + VerifyOrReturn(CheckConstraintType("batPercentRemaining", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("batPercentRemaining", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("batPercentRemaining", [value unsignedCharValue], 200U)); } @@ -40087,7 +40087,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("batTimeRemaining", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batTimeRemaining", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batTimeRemaining", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batTimeRemaining", [value unsignedIntValue], 4294967295UL)); } @@ -40111,7 +40111,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batChargeLevel", "", "enum8")); + VerifyOrReturn(CheckConstraintType("batChargeLevel", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("batChargeLevel", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("batChargeLevel", [value unsignedCharValue], 2U)); @@ -40134,7 +40134,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batReplacementNeeded", "", "bool")); + VerifyOrReturn(CheckConstraintType("batReplacementNeeded", "boolean", "boolean")); NextTest(); }]; @@ -40154,7 +40154,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batReplaceability", "", "enum8")); + VerifyOrReturn(CheckConstraintType("batReplaceability", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("batReplaceability", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("batReplaceability", [value unsignedCharValue], 3U)); @@ -40177,7 +40177,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batPresent", "", "bool")); + VerifyOrReturn(CheckConstraintType("batPresent", "boolean", "boolean")); NextTest(); }]; @@ -40197,7 +40197,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("activeBatFaults", "", "list")); + VerifyOrReturn(CheckConstraintType("activeBatFaults", "list", "list")); VerifyOrReturn(CheckConstraintMaxLength("activeBatFaults", value, 8)); NextTest(); }]; @@ -40219,7 +40219,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batReplacementDescription", "", "string")); + VerifyOrReturn(CheckConstraintType("batReplacementDescription", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("batReplacementDescription", value, 60)); NextTest(); }]; @@ -40240,7 +40240,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batCommonDesignation", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batCommonDesignation", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batCommonDesignation", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batCommonDesignation", [value unsignedIntValue], 80UL)); @@ -40263,7 +40263,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batANSIDesignation", "", "string")); + VerifyOrReturn(CheckConstraintType("batANSIDesignation", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("batANSIDesignation", value, 20)); NextTest(); }]; @@ -40284,7 +40284,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batIECDesignation", "", "string")); + VerifyOrReturn(CheckConstraintType("batIECDesignation", "char_string", "char_string")); VerifyOrReturn(CheckConstraintMaxLength("batIECDesignation", value, 20)); NextTest(); }]; @@ -40305,7 +40305,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batApprovedChemistry", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batApprovedChemistry", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batApprovedChemistry", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batApprovedChemistry", [value unsignedIntValue], 32UL)); @@ -40328,7 +40328,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batCapacity", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batCapacity", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batCapacity", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batCapacity", [value unsignedIntValue], 4294967295UL)); @@ -40351,7 +40351,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batQuantity", "", "uint8")); + VerifyOrReturn(CheckConstraintType("batQuantity", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("batQuantity", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("batQuantity", [value unsignedCharValue], 255U)); @@ -40374,7 +40374,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batChargeState", "", "enum8")); + VerifyOrReturn(CheckConstraintType("batChargeState", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("batChargeState", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("batChargeState", [value unsignedCharValue], 3U)); @@ -40399,7 +40399,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("batTimeToFullCharge", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batTimeToFullCharge", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batTimeToFullCharge", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batTimeToFullCharge", [value unsignedIntValue], 4294967295UL)); } @@ -40424,7 +40424,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("batFunctionalWhileCharging", "", "bool")); + VerifyOrReturn(CheckConstraintType("batFunctionalWhileCharging", "boolean", "boolean")); NextTest(); }]; @@ -40446,7 +40446,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("batChargingCurrent", "", "uint32")); + VerifyOrReturn(CheckConstraintType("batChargingCurrent", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("batChargingCurrent", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("batChargingCurrent", [value unsignedIntValue], 4294967295UL)); } @@ -40470,7 +40470,7 @@ class Test_TC_PS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("activeBatChargeFaults", "", "list")); + VerifyOrReturn(CheckConstraintType("activeBatChargeFaults", "list", "list")); NextTest(); }]; @@ -40708,7 +40708,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -40733,7 +40733,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 1UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -40758,7 +40758,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -40778,7 +40778,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -40807,7 +40807,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16UL)); NextTest(); @@ -40829,7 +40829,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 17UL)); NextTest(); @@ -40851,7 +40851,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 18UL)); NextTest(); @@ -40873,7 +40873,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 20UL)); NextTest(); @@ -40895,7 +40895,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -40917,7 +40917,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 19UL)); NextTest(); @@ -40944,7 +40944,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -40969,7 +40969,7 @@ class Test_TC_PRS_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -41183,7 +41183,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("measuredValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value shortValue], 32767)); } @@ -41209,7 +41209,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value shortValue], 32767)); } @@ -41235,7 +41235,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value shortValue], 32767)); } @@ -41259,7 +41259,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("tolerance", "", "int16")); + VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); @@ -41284,7 +41284,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("scaledValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("scaledValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("scaledValue", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("scaledValue", [value shortValue], 32767)); } @@ -41310,7 +41310,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minScaledValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("minScaledValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minScaledValue", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("minScaledValue", [value shortValue], 32767)); } @@ -41336,7 +41336,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxScaledValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxScaledValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxScaledValue", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("maxScaledValue", [value shortValue], 32767)); } @@ -41360,7 +41360,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("scaledTolerance", "", "int16")); + VerifyOrReturn(CheckConstraintType("scaledTolerance", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("scaledTolerance", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("scaledTolerance", [value unsignedShortValue], 2048U)); @@ -41383,7 +41383,7 @@ class Test_TC_PRS_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("scale", "", "int8")); + VerifyOrReturn(CheckConstraintType("scale", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("scale", [value charValue], -127)); VerifyOrReturn(CheckConstraintMaxValue("scale", [value charValue], 127)); @@ -41734,7 +41734,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -41758,7 +41758,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -41777,7 +41777,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -41809,7 +41809,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -41830,7 +41830,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 4UL)); NextTest(); @@ -41851,7 +41851,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 5UL)); NextTest(); @@ -41872,7 +41872,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 6UL)); NextTest(); @@ -41893,7 +41893,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 7UL)); NextTest(); @@ -41914,7 +41914,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 8UL)); NextTest(); @@ -41935,7 +41935,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 9UL)); NextTest(); @@ -41956,7 +41956,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 10UL)); NextTest(); @@ -41977,7 +41977,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 11UL)); NextTest(); @@ -41998,7 +41998,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 12UL)); NextTest(); @@ -42019,7 +42019,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 16UL)); NextTest(); @@ -42040,7 +42040,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 20UL)); NextTest(); @@ -42061,7 +42061,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 21UL)); NextTest(); @@ -42082,7 +42082,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 22UL)); NextTest(); @@ -42103,7 +42103,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 23UL)); NextTest(); @@ -42124,7 +42124,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 33UL)); NextTest(); @@ -42150,7 +42150,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -42174,7 +42174,7 @@ class Test_TC_PCC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -42541,7 +42541,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxPressure", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxPressure", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxPressure", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("maxPressure", [value shortValue], 32767)); } @@ -42566,7 +42566,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxSpeed", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxSpeed", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxSpeed", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxSpeed", [value unsignedShortValue], 65535U)); } @@ -42591,7 +42591,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxFlow", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxFlow", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxFlow", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxFlow", [value unsignedShortValue], 65535U)); } @@ -42616,7 +42616,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minConstPressure", "", "int16")); + VerifyOrReturn(CheckConstraintType("minConstPressure", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minConstPressure", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("minConstPressure", [value shortValue], 32767)); } @@ -42641,7 +42641,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxConstPressure", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxConstPressure", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxConstPressure", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("maxConstPressure", [value shortValue], 32767)); } @@ -42666,7 +42666,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minCompPressure", "", "int16")); + VerifyOrReturn(CheckConstraintType("minCompPressure", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minCompPressure", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("minCompPressure", [value shortValue], 32767)); } @@ -42691,7 +42691,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxCompPressure", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxCompPressure", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxCompPressure", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("maxCompPressure", [value shortValue], 32767)); } @@ -42716,7 +42716,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minConstSpeed", "", "uint16")); + VerifyOrReturn(CheckConstraintType("minConstSpeed", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("minConstSpeed", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minConstSpeed", [value unsignedShortValue], 65535U)); } @@ -42741,7 +42741,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxConstSpeed", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxConstSpeed", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxConstSpeed", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxConstSpeed", [value unsignedShortValue], 65535U)); } @@ -42766,7 +42766,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minConstFlow", "", "uint16")); + VerifyOrReturn(CheckConstraintType("minConstFlow", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("minConstFlow", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minConstFlow", [value unsignedShortValue], 65535U)); } @@ -42791,7 +42791,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxConstFlow", "", "uint16")); + VerifyOrReturn(CheckConstraintType("maxConstFlow", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxConstFlow", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("maxConstFlow", [value unsignedShortValue], 65535U)); } @@ -42816,7 +42816,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minConstTemp", "", "int16")); + VerifyOrReturn(CheckConstraintType("minConstTemp", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minConstTemp", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("minConstTemp", [value shortValue], 32767)); } @@ -42841,7 +42841,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxConstTemp", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxConstTemp", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxConstTemp", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("maxConstTemp", [value shortValue], 32767)); } @@ -42864,7 +42864,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("pumpStatus", "", "map16")); + VerifyOrReturn(CheckConstraintType("pumpStatus", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("pumpStatus", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("pumpStatus", [value unsignedShortValue], 8U)); @@ -42886,7 +42886,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("effectiveOperationMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("effectiveOperationMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("effectiveOperationMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("effectiveOperationMode", [value unsignedCharValue], 3U)); @@ -42908,7 +42908,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("effectiveControlMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("effectiveControlMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("effectiveControlMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("effectiveControlMode", [value unsignedCharValue], 7U)); @@ -42932,7 +42932,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("capacity", "", "int16")); + VerifyOrReturn(CheckConstraintType("capacity", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("capacity", [value shortValue], -32768)); VerifyOrReturn(CheckConstraintMaxValue("capacity", [value shortValue], 32767)); } @@ -42957,7 +42957,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("speed", "", "uint16")); + VerifyOrReturn(CheckConstraintType("speed", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("speed", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("speed", [value unsignedShortValue], 65535U)); } @@ -42982,7 +42982,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("lifetimeRunningHours", "", "uint24")); + VerifyOrReturn(CheckConstraintType("lifetimeRunningHours", "int24u", "int24u")); VerifyOrReturn(CheckConstraintMinValue("lifetimeRunningHours", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("lifetimeRunningHours", [value unsignedIntValue], 16777215UL)); } @@ -43007,7 +43007,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("power", "", "uint24")); + VerifyOrReturn(CheckConstraintType("power", "int24u", "int24u")); VerifyOrReturn(CheckConstraintMinValue("power", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("power", [value unsignedIntValue], 16777215UL)); } @@ -43032,7 +43032,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("lifetimeEnergyConsumed", "", "uint32")); + VerifyOrReturn(CheckConstraintType("lifetimeEnergyConsumed", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("lifetimeEnergyConsumed", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("lifetimeEnergyConsumed", [value unsignedIntValue], 4294967295UL)); } @@ -43055,7 +43055,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("operationMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("operationMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("operationMode", [value unsignedCharValue], 3U)); @@ -43077,7 +43077,7 @@ class Test_TC_PCC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("controlMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("controlMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("controlMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("controlMode", [value unsignedCharValue], 7U)); @@ -44619,7 +44619,7 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -44643,7 +44643,7 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -44662,7 +44662,7 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); @@ -44693,7 +44693,7 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -44717,7 +44717,7 @@ class Test_TC_PSCFG_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -44882,7 +44882,7 @@ class Test_TC_RH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 3U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "list")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -44906,7 +44906,7 @@ class Test_TC_RH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -44925,7 +44925,7 @@ class Test_TC_RH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -44958,7 +44958,7 @@ class Test_TC_RH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -44982,7 +44982,7 @@ class Test_TC_RH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -45140,7 +45140,7 @@ class Test_TC_RH_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("measuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value unsignedShortValue], 10000U)); } @@ -45165,7 +45165,7 @@ class Test_TC_RH_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value unsignedShortValue], 9999U)); } @@ -45190,7 +45190,7 @@ class Test_TC_RH_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value unsignedShortValue], 10000U)); } @@ -45213,7 +45213,7 @@ class Test_TC_RH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16")); + VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); @@ -45539,7 +45539,7 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -45566,7 +45566,7 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); @@ -45592,7 +45592,7 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -45615,7 +45615,7 @@ class Test_TC_SWTCH_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -45756,7 +45756,7 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("number of positions", actualValue, 2U)); } - VerifyOrReturn(CheckConstraintType("numberOfPositions", "", "uint8")); + VerifyOrReturn(CheckConstraintType("numberOfPositions", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("numberOfPositions", [value unsignedCharValue], 2U)); NextTest(); @@ -45781,7 +45781,7 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("current position", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("currentPosition", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPosition", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("currentPosition", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentPosition", [value unsignedCharValue], 255U)); @@ -45807,7 +45807,7 @@ class Test_TC_SWTCH_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("multi press max", actualValue, 2U)); } - VerifyOrReturn(CheckConstraintType("multiPressMax", "", "uint8")); + VerifyOrReturn(CheckConstraintType("multiPressMax", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("multiPressMax", [value unsignedCharValue], 2U)); VerifyOrReturn(CheckConstraintMaxValue("multiPressMax", [value unsignedCharValue], 255U)); @@ -45977,7 +45977,7 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 4U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "unit16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -46001,7 +46001,7 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -46020,7 +46020,7 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -46048,7 +46048,7 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 3UL)); NextTest(); @@ -46074,7 +46074,7 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -46098,7 +46098,7 @@ class Test_TC_TMP_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -46256,7 +46256,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("measuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("measuredValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("measuredValue", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("measuredValue", [value shortValue], 32767)); } @@ -46281,7 +46281,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("minMeasuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("minMeasuredValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minMeasuredValue", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("minMeasuredValue", [value shortValue], 32767)); } @@ -46306,7 +46306,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxMeasuredValue", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxMeasuredValue", [value shortValue], -27314)); VerifyOrReturn(CheckConstraintMaxValue("maxMeasuredValue", [value shortValue], 32767)); } @@ -46329,7 +46329,7 @@ class Test_TC_TMP_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("tolerance", "", "uint16")); + VerifyOrReturn(CheckConstraintType("tolerance", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("tolerance", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("tolerance", [value unsignedShortValue], 2048U)); @@ -46606,7 +46606,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -46626,7 +46626,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 1UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 63UL)); @@ -46649,7 +46649,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 27UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 28UL)); @@ -46678,7 +46678,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 18UL)); NextTest(); @@ -46700,7 +46700,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 17UL)); NextTest(); @@ -46722,7 +46722,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); NextTest(); @@ -46744,7 +46744,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 20UL)); NextTest(); @@ -46766,7 +46766,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 19UL)); NextTest(); @@ -46788,7 +46788,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 17UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 18UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 25UL)); @@ -46812,7 +46812,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 32UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 33UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 34UL)); @@ -46836,7 +46836,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 52UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 53UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 54UL)); @@ -46860,7 +46860,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 55UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 56UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 57UL)); @@ -46884,7 +46884,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -46909,7 +46909,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); NextTest(); @@ -46931,7 +46931,7 @@ class Test_TC_TSTAT_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -47564,7 +47564,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("localTemperature", "", "int16")); + VerifyOrReturn(CheckConstraintType("localTemperature", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("localTemperature", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("localTemperature", [value shortValue], 32767)); } @@ -47590,7 +47590,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("outdoorTemperature", "", "int16")); + VerifyOrReturn(CheckConstraintType("outdoorTemperature", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("outdoorTemperature", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("outdoorTemperature", [value shortValue], 32767)); } @@ -47614,7 +47614,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupancy", "", "int16")); + VerifyOrReturn(CheckConstraintType("occupancy", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("occupancy", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("occupancy", [value unsignedCharValue], 1U)); @@ -47637,7 +47637,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("absMinHeatSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("absMinHeatSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("absMinHeatSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("absMinHeatSetpointLimit", [value shortValue], 32767)); @@ -47660,7 +47660,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("absMaxHeatSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("absMaxHeatSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("absMaxHeatSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("absMaxHeatSetpointLimit", [value shortValue], 32767)); @@ -47683,7 +47683,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("absMinCoolSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("absMinCoolSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("absMinCoolSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("absMinCoolSetpointLimit", [value shortValue], 32767)); @@ -47706,7 +47706,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("absMaxCoolSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("absMaxCoolSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("absMaxCoolSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("absMaxCoolSetpointLimit", [value shortValue], 32767)); @@ -47729,7 +47729,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("PICoolingDemand", "", "uint8")); + VerifyOrReturn(CheckConstraintType("PICoolingDemand", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("PICoolingDemand", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PICoolingDemand", [value unsignedCharValue], 100U)); @@ -47752,7 +47752,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("PIHeatingDemand", "", "uint8")); + VerifyOrReturn(CheckConstraintType("PIHeatingDemand", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("PIHeatingDemand", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("PIHeatingDemand", [value unsignedCharValue], 100U)); @@ -47776,7 +47776,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("HVACSystemTypeConfiguration", "", "map8")); + VerifyOrReturn(CheckConstraintType("HVACSystemTypeConfiguration", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("HVACSystemTypeConfiguration", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("HVACSystemTypeConfiguration", [value unsignedCharValue], 63U)); @@ -47800,7 +47800,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("localTemperatureCalibration", "", "int8")); + VerifyOrReturn(CheckConstraintType("localTemperatureCalibration", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("localTemperatureCalibration", [value charValue], 25)); VerifyOrReturn(CheckConstraintMaxValue("localTemperatureCalibration", [value charValue], -25)); @@ -47823,7 +47823,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("occupiedCoolingSetpoint", [value shortValue], 1600)); VerifyOrReturn(CheckConstraintMaxValue("occupiedCoolingSetpoint", [value shortValue], 3200)); @@ -47846,7 +47846,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("occupiedHeatingSetpoint", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("occupiedHeatingSetpoint", [value shortValue], 3000)); @@ -47870,7 +47870,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("unoccupiedCoolingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("unoccupiedCoolingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedCoolingSetpoint", [value shortValue], 1600)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedCoolingSetpoint", [value shortValue], 3200)); @@ -47894,7 +47894,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("unoccupiedHeatingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("unoccupiedHeatingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedHeatingSetpoint", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedHeatingSetpoint", [value shortValue], 3000)); @@ -47917,7 +47917,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minHeatSetpointLimit", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("minHeatSetpointLimit", [value shortValue], 3000)); @@ -47940,7 +47940,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxHeatSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("maxHeatSetpointLimit", [value shortValue], 32767)); @@ -47963,7 +47963,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minCoolSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("minCoolSetpointLimit", [value shortValue], 32767)); @@ -47986,7 +47986,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxCoolSetpointLimit", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("maxCoolSetpointLimit", [value shortValue], 32767)); @@ -48009,7 +48009,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "", "int8")); + VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("minSetpointDeadBand", [value charValue], 0)); VerifyOrReturn(CheckConstraintMaxValue("minSetpointDeadBand", [value charValue], 25)); @@ -48032,7 +48032,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("remoteSensing", "", "map8")); + VerifyOrReturn(CheckConstraintType("remoteSensing", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("remoteSensing", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("remoteSensing", [value unsignedCharValue], 7U)); @@ -48056,7 +48056,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8")); + VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("controlSequenceOfOperation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("controlSequenceOfOperation", [value unsignedCharValue], 5U)); @@ -48079,7 +48079,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("systemMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("systemMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("systemMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("systemMode", [value unsignedCharValue], 9U)); @@ -48102,7 +48102,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("thermostatRunningMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("thermostatRunningMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("thermostatRunningMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("thermostatRunningMode", [value unsignedCharValue], 9U)); @@ -48125,7 +48125,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("startOfWeek", "", "enum8")); + VerifyOrReturn(CheckConstraintType("startOfWeek", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("startOfWeek", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("startOfWeek", [value unsignedCharValue], 6U)); @@ -48149,7 +48149,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("numberOfWeeklyTransitions", "", "uint8")); + VerifyOrReturn(CheckConstraintType("numberOfWeeklyTransitions", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("numberOfWeeklyTransitions", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfWeeklyTransitions", [value unsignedCharValue], 255U)); @@ -48172,7 +48172,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("numberOfDailyTransitions", "", "uint8")); + VerifyOrReturn(CheckConstraintType("numberOfDailyTransitions", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("numberOfDailyTransitions", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfDailyTransitions", [value unsignedCharValue], 255U)); @@ -48195,7 +48195,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("temperatureSetpointHold", "", "enum8")); + VerifyOrReturn(CheckConstraintType("temperatureSetpointHold", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("temperatureSetpointHold", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("temperatureSetpointHold", [value unsignedCharValue], 1U)); @@ -48221,7 +48221,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("temperatureSetpointHoldDuration", "", "uint16")); + VerifyOrReturn(CheckConstraintType("temperatureSetpointHoldDuration", "int16u", "int16u")); VerifyOrReturn( CheckConstraintMinValue("temperatureSetpointHoldDuration", [value unsignedShortValue], 0U)); VerifyOrReturn( @@ -48248,7 +48248,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("thermostatProgrammingOperationMode", "", "map8")); + VerifyOrReturn(CheckConstraintType("thermostatProgrammingOperationMode", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("thermostatProgrammingOperationMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("thermostatProgrammingOperationMode", [value unsignedCharValue], 7U)); @@ -48271,7 +48271,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("thermostatRunningState", "", "map16")); + VerifyOrReturn(CheckConstraintType("thermostatRunningState", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("thermostatRunningState", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("thermostatRunningState", [value unsignedShortValue], 127U)); @@ -48294,7 +48294,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("setpointChangeSource", "", "enum8")); + VerifyOrReturn(CheckConstraintType("setpointChangeSource", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("setpointChangeSource", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("setpointChangeSource", [value unsignedCharValue], 2U)); @@ -48319,7 +48319,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("setpointChangeAmount", "", "int16")); + VerifyOrReturn(CheckConstraintType("setpointChangeAmount", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("setpointChangeAmount", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("setpointChangeAmount", [value shortValue], 32767)); } @@ -48344,7 +48344,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("setpointChangeSourceTimestamp", "", "utc")); + VerifyOrReturn(CheckConstraintType("setpointChangeSourceTimestamp", "utc", "utc")); NextTest(); }]; @@ -48366,7 +48366,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("occupiedSetback", "", "uint8")); + VerifyOrReturn(CheckConstraintType("occupiedSetback", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("occupiedSetback", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("occupiedSetback", [value unsignedCharValue], 255U)); } @@ -48392,7 +48392,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("occupiedSetbackMin", "", "uint8")); + VerifyOrReturn(CheckConstraintType("occupiedSetbackMin", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("occupiedSetbackMin", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("occupiedSetbackMin", [value unsignedCharValue], 255U)); } @@ -48418,7 +48418,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("occupiedSetbackMax", "", "uint8")); + VerifyOrReturn(CheckConstraintType("occupiedSetbackMax", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("occupiedSetbackMax", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("occupiedSetbackMax", [value unsignedCharValue], 255U)); } @@ -48444,7 +48444,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("unoccupiedSetback", "", "uint8")); + VerifyOrReturn(CheckConstraintType("unoccupiedSetback", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedSetback", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedSetback", [value unsignedCharValue], 255U)); } @@ -48470,7 +48470,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("unoccupiedSetbackMin", "", "uint8")); + VerifyOrReturn(CheckConstraintType("unoccupiedSetbackMin", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedSetbackMin", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedSetbackMin", [value unsignedCharValue], 255U)); } @@ -48496,7 +48496,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("unoccupiedSetbackMax", "", "uint8")); + VerifyOrReturn(CheckConstraintType("unoccupiedSetbackMax", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedSetbackMax", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedSetbackMax", [value unsignedCharValue], 255U)); } @@ -48520,7 +48520,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("emergencyHeatDelta", "", "uint8")); + VerifyOrReturn(CheckConstraintType("emergencyHeatDelta", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("emergencyHeatDelta", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("emergencyHeatDelta", [value unsignedCharValue], 255U)); @@ -48543,7 +48543,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("ACType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("ACType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("ACType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("ACType", [value unsignedCharValue], 4U)); @@ -48566,7 +48566,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("ACCapacity", "", "uint16")); + VerifyOrReturn(CheckConstraintType("ACCapacity", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("ACCapacity", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("ACCapacity", [value unsignedShortValue], 65535U)); @@ -48589,7 +48589,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("ACRefrigerantType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("ACRefrigerantType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("ACRefrigerantType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("ACRefrigerantType", [value unsignedCharValue], 3U)); @@ -48612,7 +48612,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("ACCompressorType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("ACCompressorType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("ACCompressorType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("ACCompressorType", [value unsignedCharValue], 3U)); @@ -48635,7 +48635,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("ACErrorCode", "", "map32")); + VerifyOrReturn(CheckConstraintType("ACErrorCode", "bitmap32", "bitmap32")); NextTest(); }]; @@ -48655,7 +48655,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("ACLouverPosition", "", "enum8")); + VerifyOrReturn(CheckConstraintType("ACLouverPosition", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("ACLouverPosition", [value unsignedCharValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue("ACLouverPosition", [value unsignedCharValue], 5U)); @@ -48680,7 +48680,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("ACCoilTemperature", "", "int16")); + VerifyOrReturn(CheckConstraintType("ACCoilTemperature", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("ACCoilTemperature", [value shortValue], -27315)); VerifyOrReturn(CheckConstraintMaxValue("ACCoilTemperature", [value shortValue], 32767)); } @@ -48709,7 +48709,7 @@ class Test_TC_TSTAT_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ACCapacityformat", actualValue, 0U)); } - VerifyOrReturn(CheckConstraintType("ACCapacityformat", "", "enum8")); + VerifyOrReturn(CheckConstraintType("ACCapacityformat", "enum8", "enum8")); NextTest(); }]; @@ -50013,7 +50013,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("occupiedCoolingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("occupiedCoolingSetpoint", [value shortValue], 1600)); VerifyOrReturn(CheckConstraintMaxValue("occupiedCoolingSetpoint", [value shortValue], 3200)); @@ -50217,7 +50217,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("occupiedHeatingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("occupiedHeatingSetpoint", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("occupiedHeatingSetpoint", [value shortValue], 3000)); @@ -50452,7 +50452,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("UnoccupiedCoolingSetpoint", actualValue, 2600)); } - VerifyOrReturn(CheckConstraintType("unoccupiedCoolingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("unoccupiedCoolingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedCoolingSetpoint", [value shortValue], 1600)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedCoolingSetpoint", [value shortValue], 3200)); @@ -50636,7 +50636,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("UnoccupiedHeatingSetpoint", actualValue, 2000)); } - VerifyOrReturn(CheckConstraintType("unoccupiedHeatingSetpoint", "", "int16")); + VerifyOrReturn(CheckConstraintType("unoccupiedHeatingSetpoint", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("unoccupiedHeatingSetpoint", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("unoccupiedHeatingSetpoint", [value shortValue], 3000)); @@ -50818,7 +50818,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("MinHeatSetpointLimit", actualValue, 700)); } - VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("minHeatSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minHeatSetpointLimit", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("minHeatSetpointLimit", [value shortValue], 3000)); @@ -51028,7 +51028,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("MaxHeatSetpointLimit", actualValue, 3000)); } - VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxHeatSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxHeatSetpointLimit", [value shortValue], 700)); VerifyOrReturn(CheckConstraintMaxValue("maxHeatSetpointLimit", [value shortValue], 3000)); @@ -51263,7 +51263,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("MinCoolSetpointLimit", actualValue, 1600)); } - VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("minCoolSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("minCoolSetpointLimit", [value shortValue], 1600)); VerifyOrReturn(CheckConstraintMaxValue("minCoolSetpointLimit", [value shortValue], 3200)); @@ -51469,7 +51469,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("MaxCoolSetpointLimit", actualValue, 3200)); } - VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "", "int16")); + VerifyOrReturn(CheckConstraintType("maxCoolSetpointLimit", "int16s", "int16s")); VerifyOrReturn(CheckConstraintMinValue("maxCoolSetpointLimit", [value shortValue], 1600)); VerifyOrReturn(CheckConstraintMaxValue("maxCoolSetpointLimit", [value shortValue], 3200)); @@ -51761,7 +51761,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("MinSetpointDeadBand", actualValue, 25)); } - VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "", "temp-s8")); + VerifyOrReturn(CheckConstraintType("minSetpointDeadBand", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("minSetpointDeadBand", [value charValue], 0)); VerifyOrReturn(CheckConstraintMaxValue("minSetpointDeadBand", [value charValue], 25)); @@ -51934,7 +51934,7 @@ class Test_TC_TSTAT_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("ControlSequenceOfOperation", actualValue, 4U)); } - VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "", "enum8")); + VerifyOrReturn(CheckConstraintType("controlSequenceOfOperation", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("controlSequenceOfOperation", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("controlSequenceOfOperation", [value unsignedCharValue], 5U)); @@ -52672,7 +52672,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 2U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -52696,7 +52696,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -52715,7 +52715,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 2UL)); @@ -52748,7 +52748,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -52772,7 +52772,7 @@ class Test_TC_TSUIC_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -52917,7 +52917,7 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("temperatureDisplayMode", "", "enum8")); + VerifyOrReturn(CheckConstraintType("temperatureDisplayMode", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("temperatureDisplayMode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("temperatureDisplayMode", [value unsignedCharValue], 1U)); @@ -52939,7 +52939,7 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("keypadLockout", "", "enum8")); + VerifyOrReturn(CheckConstraintType("keypadLockout", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("keypadLockout", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("keypadLockout", [value unsignedCharValue], 5U)); @@ -52962,7 +52962,7 @@ class Test_TC_TSUIC_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("scheduleProgrammingVisibility", "", "enum8")); + VerifyOrReturn(CheckConstraintType("scheduleProgrammingVisibility", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("scheduleProgrammingVisibility", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("scheduleProgrammingVisibility", [value unsignedCharValue], 1U)); @@ -54288,7 +54288,7 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); NextTest(); }]; @@ -54311,7 +54311,7 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("FeatureMap", actualValue, 0UL)); } - VerifyOrReturn(CheckConstraintType("featureMap", "", "map32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); NextTest(); }]; @@ -54329,7 +54329,7 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65528UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 65529UL)); @@ -54359,7 +54359,7 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("AcceptedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); NextTest(); }]; @@ -54382,7 +54382,7 @@ class Test_TC_ULABEL_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -54569,7 +54569,7 @@ class Test_TC_ULABEL_2_2 : public TestCommandBridge { VerifyOrReturn(CheckValueAsString("value", ((MTRUserLabelClusterLabelStruct *) actualValue[3]).value, @"bedroom")); } - VerifyOrReturn(CheckConstraintType("labelList", "", "list")); + VerifyOrReturn(CheckConstraintType("labelList", "list", "list")); VerifyOrReturn(CheckConstraintMinLength("labelList", value, 4)); NextTest(); }]; @@ -55222,7 +55222,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("bssid", "", "octstr")); + VerifyOrReturn(CheckConstraintType("bssid", "octet_string", "octet_string")); } NextTest(); @@ -55245,7 +55245,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("securityType", "", "enum")); + VerifyOrReturn(CheckConstraintType("securityType", "enum8", "enum8")); } NextTest(); @@ -55268,7 +55268,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("wiFiVersion", "", "enum")); + VerifyOrReturn(CheckConstraintType("wiFiVersion", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("wiFiVersion", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("wiFiVersion", [value unsignedCharValue], 5U)); } @@ -55293,7 +55293,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("channelNumber", "", "uint16")); + VerifyOrReturn(CheckConstraintType("channelNumber", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("channelNumber", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("channelNumber", [value unsignedShortValue], 65535U)); } @@ -55318,7 +55318,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("rssi", "", "int8")); + VerifyOrReturn(CheckConstraintType("rssi", "int8s", "int8s")); VerifyOrReturn(CheckConstraintMinValue("rssi", [value charValue], -120)); VerifyOrReturn(CheckConstraintMaxValue("rssi", [value charValue], 0)); } @@ -55341,7 +55341,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("beaconLostCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("beaconLostCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("beaconLostCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("beaconLostCount", [value unsignedIntValue], 4294967295UL)); @@ -55363,7 +55363,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("beaconRxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("beaconRxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("beaconRxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("beaconRxCount", [value unsignedIntValue], 4294967295UL)); @@ -55385,7 +55385,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetMulticastRxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetMulticastRxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetMulticastRxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetMulticastRxCount", [value unsignedIntValue], 4294967295UL)); @@ -55407,7 +55407,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetMulticastTxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetMulticastTxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetMulticastTxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetMulticastTxCount", [value unsignedIntValue], 4294967295UL)); @@ -55429,7 +55429,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetUnicastRxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetUnicastRxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetUnicastRxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetUnicastRxCount", [value unsignedIntValue], 4294967295UL)); @@ -55451,7 +55451,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetUnicastTxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetUnicastTxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetUnicastTxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetUnicastTxCount", [value unsignedIntValue], 4294967295UL)); @@ -55473,7 +55473,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentMaxRate", "", "uint64")); + VerifyOrReturn(CheckConstraintType("currentMaxRate", "int64u", "int64u")); NextTest(); }]; @@ -55492,7 +55492,7 @@ class Test_TC_DGWIFI_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("overrunCount", "", "uint64")); + VerifyOrReturn(CheckConstraintType("overrunCount", "int64u", "int64u")); NextTest(); }]; @@ -55690,7 +55690,7 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("beaconLostCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("beaconLostCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("beaconLostCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("beaconLostCount", [value unsignedIntValue], 4294967295UL)); @@ -55712,7 +55712,7 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("beaconRxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("beaconRxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("beaconRxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("beaconRxCount", [value unsignedIntValue], 4294967295UL)); @@ -55734,7 +55734,7 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetMulticastRxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetMulticastRxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetMulticastRxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetMulticastRxCount", [value unsignedIntValue], 4294967295UL)); @@ -55756,7 +55756,7 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetMulticastTxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetMulticastTxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetMulticastTxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetMulticastTxCount", [value unsignedIntValue], 4294967295UL)); @@ -55778,7 +55778,7 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetUnicastRxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetUnicastRxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetUnicastRxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetUnicastRxCount", [value unsignedIntValue], 4294967295UL)); @@ -55800,7 +55800,7 @@ class Test_TC_DGWIFI_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("packetUnicastTxCount", "", "uint32")); + VerifyOrReturn(CheckConstraintType("packetUnicastTxCount", "int32u", "int32u")); VerifyOrReturn(CheckConstraintMinValue("packetUnicastTxCount", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("packetUnicastTxCount", [value unsignedIntValue], 4294967295UL)); @@ -55989,7 +55989,7 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("ClusterRevision", actualValue, 5U)); } - VerifyOrReturn(CheckConstraintType("clusterRevision", "", "uint16")); + VerifyOrReturn(CheckConstraintType("clusterRevision", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("clusterRevision", [value unsignedShortValue], 5U)); VerifyOrReturn(CheckConstraintMaxValue("clusterRevision", [value unsignedShortValue], 200U)); @@ -56012,7 +56012,7 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("featureMap", "", "uint32")); + VerifyOrReturn(CheckConstraintType("featureMap", "bitmap32", "bitmap32")); VerifyOrReturn(CheckConstraintMinValue("featureMap", [value unsignedIntValue], 0UL)); VerifyOrReturn(CheckConstraintMaxValue("featureMap", [value unsignedIntValue], 32768UL)); @@ -56035,7 +56035,7 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 7UL)); VerifyOrReturn(CheckConstraintContains("attributeList", value, 10UL)); @@ -56066,7 +56066,7 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("attributeList", "", "list")); + VerifyOrReturn(CheckConstraintType("attributeList", "list", "list")); VerifyOrReturn(CheckConstraintContains("attributeList", value, 26UL)); NextTest(); @@ -56088,7 +56088,7 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("acceptedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("acceptedCommandList", "list", "list")); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 0UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 1UL)); VerifyOrReturn(CheckConstraintContains("acceptedCommandList", value, 2UL)); @@ -56117,7 +56117,7 @@ class Test_TC_WNCV_1_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("GeneratedCommandList", [actualValue count], static_cast(0))); } - VerifyOrReturn(CheckConstraintType("generatedCommandList", "", "list")); + VerifyOrReturn(CheckConstraintType("generatedCommandList", "list", "list")); NextTest(); }]; @@ -56493,7 +56493,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("type", "", "enum8")); + VerifyOrReturn(CheckConstraintType("type", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("type", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("type", [value unsignedCharValue], 9U)); @@ -56516,7 +56516,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("configStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("configStatus", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("configStatus", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("configStatus", [value unsignedCharValue], 63U)); @@ -56539,7 +56539,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("operationalStatus", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("operationalStatus", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("operationalStatus", [value unsignedCharValue], 63U)); @@ -56562,7 +56562,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("endProductType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("endProductType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("endProductType", [value unsignedCharValue], 23U)); @@ -56585,7 +56585,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("mode", "", "map8")); + VerifyOrReturn(CheckConstraintType("mode", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("mode", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("mode", [value unsignedCharValue], 15U)); @@ -56633,7 +56633,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "targetPositionLiftPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -56662,7 +56662,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "targetPositionTiltPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -56691,7 +56691,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -56720,7 +56720,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "Percent100ths")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -56746,7 +56746,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "", "uint16")); + VerifyOrReturn(CheckConstraintType("installedOpenLimitLift", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedOpenLimitLift", [value unsignedShortValue], 65535U)); @@ -56769,7 +56769,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "", "uint16")); + VerifyOrReturn(CheckConstraintType("installedClosedLimitLift", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedClosedLimitLift", [value unsignedShortValue], 65535U)); @@ -56792,7 +56792,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "", "uint16")); + VerifyOrReturn(CheckConstraintType("installedOpenLimitTilt", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("installedOpenLimitTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedOpenLimitTilt", [value unsignedShortValue], 65535U)); @@ -56815,7 +56815,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "", "uint16")); + VerifyOrReturn(CheckConstraintType("installedClosedLimitTilt", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("installedClosedLimitTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("installedClosedLimitTilt", [value unsignedShortValue], 65535U)); @@ -56838,7 +56838,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("safetyStatus", "", "map16")); + VerifyOrReturn(CheckConstraintType("safetyStatus", "bitmap16", "bitmap16")); VerifyOrReturn(CheckConstraintMinValue("safetyStatus", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("safetyStatus", [value unsignedShortValue], 2047U)); @@ -56861,7 +56861,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("physicalClosedLimitLift", "", "uint16")); + VerifyOrReturn(CheckConstraintType("physicalClosedLimitLift", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("physicalClosedLimitLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("physicalClosedLimitLift", [value unsignedShortValue], 65535U)); @@ -56884,7 +56884,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("physicalClosedLimitTilt", "", "uint16")); + VerifyOrReturn(CheckConstraintType("physicalClosedLimitTilt", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("physicalClosedLimitTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("physicalClosedLimitTilt", [value unsignedShortValue], 65535U)); @@ -56909,7 +56909,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLift", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionLift", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentPositionLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentPositionLift", [value unsignedShortValue], 65535U)); } @@ -56935,7 +56935,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTilt", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionTilt", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("currentPositionTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("currentPositionTilt", [value unsignedShortValue], 65535U)); } @@ -56959,7 +56959,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("numberOfActuationsLift", "", "uint16")); + VerifyOrReturn(CheckConstraintType("numberOfActuationsLift", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("numberOfActuationsLift", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfActuationsLift", [value unsignedShortValue], 65535U)); @@ -56982,7 +56982,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("numberOfActuationsTilt", "", "uint16")); + VerifyOrReturn(CheckConstraintType("numberOfActuationsTilt", "int16u", "int16u")); VerifyOrReturn(CheckConstraintMinValue("numberOfActuationsTilt", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("numberOfActuationsTilt", [value unsignedShortValue], 65535U)); @@ -57008,7 +57008,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "Percent")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionLiftPercentage", [value unsignedCharValue], 0U)); VerifyOrReturn( @@ -57037,7 +57037,7 @@ class Test_TC_WNCV_2_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "Percent")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionTiltPercentage", [value unsignedCharValue], 0U)); VerifyOrReturn( @@ -58012,7 +58012,7 @@ class Test_TC_WNCV_2_5 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("endProductType", "", "enum8")); + VerifyOrReturn(CheckConstraintType("endProductType", "enum8", "enum8")); VerifyOrReturn(CheckConstraintMinValue("endProductType", [value unsignedCharValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue("endProductType", [value unsignedCharValue], 23U)); @@ -58407,7 +58407,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionLiftPercent100ths", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -58436,7 +58436,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionLiftPercentage", [value unsignedCharValue], 1U)); VerifyOrReturn( @@ -58465,7 +58465,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionTiltPercent100ths", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -58494,7 +58494,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionTiltPercentage", [value unsignedCharValue], 1U)); VerifyOrReturn( @@ -58522,7 +58522,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("operationalStatus", "bitmap8", "bitmap8")); testSendClusterTest_TC_WNCV_3_1_7_WaitForReport_Fulfilled = true; }; @@ -58661,7 +58661,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("operationalStatus", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("operationalStatus", [value unsignedCharValue], 5U)); VerifyOrReturn(CheckConstraintMaxValue("operationalStatus", [value unsignedCharValue], 21U)); @@ -58694,7 +58694,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -58723,7 +58723,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionLiftPercentage", [value unsignedCharValue], 0U)); VerifyOrReturn( @@ -58752,7 +58752,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -58781,7 +58781,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionTiltPercentage", [value unsignedCharValue], 0U)); VerifyOrReturn( @@ -58867,7 +58867,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "targetPositionLiftPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -58896,7 +58896,7 @@ class Test_TC_WNCV_3_1 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "targetPositionTiltPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -59294,7 +59294,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionLiftPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -59323,7 +59323,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionLiftPercentage", [value unsignedCharValue], 0U)); VerifyOrReturn( @@ -59352,7 +59352,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionTiltPercent100ths", [value unsignedShortValue], 0U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -59381,7 +59381,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionTiltPercentage", [value unsignedCharValue], 0U)); VerifyOrReturn( @@ -59409,7 +59409,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("operationalStatus", "bitmap8", "bitmap8")); testSendClusterTest_TC_WNCV_3_2_7_WaitForReport_Fulfilled = true; }; @@ -59548,7 +59548,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("operationalStatus", "bitmap8", "bitmap8")); VerifyOrReturn(CheckConstraintMinValue("operationalStatus", [value unsignedCharValue], 10U)); VerifyOrReturn(CheckConstraintMaxValue("operationalStatus", [value unsignedCharValue], 42U)); @@ -59581,7 +59581,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionLiftPercent100ths", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -59610,7 +59610,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionLiftPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionLiftPercentage", [value unsignedCharValue], 1U)); VerifyOrReturn( @@ -59639,7 +59639,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "currentPositionTiltPercent100ths", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -59668,7 +59668,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "", "uint8")); + VerifyOrReturn(CheckConstraintType("currentPositionTiltPercentage", "Percent", "Percent")); VerifyOrReturn( CheckConstraintMinValue("currentPositionTiltPercentage", [value unsignedCharValue], 1U)); VerifyOrReturn( @@ -59754,7 +59754,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("targetPositionLiftPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "targetPositionLiftPercent100ths", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -59783,7 +59783,7 @@ class Test_TC_WNCV_3_2 : public TestCommandBridge { if (value != nil) { - VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "", "uint16")); + VerifyOrReturn(CheckConstraintType("targetPositionTiltPercent100ths", "Percent100ths", "Percent100ths")); VerifyOrReturn(CheckConstraintMinValue( "targetPositionTiltPercent100ths", [value unsignedShortValue], 1U)); VerifyOrReturn(CheckConstraintMaxValue( @@ -60098,7 +60098,7 @@ class Test_TC_WNCV_3_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("operationalStatus", "", "map8")); + VerifyOrReturn(CheckConstraintType("operationalStatus", "bitmap8", "bitmap8")); testSendClusterTest_TC_WNCV_3_3_5_WaitForReport_Fulfilled = true; }; @@ -89007,7 +89007,7 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { VerifyOrReturn(CheckValue("CommissionedFabrics", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("commissionedFabrics", "", "uint8")); + VerifyOrReturn(CheckConstraintType("commissionedFabrics", "int8u", "int8u")); NextTest(); }]; @@ -89027,8 +89027,8 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentFabricIndex", "", "uint8")); - VerifyOrReturn(CheckConstraintMinValue("currentFabricIndex", [value unsignedCharValue], 1U)); + VerifyOrReturn(CheckConstraintType("currentFabricIndex", "int8u", "int8u")); + VerifyOrReturn(CheckConstraintMinValue("currentFabricIndex", [value unsignedCharValue], 1U)); { ourFabricIndex = value; } @@ -89089,7 +89089,7 @@ class TestFabricRemovalWhileSubscribed : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("fabrics", "", "list")); + VerifyOrReturn(CheckConstraintType("fabrics", "list", "list")); testSendClusterTestFabricRemovalWhileSubscribed_6_WaitForReport_Fulfilled = true; }; @@ -90111,7 +90111,7 @@ class TestGeneralCommissioning : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("supportsConcurrentConnection", "", "bool")); + VerifyOrReturn(CheckConstraintType("supportsConcurrentConnection", "boolean", "boolean")); NextTest(); }]; @@ -90374,7 +90374,7 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("supportedFabrics", "", "uint8")); + VerifyOrReturn(CheckConstraintType("supportedFabrics", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("supportedFabrics", [value unsignedCharValue], 4U)); NextTest(); @@ -90395,7 +90395,7 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("commissionedFabrics", "", "uint8")); + VerifyOrReturn(CheckConstraintType("commissionedFabrics", "int8u", "int8u")); VerifyOrReturn(CheckConstraintMinValue("commissionedFabrics", [value unsignedCharValue], 1U)); NextTest(); @@ -90417,8 +90417,8 @@ class TestOperationalCredentialsCluster : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentFabricIndex", "", "uint8")); - VerifyOrReturn(CheckConstraintMinValue("currentFabricIndex", [value unsignedCharValue], 1U)); + VerifyOrReturn(CheckConstraintType("currentFabricIndex", "int8u", "int8u")); + VerifyOrReturn(CheckConstraintMinValue("currentFabricIndex", [value unsignedCharValue], 1U)); { ourFabricIndex = value; } @@ -90934,7 +90934,7 @@ class TestModeSelectCluster : public TestCommandBridge { [((MTRModeSelectClusterModeOptionStruct *) actualValue[2]).semanticTags count], static_cast(1))); } - VerifyOrReturn(CheckConstraintType("supportedModes", "", "list")); + VerifyOrReturn(CheckConstraintType("supportedModes", "list", "list")); VerifyOrReturn(CheckConstraintMinLength("supportedModes", value, 3)); VerifyOrReturn(CheckConstraintMaxLength("supportedModes", value, 3)); NextTest(); @@ -91636,7 +91636,7 @@ class TestSelfFabricRemoval : public TestCommandBridge { VerifyOrReturn(CheckValue("CommissionedFabrics", actualValue, 1U)); } - VerifyOrReturn(CheckConstraintType("commissionedFabrics", "", "uint8")); + VerifyOrReturn(CheckConstraintType("commissionedFabrics", "int8u", "int8u")); NextTest(); }]; @@ -91656,8 +91656,8 @@ class TestSelfFabricRemoval : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentFabricIndex", "", "uint8")); - VerifyOrReturn(CheckConstraintMinValue("currentFabricIndex", [value unsignedCharValue], 1U)); + VerifyOrReturn(CheckConstraintType("currentFabricIndex", "int8u", "int8u")); + VerifyOrReturn(CheckConstraintMinValue("currentFabricIndex", [value unsignedCharValue], 1U)); { ourFabricIndex = value; } @@ -93082,7 +93082,7 @@ class TestArmFailSafe : public TestCommandBridge { ((MTROperationalCredentialsClusterFabricDescriptor *) actualValue[0]).label, @"")); } - VerifyOrReturn(CheckConstraintType("fabrics", "", "list")); + VerifyOrReturn(CheckConstraintType("fabrics", "list", "list")); NextTest(); }]; @@ -96209,7 +96209,7 @@ class Test_TC_DGSW_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("threadMetrics", "", "list")); + VerifyOrReturn(CheckConstraintType("threadMetrics", "list", "list")); NextTest(); }]; @@ -96229,7 +96229,7 @@ class Test_TC_DGSW_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHeapFree", "", "uint64")); + VerifyOrReturn(CheckConstraintType("currentHeapFree", "int64u", "int64u")); NextTest(); }]; @@ -96249,7 +96249,7 @@ class Test_TC_DGSW_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHeapUsed", "", "uint64")); + VerifyOrReturn(CheckConstraintType("currentHeapUsed", "int64u", "int64u")); NextTest(); }]; @@ -96269,7 +96269,7 @@ class Test_TC_DGSW_2_1 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHeapHighWatermark", "", "uint64")); + VerifyOrReturn(CheckConstraintType("currentHeapHighWatermark", "int64u", "int64u")); NextTest(); }]; @@ -96542,7 +96542,7 @@ class Test_TC_DGSW_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("threadMetrics", "", "list")); + VerifyOrReturn(CheckConstraintType("threadMetrics", "list", "list")); NextTest(); }]; @@ -96562,7 +96562,7 @@ class Test_TC_DGSW_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHeapUsed", "", "uint64")); + VerifyOrReturn(CheckConstraintType("currentHeapUsed", "int64u", "int64u")); NextTest(); }]; @@ -96582,7 +96582,7 @@ class Test_TC_DGSW_2_3 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("currentHeapHighWatermark", "", "uint64")); + VerifyOrReturn(CheckConstraintType("currentHeapHighWatermark", "int64u", "int64u")); NextTest(); }]; @@ -112830,7 +112830,7 @@ class Test_TC_DRLK_2_9 : public TestCommandBridge { VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0)); - VerifyOrReturn(CheckConstraintType("credentialExists", "", "boolean")); + VerifyOrReturn(CheckConstraintType("credentialExists", "boolean", "boolean")); { id actualValue = values.userIndex; VerifyOrReturn(CheckValueNonNull("userIndex", actualValue)); diff --git a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h index a27405e1065c73..2408c85c1bbf97 100644 --- a/zzz_generated/light-switch-app/zap-generated/endpoint_config.h +++ b/zzz_generated/light-switch-app/zap-generated/endpoint_config.h @@ -398,7 +398,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/lighting-app/zap-generated/endpoint_config.h b/zzz_generated/lighting-app/zap-generated/endpoint_config.h index ef1921fdfec952..d85c3859c69fa8 100644 --- a/zzz_generated/lighting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lighting-app/zap-generated/endpoint_config.h @@ -421,7 +421,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/lock-app/zap-generated/endpoint_config.h b/zzz_generated/lock-app/zap-generated/endpoint_config.h index 89adcf20069a3b..2d158b3e3bbeae 100644 --- a/zzz_generated/lock-app/zap-generated/endpoint_config.h +++ b/zzz_generated/lock-app/zap-generated/endpoint_config.h @@ -455,7 +455,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h index 44f5fb68233cdc..3faf0a9c5e9b87 100644 --- a/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-provider-app/zap-generated/endpoint_config.h @@ -232,7 +232,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h index f9e5b35343c9bf..38f6c3c4da182c 100644 --- a/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h +++ b/zzz_generated/ota-requestor-app/zap-generated/endpoint_config.h @@ -245,7 +245,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h index 05b8a96a61ccc6..a330207c12c11e 100644 --- a/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app1/zap-generated/endpoint_config.h @@ -339,7 +339,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ @@ -531,7 +531,7 @@ \ /* Endpoint: 0, Cluster: Application Basic (server) */ \ { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ - { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0) }, /* VendorID */ \ + { 0x00000001, ZAP_TYPE(VENDOR_ID), 2, 0, ZAP_SIMPLE_DEFAULT(0x0) }, /* VendorID */ \ { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationName */ \ { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0) }, /* ProductID */ \ { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */ \ diff --git a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h index 05b8a96a61ccc6..a330207c12c11e 100644 --- a/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h +++ b/zzz_generated/placeholder/app2/zap-generated/endpoint_config.h @@ -339,7 +339,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ @@ -531,7 +531,7 @@ \ /* Endpoint: 0, Cluster: Application Basic (server) */ \ { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ - { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0) }, /* VendorID */ \ + { 0x00000001, ZAP_TYPE(VENDOR_ID), 2, 0, ZAP_SIMPLE_DEFAULT(0x0) }, /* VendorID */ \ { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationName */ \ { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x0) }, /* ProductID */ \ { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */ \ diff --git a/zzz_generated/pump-app/zap-generated/endpoint_config.h b/zzz_generated/pump-app/zap-generated/endpoint_config.h index ff0d1d536a494e..c9df90c80df386 100644 --- a/zzz_generated/pump-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-app/zap-generated/endpoint_config.h @@ -242,7 +242,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h index a4a1c7adea4635..90231ad7e23d4a 100644 --- a/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h +++ b/zzz_generated/pump-controller-app/zap-generated/endpoint_config.h @@ -233,7 +233,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h index c4d0febde581c8..59f75101b8ceb3 100644 --- a/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h +++ b/zzz_generated/temperature-measurement-app/zap-generated/endpoint_config.h @@ -298,7 +298,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/thermostat/zap-generated/endpoint_config.h b/zzz_generated/thermostat/zap-generated/endpoint_config.h index 90fa07b92048fe..91d39ce61dd167 100644 --- a/zzz_generated/thermostat/zap-generated/endpoint_config.h +++ b/zzz_generated/thermostat/zap-generated/endpoint_config.h @@ -435,7 +435,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/tv-app/zap-generated/endpoint_config.h b/zzz_generated/tv-app/zap-generated/endpoint_config.h index c1abffc5229436..5462e18f473393 100644 --- a/zzz_generated/tv-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-app/zap-generated/endpoint_config.h @@ -470,7 +470,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ @@ -669,7 +669,7 @@ \ /* Endpoint: 3, Cluster: Application Basic (server) */ \ { 0x00000000, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* VendorName */ \ - { 0x00000001, ZAP_TYPE(INT16U), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ + { 0x00000001, ZAP_TYPE(VENDOR_ID), 2, 0, ZAP_EMPTY_DEFAULT() }, /* VendorID */ \ { 0x00000002, ZAP_TYPE(CHAR_STRING), 33, 0, ZAP_EMPTY_DEFAULT() }, /* ApplicationName */ \ { 0x00000003, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(0x00) }, /* ProductID */ \ { 0x00000004, ZAP_TYPE(STRUCT), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), ZAP_EMPTY_DEFAULT() }, /* Application */ \ diff --git a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h index 39b8327c8f5b6b..a759b637dcc58c 100644 --- a/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h +++ b/zzz_generated/tv-casting-app/zap-generated/endpoint_config.h @@ -423,7 +423,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \ diff --git a/zzz_generated/window-app/zap-generated/endpoint_config.h b/zzz_generated/window-app/zap-generated/endpoint_config.h index cb93f93990c34b..a8c2c986a64f1a 100644 --- a/zzz_generated/window-app/zap-generated/endpoint_config.h +++ b/zzz_generated/window-app/zap-generated/endpoint_config.h @@ -419,7 +419,7 @@ ZAP_EMPTY_DEFAULT() }, /* CommissionedFabrics */ \ { 0x00000004, ZAP_TYPE(ARRAY), 0, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* TrustedRootCertificates */ \ - { 0x00000005, ZAP_TYPE(FABRIC_IDX), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ + { 0x00000005, ZAP_TYPE(INT8U), 1, ZAP_ATTRIBUTE_MASK(EXTERNAL_STORAGE), \ ZAP_EMPTY_DEFAULT() }, /* CurrentFabricIndex */ \ { 0x0000FFFC, ZAP_TYPE(BITMAP32), 4, 0, ZAP_SIMPLE_DEFAULT(0) }, /* FeatureMap */ \ { 0x0000FFFD, ZAP_TYPE(INT16U), 2, 0, ZAP_SIMPLE_DEFAULT(1) }, /* ClusterRevision */ \