Fix Test_TC_OCC_2_1.yaml test case, it shouldn't fail when not using a default value (#21624)
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 9088da1..72ff07f 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
@@ -66,7 +66,6 @@
command: "readAttribute"
attribute: "PIR occupied to unoccupied delay"
response:
- value: 0
constraints:
type: int16u
minValue: 0
@@ -77,7 +76,6 @@
command: "readAttribute"
attribute: "PIR unoccupied to occupied delay"
response:
- value: 0
constraints:
type: int16u
minValue: 0
@@ -89,7 +87,6 @@
command: "readAttribute"
attribute: "PIR unoccupied to occupied threshold"
response:
- value: 1
constraints:
type: int8u
minValue: 1
@@ -100,7 +97,6 @@
command: "readAttribute"
attribute: "ultrasonic occupied to unoccupied delay"
response:
- value: 0
constraints:
type: int16u
minValue: 0
@@ -111,7 +107,6 @@
command: "readAttribute"
attribute: "ultrasonic unoccupied to occupied delay"
response:
- value: 0
constraints:
type: int16u
minValue: 0
@@ -122,7 +117,6 @@
command: "readAttribute"
attribute: "ultrasonic unoccupied to occupied threshold"
response:
- value: 1
constraints:
type: int8u
minValue: 1
@@ -135,7 +129,6 @@
command: "readAttribute"
attribute: "physical contact occupied to unoccupied delay"
response:
- value: 0
constraints:
type: int16u
minValue: 0
@@ -148,7 +141,6 @@
command: "readAttribute"
attribute: "physical contact unoccupied to occupied delay"
response:
- value: 0
constraints:
type: int16u
minValue: 0
@@ -161,7 +153,6 @@
command: "readAttribute"
attribute: "physical contact unoccupied to occupied threshold"
response:
- value: 1
constraints:
type: int8u
minValue: 1
diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h
index bbf5c2f..897c65b 100644
--- a/zzz_generated/chip-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h
@@ -23524,7 +23524,6 @@
{
uint16_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("pirOccupiedToUnoccupiedDelay", value, 0U));
VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
@@ -23535,7 +23534,6 @@
{
uint16_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedDelay", value, 0U));
VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
@@ -23546,7 +23544,6 @@
{
uint8_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("pirUnoccupiedToOccupiedThreshold", value, 1U));
VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 1U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U));
@@ -23557,7 +23554,6 @@
{
uint16_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("ultrasonicOccupiedToUnoccupiedDelay", value, 0U));
VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
@@ -23568,7 +23564,6 @@
{
uint16_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedDelay", value, 0U));
VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
@@ -23579,7 +23574,6 @@
{
uint8_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("ultrasonicUnoccupiedToOccupiedThreshold", value, 1U));
VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 1U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U));
@@ -23590,7 +23584,6 @@
{
uint16_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("physicalContactOccupiedToUnoccupiedDelay", value, 0U));
VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
@@ -23601,7 +23594,6 @@
{
uint16_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedDelay", value, 0U));
VerifyOrReturn(CheckConstraintType("value", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 0U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 65535U));
@@ -23612,7 +23604,6 @@
{
uint8_t value;
VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value)));
- VerifyOrReturn(CheckValue("physicalContactUnoccupiedToOccupiedThreshold", value, 1U));
VerifyOrReturn(CheckConstraintType("value", "int8u", "int8u"));
VerifyOrReturn(CheckConstraintMinValue("value", value, 1U));
VerifyOrReturn(CheckConstraintMaxValue("value", value, 254U));
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 d7738d3..c315b1f 100644
--- a/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
+++ b/zzz_generated/darwin-framework-tool/zap-generated/test/Commands.h
@@ -39030,11 +39030,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("PIR occupied to unoccupied delay", actualValue, 0U));
- }
-
VerifyOrReturn(CheckConstraintType("pirOccupiedToUnoccupiedDelay", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue<uint16_t>("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U));
VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("pirOccupiedToUnoccupiedDelay", [value unsignedShortValue], 65535U));
@@ -39059,11 +39054,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("PIR unoccupied to occupied delay", actualValue, 0U));
- }
-
VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedDelay", "int16u", "int16u"));
VerifyOrReturn(CheckConstraintMinValue<uint16_t>("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U));
VerifyOrReturn(CheckConstraintMaxValue<uint16_t>("pirUnoccupiedToOccupiedDelay", [value unsignedShortValue], 65535U));
@@ -39088,11 +39078,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("PIR unoccupied to occupied threshold", actualValue, 1U));
- }
-
VerifyOrReturn(CheckConstraintType("pirUnoccupiedToOccupiedThreshold", "int8u", "int8u"));
VerifyOrReturn(CheckConstraintMinValue<uint8_t>("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U));
VerifyOrReturn(CheckConstraintMaxValue<uint8_t>("pirUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 254U));
@@ -39117,11 +39102,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("ultrasonic occupied to unoccupied delay", actualValue, 0U));
- }
-
VerifyOrReturn(CheckConstraintType("ultrasonicOccupiedToUnoccupiedDelay", "int16u", "int16u"));
VerifyOrReturn(
CheckConstraintMinValue<uint16_t>("ultrasonicOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U));
@@ -39148,11 +39128,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied delay", actualValue, 0U));
- }
-
VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedDelay", "int16u", "int16u"));
VerifyOrReturn(
CheckConstraintMinValue<uint16_t>("ultrasonicUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U));
@@ -39179,11 +39154,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("ultrasonic unoccupied to occupied threshold", actualValue, 1U));
- }
-
VerifyOrReturn(CheckConstraintType("ultrasonicUnoccupiedToOccupiedThreshold", "int8u", "int8u"));
VerifyOrReturn(
CheckConstraintMinValue<uint8_t>("ultrasonicUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U));
@@ -39210,11 +39180,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("physical contact occupied to unoccupied delay", actualValue, 0U));
- }
-
VerifyOrReturn(CheckConstraintType("physicalContactOccupiedToUnoccupiedDelay", "int16u", "int16u"));
VerifyOrReturn(
CheckConstraintMinValue<uint16_t>("physicalContactOccupiedToUnoccupiedDelay", [value unsignedShortValue], 0U));
@@ -39241,11 +39206,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("physical contact unoccupied to occupied delay", actualValue, 0U));
- }
-
VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedDelay", "int16u", "int16u"));
VerifyOrReturn(
CheckConstraintMinValue<uint16_t>("physicalContactUnoccupiedToOccupiedDelay", [value unsignedShortValue], 0U));
@@ -39272,11 +39232,6 @@
VerifyOrReturn(CheckValue("status", err ? err.code : 0, 0));
- {
- id actualValue = value;
- VerifyOrReturn(CheckValue("physical contact unoccupied to occupied threshold", actualValue, 1U));
- }
-
VerifyOrReturn(CheckConstraintType("physicalContactUnoccupiedToOccupiedThreshold", "int8u", "int8u"));
VerifyOrReturn(
CheckConstraintMinValue<uint8_t>("physicalContactUnoccupiedToOccupiedThreshold", [value unsignedCharValue], 1U));
