[SMOKECO] Updated tests as per document (#28315)

* Rename SMCO to SMOKECO * Add optional guards in TC_SMOKECO_2.6 * Restyled by prettier-yaml * Regen zap --------- Co-authored-by: Hare <[email protected]> Co-authored-by: Restyled.io <[email protected]>
project-chip · Nov 14, 2023 · 2175856 · 2175856
1 parent 1cd5c7c
commit 2175856
Show file tree

Hide file tree

Showing 14 changed files with 3,000 additions and 142 deletions.
diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -35,17 +35,13 @@
         "Test_TC_BINFO_2_2",
         "Test_TC_ACL_2_5",
         "Test_TC_ACL_2_6",
+        "Test_TC_SMOKECO_2_2",
+        "Test_TC_SMOKECO_2_3",
+        "Test_TC_SMOKECO_2_4",
+        "Test_TC_SMOKECO_2_5",
         "Disabled because the power source configuration cluster is now deprecated and not present in all-clusters",
         "Test_TC_PSCFG_1_1",
         "Test_TC_PSCFG_2_1",
-        "Test_TC_PSCFG_2_2",
-        "Disabled due to SmokeCOAlarm not being enabled in Matter.framework for now:",
-        "Test_TC_SMCO_1_1",
-        "Test_TC_SMCO_2_1",
-        "Test_TC_SMCO_2_2",
-        "Test_TC_SMCO_2_3",
-        "Test_TC_SMCO_2_4",
-        "Test_TC_SMCO_2_5",
-        "Test_TC_SMCO_2_6"
+        "Test_TC_PSCFG_2_2"
     ]
 }
diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
@@ -143,11 +143,11 @@ def _GetInDevelopmentTests() -> Set[str]:
         "Test_TC_PSCFG_1_1.yaml",  # Power source configuration cluster is deprecated and removed from all-clusters
         "Test_TC_PSCFG_2_1.yaml",  # Power source configuration cluster is deprecated and removed from all-clusters
         "Test_TC_PSCFG_2_2.yaml",  # Power source configuration cluster is deprecated and removed from all-clusters
-        "Test_TC_SMCO_2_2.yaml",   # chip-repl does not support timeout (07/20/2023)
-        "Test_TC_SMCO_2_3.yaml",   # chip-repl does not support timeout (07/20/2023)
-        "Test_TC_SMCO_2_4.yaml",   # chip-repl does not support timeout (07/20/2023)
-        "Test_TC_SMCO_2_5.yaml",   # chip-repl does not support timeout (07/20/2023)
-        "Test_TC_SMCO_2_6.yaml",   # chip-repl does not support timeout (07/20/2023)
+        "Test_TC_SMOKECO_2_2.yaml",          # chip-repl does not support local timeout (07/20/2023)
+        "Test_TC_SMOKECO_2_3.yaml",          # chip-repl does not support local timeout (07/20/2023)
+        "Test_TC_SMOKECO_2_4.yaml",          # chip-repl does not support local timeout (07/20/2023)
+        "Test_TC_SMOKECO_2_5.yaml",          # chip-repl does not support local timeout (07/20/2023)
+        "Test_TC_SMOKECO_2_6.yaml",          # chip-repl does not support local timeout (07/20/2023)
         "Test_TC_IDM_1_2.yaml",              # chip-repl does not support AnyCommands (19/07/2023)
     }
 

diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -9375,126 +9375,126 @@ PICS:
       id: OPSTATE.S.C04.Tx
 
     # Smoke CO Alarm Cluster Test Plan
-    - label: "Does the device implement the SMCO cluster as a server?"
-      id: SMCO.S
+    - label: "Does the device implement the SMOKECO cluster as a server?"
+      id: SMOKECO.S
 
-    - label: "Does the device implement the SMCO cluster as a client?"
-      id: SMCO.C
+    - label: "Does the device implement the SMOKECO cluster as a client?"
+      id: SMOKECO.C
 
     #
     # server / features
     #
     - label: "Does the device support this specific cluster feature?"
-      id: SMCO.S.F00
+      id: SMOKECO.S.F00
 
     - label: "Does the device support this specific cluster feature?"
-      id: SMCO.S.F01
+      id: SMOKECO.S.F01
 
     #
     # server / attributes
     #
     - label: "Does the device implement the ExpressedState attribute?"
-      id: SMCO.S.A0000
+      id: SMOKECO.S.A0000
 
     - label: "Does the device implement the SmokeState attribute?"
-      id: SMCO.S.A0001
+      id: SMOKECO.S.A0001
 
     - label: "Does the device implement the COState attribute?"
-      id: SMCO.S.A0002
+      id: SMOKECO.S.A0002
 
     - label: "Does the device implement the BatteryAlert attribute?"
-      id: SMCO.S.A0003
+      id: SMOKECO.S.A0003
 
     - label: "Does the device implement the DeviceMuted attribute?"
-      id: SMCO.S.A0004
+      id: SMOKECO.S.A0004
 
     - label: "Does the device implement the TestInProgress attribute?"
-      id: SMCO.S.A0005
+      id: SMOKECO.S.A0005
 
     - label: "Does the device implement the HardwareFaultAlert attribute?"
-      id: SMCO.S.A0006
+      id: SMOKECO.S.A0006
 
     - label: "Does the device implement the EndOfServiceAlert attribute?"
-      id: SMCO.S.A0007
+      id: SMOKECO.S.A0007
 
     - label: "Does the device implement the InterconnectSmokeAlarm attribute?"
-      id: SMCO.S.A0008
+      id: SMOKECO.S.A0008
 
     - label: "Does the device implement the InterconnectCOAlarm attribute?"
-      id: SMCO.S.A0009
+      id: SMOKECO.S.A0009
 
     - label: "Does the device implement the ContaminationState attribute?"
-      id: SMCO.S.A0010
+      id: SMOKECO.S.A0010
 
     - label: "Does the device implement the SensitivityLevel attribute?"
-      id: SMCO.S.A0011
+      id: SMOKECO.S.A0011
 
     - label: "Does the device implement the ExpiryDate attribute?"
-      id: SMCO.S.A0012
+      id: SMOKECO.S.A0012
 
     - label: "Does the device implement the ContaminationState attribute?"
-      id: SMCO.S.A000a
+      id: SMOKECO.S.A000a
 
     - label: "Does the device implement the SensitivityLevel attribute?"
-      id: SMCO.S.A000b
+      id: SMOKECO.S.A000b
 
     - label: "Does the device implement the ExpiryDate attribute?"
-      id: SMCO.S.A000c
+      id: SMOKECO.S.A000c
 
     #
     # server / Events
     #
     - label: "Does the device implement the SmokeAlarm event?"
-      id: SMCO.S.E00
+      id: SMOKECO.S.E00
 
     - label: "Does the device implement the COAlarm event?"
-      id: SMCO.S.E01
+      id: SMOKECO.S.E01
 
     - label: "Does the device implement the LowBattery event?"
-      id: SMCO.S.E02
+      id: SMOKECO.S.E02
 
     - label: "Does the device implement the HardwareFault event?"
-      id: SMCO.S.E03
+      id: SMOKECO.S.E03
 
     - label: "Does the device implement the EndOfService event?"
-      id: SMCO.S.E04
+      id: SMOKECO.S.E04
 
     - label: "Does the device implement the SelfTestComplete event?"
-      id: SMCO.S.E05
+      id: SMOKECO.S.E05
 
     - label: "Does the device implement the AlarmMuted event?"
-      id: SMCO.S.E06
+      id: SMOKECO.S.E06
 
     - label: "Does the device implement the MuteEnded event?"
-      id: SMCO.S.E07
+      id: SMOKECO.S.E07
 
     - label: "Does the device implement the InterconnectSmokeAlarm event?"
-      id: SMCO.S.E08
+      id: SMOKECO.S.E08
 
     - label: "Does the device implement the InterconnectCOAlarm event?"
-      id: SMCO.S.E09
+      id: SMOKECO.S.E09
 
     - label: "Does the device implement the AllClear event?"
-      id: SMCO.S.E10
+      id: SMOKECO.S.E10
 
     #
     # server / manually
     #
     - label:
           "Can the TestInProgress attribute be changed by physical control at
           the device?"
-      id: SMCO.M.ManuallyControlledTest
+      id: SMOKECO.M.ManuallyControlledTest
 
     - label:
           "Can the DeviceMuted attribute be changed by physical control at the
           device?"
-      id: SMCO.M.ManuallyControlledMute
+      id: SMOKECO.M.ManuallyControlledMute
 
     #
     # server / commandsReceived
     #
     - label: "Does the device implement receiving the SelfTestRequest command?"
-      id: SMCO.S.C00.Rsp
+      id: SMOKECO.S.C00.Rsp
 
     #  Laundry Washer Mode Cluster
 

diff --git a/...uites/certification/Test_TC_SMCO_1_1.yaml → ...es/certification/Test_TC_SMOKECO_1_1.yaml b/...uites/certification/Test_TC_SMCO_1_1.yaml → ...es/certification/Test_TC_SMOKECO_1_1.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 4.1.1. [TC-SMCO-1.1] Global Attributes with DUT as Server
+name: 4.1.1. [TC-SMOKECO-1.1] Global Attributes with DUT as Server
 
 PICS:
     - SMOKECO.S

diff --git a/...uites/certification/Test_TC_SMCO_2_1.yaml → ...es/certification/Test_TC_SMOKECO_2_1.yaml b/...uites/certification/Test_TC_SMCO_2_1.yaml → ...es/certification/Test_TC_SMOKECO_2_1.yaml
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 4.2.1. [TC-SMCO-2.1] Attributes with DUT as Server
+name: 4.2.1. [TC-SMOKECO-2.1] Attributes with DUT as Server
 
 PICS:
     - SMOKECO.S

diff --git a/...uites/certification/Test_TC_SMCO_2_2.yaml → ...es/certification/Test_TC_SMOKECO_2_2.yaml b/...uites/certification/Test_TC_SMCO_2_2.yaml → ...es/certification/Test_TC_SMOKECO_2_2.yaml
@@ -13,7 +13,8 @@
 # limitations under the License.
 
 name:
-    4.2.2. [TC-SMCO-2.2] Primary Functionality - Smoke Alarm with DUT as Server
+    4.2.2. [TC-SMOKECO-2.2] Primary Functionality - Smoke Alarm with DUT as
+    Server
 
 PICS:
     - SMOKECO.S

diff --git a/...uites/certification/Test_TC_SMCO_2_3.yaml → ...es/certification/Test_TC_SMOKECO_2_3.yaml b/...uites/certification/Test_TC_SMCO_2_3.yaml → ...es/certification/Test_TC_SMOKECO_2_3.yaml
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 4.2.3. [TC-SMCO-2.3] Primary Functionality - CO Alarm with DUT as Server
+name:
+    4.2.3. [TC-SMOKECO-2.3] Primary Functionality - CO Alarm with DUT as Server
 
 PICS:
     - SMOKECO.S

diff --git a/...uites/certification/Test_TC_SMCO_2_4.yaml → ...es/certification/Test_TC_SMOKECO_2_4.yaml b/...uites/certification/Test_TC_SMCO_2_4.yaml → ...es/certification/Test_TC_SMOKECO_2_4.yaml
@@ -13,7 +13,8 @@
 # limitations under the License.
 
 name:
-    4.2.4. [TC-SMCO-2.4] Secondary Functionality - Mandatory with DUT as Server
+    4.2.4. [TC-SMOKECO-2.4] Secondary Functionality - Mandatory with DUT as
+    Server
 
 PICS:
     - SMOKECO.S

diff --git a/...uites/certification/Test_TC_SMCO_2_5.yaml → ...es/certification/Test_TC_SMOKECO_2_5.yaml b/...uites/certification/Test_TC_SMCO_2_5.yaml → ...es/certification/Test_TC_SMOKECO_2_5.yaml
@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-name: 4.2.5. [TC-SMCO-2.5] Secondary Functionality - Optional with DUT as Server
+name:
+    4.2.5. [TC-SMOKECO-2.5] Secondary Functionality - Optional with DUT as
+    Server
 
 PICS:
     - SMOKECO.S

diff --git a/...uites/certification/Test_TC_SMCO_2_6.yaml → ...es/certification/Test_TC_SMOKECO_2_6.yaml b/...uites/certification/Test_TC_SMCO_2_6.yaml → ...es/certification/Test_TC_SMOKECO_2_6.yaml
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 name:
-    4.2.6. [TC-SMCO-2.6] ExpressedState Attribute - Multiple Alarms with DUT as
-    Server
+    4.2.6. [TC-SMOKECO-2.6] ExpressedState Attribute - Multiple Alarms with DUT
+    as Server
 
 PICS:
     - SMOKECO.S
@@ -195,7 +195,7 @@ tests:
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER for Interconnect Smoke Alarm Test
           Event"
-      PICS: DGGEN.S.C00.Rsp
+      PICS: SMOKECO.S.A0008 && DGGEN.S.C00.Rsp
       cluster: "General Diagnostics"
       endpoint: 0
       command: "TestEventTrigger"
@@ -224,7 +224,7 @@ tests:
           Endpoint 0 with EnableKey field set to
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER for Interconnect CO Alarm Test Event"
-      PICS: DGGEN.S.C00.Rsp
+      PICS: SMOKECO.S.A0009 && DGGEN.S.C00.Rsp
       cluster: "General Diagnostics"
       endpoint: 0
       command: "TestEventTrigger"
@@ -393,7 +393,7 @@ tests:
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER for Interconnect CO Alarm Test Event
           Clear"
-      PICS: DGGEN.S.C00.Rsp
+      PICS: SMOKECO.S.A0009 && DGGEN.S.C00.Rsp
       cluster: "General Diagnostics"
       endpoint: 0
       command: "TestEventTrigger"
@@ -431,7 +431,7 @@ tests:
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER_KEY and EventTrigger field set to
           PIXIT.SMOKECO.TEST_EVENT_TRIGGER for Interconnect Smoke Alarm Test
           Event Clear"
-      PICS: DGGEN.S.C00.Rsp
+      PICS: SMOKECO.S.A0008 && DGGEN.S.C00.Rsp
       cluster: "General Diagnostics"
       endpoint: 0
       command: "TestEventTrigger"

diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
@@ -2751,40 +2751,40 @@ RVCCLEANMS.S.C01.Rsp=1
 RVCCLEANMS.S.C03.Tx=1
 
 # Smoke CO Alarm Cluster
-SMCO.S=1
-SMCO.S.F00=1
-SMCO.S.F01=1
-SMCO.S.A0000=1
-SMCO.S.A0001=1
-SMCO.S.A0002=1
-SMCO.S.A0003=1
-SMCO.S.A0004=1
-SMCO.S.A0005=1
-SMCO.S.A0006=1
-SMCO.S.A0007=1
-SMCO.S.A0008=1
-SMCO.S.A0009=1
-SMCO.S.A0010=1
-SMCO.S.A0011=1
-SMCO.S.A0012=1
-SMCO.S.A000a=1
-SMCO.S.A000b=1
-SMCO.S.A000c=1
-SMCO.S.E00=1
-SMCO.S.E01=1
-SMCO.S.E02=1
-SMCO.S.E03=1
-SMCO.S.E04=1
-SMCO.S.E05=1
-SMCO.S.E06=1
-SMCO.S.E07=1
-SMCO.S.E08=1
-SMCO.S.E09=1
-SMCO.S.E10=1
-SMCO.M.ManuallyControlledTest=1
-SMCO.M.ManuallyControlledMute=1
-SMCO.S.C00.Rsp=1
-SMCO.C=1
+SMOKECO.S=1
+SMOKECO.S.F00=1
+SMOKECO.S.F01=1
+SMOKECO.S.A0000=1
+SMOKECO.S.A0001=1
+SMOKECO.S.A0002=1
+SMOKECO.S.A0003=1
+SMOKECO.S.A0004=1
+SMOKECO.S.A0005=1
+SMOKECO.S.A0006=1
+SMOKECO.S.A0007=1
+SMOKECO.S.A0008=1
+SMOKECO.S.A0009=1
+SMOKECO.S.A0010=1
+SMOKECO.S.A0011=1
+SMOKECO.S.A0012=1
+SMOKECO.S.A000a=1
+SMOKECO.S.A000b=1
+SMOKECO.S.A000c=1
+SMOKECO.S.E00=1
+SMOKECO.S.E01=1
+SMOKECO.S.E02=1
+SMOKECO.S.E03=1
+SMOKECO.S.E04=1
+SMOKECO.S.E05=1
+SMOKECO.S.E06=1
+SMOKECO.S.E07=1
+SMOKECO.S.E08=1
+SMOKECO.S.E09=1
+SMOKECO.S.E10=1
+SMOKECO.M.ManuallyControlledTest=1
+SMOKECO.M.ManuallyControlledMute=1
+SMOKECO.S.C00.Rsp=1
+SMOKECO.C=1
 
 #Temperature Controlled Cabinet Mode Cluster
 TCCM.S=1