[Scenes] Activated the automated yamls for scenes on CI (#29714)

* Activated the automated yamls for scenes on CI * Added Scenes test to the darwin framework tool * Disabled test 2_2 for Repl as it used unsupported commands for this test and fixed the yaml for Darwin-framework-tool * Restyled by whitespace * Applied fix for Darwin build * Regenerated Zap * Fixed name support typing for Darwin tests --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Nov 3, 2023 · 3448891 · 3448891
1 parent 937482c
commit 3448891
Show file tree

Hide file tree

Showing 9 changed files with 3,121 additions and 41 deletions.
diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -52,6 +52,7 @@
         "Disabled because darwin-framework-tool does not support GetCommissionerRootCertificate",
         "Test_AddNewFabricFromExistingFabric",
         "Disabled because darwin-framework-tool does not support EqualityCommands pseudo-cluster",
+        "Test_TC_S_2_2",
         "Test_TC_TCCM_3_1",
         "Test_TC_TCTL_2_1",
         "Disabled because darwin-framework-tool does not support constraints arithmetic operations",

diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
@@ -157,7 +157,6 @@ def _GetInDevelopmentTests() -> Set[str]:
                                              # TestEventTriggersEnabled is true, which it's not in CI.
         "Test_TC_SMOKECO_2_6.yaml",          # chip-repl does not support local timeout (07/20/2023) and test assumes
                                              # TestEventTriggersEnabled is true, which it's not in CI.
-        "Test_TC_S_2_4.yaml",  # https://github.com/project-chip/connectedhomeip/issues/29117
     }
 
 
@@ -176,9 +175,7 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
         "Test_TC_ACE_1_6.yaml",    # Test fails only in chip-repl: Refer--> https://github.com/project-chip/connectedhomeip/pull/27910#issuecomment-1632485584
         "Test_TC_IDM_1_2.yaml",              # chip-repl does not support AnyCommands (19/07/2023)
         "TestGroupKeyManagementCluster.yaml",  # chip-repl does not support EqualityCommands (2023-08-04)
-        "Test_TC_S_2_2.yaml",              # chip-repl does not support scenes cluster commands
-        "Test_TC_S_2_3.yaml",              # chip-repl does not support scenes cluster commands
-        "Test_TC_S_2_4.yaml",              # chip-repl does not support scenes cluster commands
+        "Test_TC_S_2_2.yaml",              # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_MOD_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_MOD_3_2.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_MOD_3_3.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster

diff --git a/src/app/tests/suites/certification/Test_TC_S_2_1.yaml b/src/app/tests/suites/certification/Test_TC_S_2_1.yaml
@@ -73,7 +73,7 @@ tests:
       response:
           value: 0x80
           constraints:
-              type: int8u
+              type: bitmap8
 
     - label: "Step 6: TH reads from the DUT the (0x0004) NameSupport attribute"
       PICS: S.S.A0004 && (!S.S.F00)
@@ -82,7 +82,7 @@ tests:
       response:
           value: 0x00
           constraints:
-              type: int8u
+              type: bitmap8
 
     - label:
           "Step 7: TH reads from the DUT the (0x0005) LastConfiguredBy attribute"

diff --git a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -23,15 +23,12 @@ config:
     cluster: "Scenes"
     endpoint: 1
     G1:
-        type: int16u
+        type: group_id
         defaultValue: 0x0001
     G2:
-        type: int16u
+        type: group_id
         defaultValue: 0x0002
 
-    GroupKeyManagement.Endpoint: 0
-    Groups.Endpoint: 1
-
 tests:
     - label: "Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
@@ -54,7 +51,7 @@ tests:
           "Step 0a: preparation step for using commands from Groups cluster: Add
           KeySet"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "KeySetWrite"
       arguments:
           values:
@@ -75,7 +72,7 @@ tests:
           "Step 0b: Preparation step for using commands from Groups cluster:
           Write Group Keys"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "writeAttribute"
       attribute: "GroupKeyMap"
       arguments:
@@ -88,7 +85,7 @@ tests:
     - label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
       PICS: G.S.C04.Rsp
       cluster: "Groups"
-      endpoint: Groups.Endpoint
+      endpoint: endpoint
       command: "RemoveAllGroups"
 
     - label:
@@ -330,7 +327,7 @@ tests:
     - label: "Step 4a: Reboot target device"
       PICS: PICS_SDK_CI_ONLY
       cluster: "SystemCommands"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "Reboot"
 
     - label: "Step 4a: Reboot target device(DUT)"
@@ -1033,7 +1030,7 @@ tests:
       response:
           values:
               - name: "Status"
-                saveAs: StoreStatus
+                saveAs: StoredStatus
                 constraints:
                     anyOf: [0x00, 0x89]
               - name: "GroupID"
@@ -1052,16 +1049,16 @@ tests:
               - name: "Value1"
                 value: 0x00
               - name: "Value2"
-                value: StoreStatus
+                value: StoredStatus
       response:
           - values:
                 - name: "Equals"
-                  saveAs: ContinueTest
+                  saveAs: ContinueStep14
 
     - label:
           "Step 14c: TH sends a GetSceneMembership command to DUT with the
           GroupID field set to G2."
-      runIf: ContinueTest
+      runIf: ContinueStep14
       PICS: S.S.C06.Rsp
       command: "GetSceneMembership"
       arguments:
@@ -1084,7 +1081,7 @@ tests:
           KeySetRemove command to the GroupKeyManagement cluster with the
           GroupKeySetID field set to 0x01a1"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "KeySetRemove"
       arguments:
           values:

diff --git a/src/app/tests/suites/certification/Test_TC_S_2_3.yaml b/src/app/tests/suites/certification/Test_TC_S_2_3.yaml
@@ -23,9 +23,8 @@ config:
     cluster: "Scenes"
     endpoint: 1
     G1:
-        type: int16u
+        type: group_id
         defaultValue: 0x0101
-    GroupKeyManagement.Endpoint: 0
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -49,7 +48,7 @@ tests:
           "Step 0a: preparation step for using commands from Groups cluster: Add
           KeySet"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "KeySetWrite"
       arguments:
           values:
@@ -70,7 +69,7 @@ tests:
           "Step 0b: Preparation step for using commands from Groups cluster:
           Write Group Keys"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "writeAttribute"
       attribute: "GroupKeyMap"
       arguments:
@@ -97,7 +96,7 @@ tests:
 
     - label: "Install ACLs"
       cluster: "Access Control"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "writeAttribute"
       attribute: "ACL"
       arguments:
@@ -644,7 +643,7 @@ tests:
           KeySetRemove command to the GroupKeyManagement cluster with the
           GroupKeySetID field set to 0x01a1"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "KeySetRemove"
       arguments:
           values:

diff --git a/src/app/tests/suites/certification/Test_TC_S_2_4.yaml b/src/app/tests/suites/certification/Test_TC_S_2_4.yaml
@@ -22,12 +22,9 @@ config:
     nodeId: 0x12344321
     cluster: "Scenes"
     endpoint: 1
-
-    GroupKeyManagement.Endpoint: 0
     G1:
-        type: int16u
+        type: group_id
         defaultValue: 0x0001
-    Groups.Endpoint: 1
 
 tests:
     - label: "Wait for the commissioned device to be retrieved"
@@ -42,7 +39,7 @@ tests:
           "Step 0a: preparation step for using commands from Groups cluster: Add
           KeySet"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "KeySetWrite"
       arguments:
           values:
@@ -63,7 +60,7 @@ tests:
           "Step 0b: Preparation step for using commands from Groups cluster:
           Write Group Keys"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "writeAttribute"
       attribute: "GroupKeyMap"
       arguments:
@@ -72,7 +69,6 @@ tests:
     - label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
       PICS: G.S.C04.Rsp
       cluster: "Groups"
-      endpoint: Groups.Endpoint
       command: "RemoveAllGroups"
 
     - label:
@@ -423,7 +419,7 @@ tests:
           KeySetRemove command to the GroupKeyManagement cluster with the
           GroupKeySetID field set to 0x01a1"
       cluster: "Group Key Management"
-      endpoint: GroupKeyManagement.Endpoint
+      endpoint: 0
       command: "KeySetRemove"
       arguments:
           values:

diff --git a/src/app/tests/suites/ciTests.json b/src/app/tests/suites/ciTests.json
@@ -318,7 +318,13 @@
         "Test_TC_G_1_1",
         "Test_TC_G_2_1"
     ],
-    "Scenes": ["Test_TC_S_1_1"],
+    "Scenes": [
+        "Test_TC_S_1_1",
+        "Test_TC_S_2_1",
+        "Test_TC_S_2_2",
+        "Test_TC_S_2_3",
+        "Test_TC_S_2_4"
+    ],
     "ResourceMonitoring": [
         "TestActivatedCarbonFilterMonitoring",
         "TestHepaFilterMonitoring",
@@ -413,6 +419,7 @@
         "Subscriptions",
         "DoorLock",
         "Groups",
+        "Scenes",
         "ResourceMonitoring"
     ]
 }
diff --git a/src/app/tests/suites/manualTests.json b/src/app/tests/suites/manualTests.json
@@ -292,12 +292,7 @@
     "TimeSynchronization": [],
     "UnitLocalization": [],
     "Binding": ["Test_TC_BIND_2_1", "Test_TC_BIND_2_2", "Test_TC_BIND_2_3"],
-    "Scenes": [
-        "Test_TC_S_1_1",
-        "Test_TC_S_2_1",
-        "Test_TC_S_2_5",
-        "Test_TC_S_2_6"
-    ],
+    "Scenes": ["Test_TC_S_2_5", "Test_TC_S_2_6"],
     "PumpConfigurationControl": [],
     "AccessControl": [],
     "UserLabel": [],