From b9de4753b309a186046ca9102cdc2cb8a8953785 Mon Sep 17 00:00:00 2001 From: EricZijian_Siter Date: Wed, 26 Jul 2023 15:21:28 +0800 Subject: [PATCH] [SMCO] Assign five values to HIEST_PRI_ALARM (#28247) Co-authored-by: Hare --- .../certification/Test_TC_SMCO_2_6.yaml | 20 +++++++++++++++---- .../chip-tool/zap-generated/test/Commands.h | 16 +++++++++++---- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/app/tests/suites/certification/Test_TC_SMCO_2_6.yaml b/src/app/tests/suites/certification/Test_TC_SMCO_2_6.yaml index 5d68637c3b5a46..0b13078763c4cb 100644 --- a/src/app/tests/suites/certification/Test_TC_SMCO_2_6.yaml +++ b/src/app/tests/suites/certification/Test_TC_SMCO_2_6.yaml @@ -60,6 +60,18 @@ config: HIEST_PRI_ALARM: type: int8u defaultValue: 1 + HIEST_PRI_ALARM_2: + type: int8u + defaultValue: 2 + HIEST_PRI_ALARM_3: + type: int8u + defaultValue: 7 + HIEST_PRI_ALARM_4: + type: int8u + defaultValue: 7 + HIEST_PRI_ALARM_5: + type: int8u + defaultValue: 3 tests: - label: "Commission DUT to TH" @@ -334,7 +346,7 @@ tests: command: "readAttribute" attribute: "ExpressedState" response: - value: HIEST_PRI_ALARM + value: HIEST_PRI_ALARM_2 constraints: type: enum8 @@ -371,7 +383,7 @@ tests: command: "readAttribute" attribute: "ExpressedState" response: - value: HIEST_PRI_ALARM + value: HIEST_PRI_ALARM_3 constraints: type: enum8 @@ -409,7 +421,7 @@ tests: command: "readAttribute" attribute: "ExpressedState" response: - value: HIEST_PRI_ALARM + value: HIEST_PRI_ALARM_4 constraints: type: enum8 @@ -447,7 +459,7 @@ tests: command: "readAttribute" attribute: "ExpressedState" response: - value: HIEST_PRI_ALARM + value: HIEST_PRI_ALARM_5 constraints: type: enum8 diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h index ce0c3be66f3523..e800416ec18db5 100644 --- a/zzz_generated/chip-tool/zap-generated/test/Commands.h +++ b/zzz_generated/chip-tool/zap-generated/test/Commands.h @@ -63224,6 +63224,10 @@ class Test_TC_SMCO_2_6Suite : public TestCommand AddArgument("TEST_EVENT_TRIGGER_INTERCONNECT_CO_ALARM", 0, UINT64_MAX, &mTestEventTriggerInterconnectCoAlarm); AddArgument("TEST_EVENT_TRIGGER_INTERCONNECT_CO_ALARM_CLEAR", 0, UINT64_MAX, &mTestEventTriggerInterconnectCoAlarmClear); AddArgument("HIEST_PRI_ALARM", 0, UINT8_MAX, &mHiestPriAlarm); + AddArgument("HIEST_PRI_ALARM_2", 0, UINT8_MAX, &mHiestPriAlarm2); + AddArgument("HIEST_PRI_ALARM_3", 0, UINT8_MAX, &mHiestPriAlarm3); + AddArgument("HIEST_PRI_ALARM_4", 0, UINT8_MAX, &mHiestPriAlarm4); + AddArgument("HIEST_PRI_ALARM_5", 0, UINT8_MAX, &mHiestPriAlarm5); } ~Test_TC_SMCO_2_6Suite() {} @@ -63247,6 +63251,10 @@ class Test_TC_SMCO_2_6Suite : public TestCommand chip::Optional mTestEventTriggerInterconnectCoAlarm; chip::Optional mTestEventTriggerInterconnectCoAlarmClear; chip::Optional mHiestPriAlarm; + chip::Optional mHiestPriAlarm2; + chip::Optional mHiestPriAlarm3; + chip::Optional mHiestPriAlarm4; + chip::Optional mHiestPriAlarm5; chip::EndpointId GetEndpoint(chip::EndpointId endpoint) { return mEndpoint.HasValue() ? mEndpoint.Value() : endpoint; } @@ -63420,7 +63428,7 @@ class Test_TC_SMCO_2_6Suite : public TestCommand { chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm.HasValue() ? mHiestPriAlarm.Value() : 1U)); + VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm2.HasValue() ? mHiestPriAlarm2.Value() : 2U)); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; @@ -63442,7 +63450,7 @@ class Test_TC_SMCO_2_6Suite : public TestCommand { chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm.HasValue() ? mHiestPriAlarm.Value() : 1U)); + VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm3.HasValue() ? mHiestPriAlarm3.Value() : 7U)); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; @@ -63464,7 +63472,7 @@ class Test_TC_SMCO_2_6Suite : public TestCommand { chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm.HasValue() ? mHiestPriAlarm.Value() : 1U)); + VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm4.HasValue() ? mHiestPriAlarm4.Value() : 7U)); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break; @@ -63486,7 +63494,7 @@ class Test_TC_SMCO_2_6Suite : public TestCommand { chip::app::Clusters::SmokeCoAlarm::ExpressedStateEnum value; VerifyOrReturn(CheckDecodeValue(chip::app::DataModel::Decode(*data, value))); - VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm.HasValue() ? mHiestPriAlarm.Value() : 1U)); + VerifyOrReturn(CheckValue("expressedState", value, mHiestPriAlarm5.HasValue() ? mHiestPriAlarm5.Value() : 3U)); VerifyOrReturn(CheckConstraintType("value", "enum8", "enum8")); } break;