From 37010a6cf882d23e33bbca25058b47e22d388a9d Mon Sep 17 00:00:00 2001
From: lpbeliveau-silabs <112982107+lpbeliveau-silabs@users.noreply.github.com>
Date: Mon, 22 Jul 2024 14:55:03 -0400
Subject: [PATCH] Added test for presence of groups cluster in TC_S_2_2
 (#34442)

---
 .../suites/certification/Test_TC_S_2_2.yaml   | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

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
index ead80fedb78436..81011a13251a70 100644
--- a/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
+++ b/src/app/tests/suites/certification/Test_TC_S_2_2.yaml
@@ -81,7 +81,20 @@ tests:
                 value: maxScenesMinusOne / 2
 
     - label:
-          "Step 0a :TH sends KeySetWrite command in the GroupKeyManagement
+          "Step 0a :TH reads attribute {ServerList} from the Descriptor cluster
+          of the endpoint that implements the Scenes Management server on the
+          DUT. DUT responds with a list of server clusters containing the groups
+          cluster."
+      cluster: "Descriptor"
+      command: "readAttribute"
+      attribute: "ServerList"
+      response:
+          constraints:
+              type: list
+              contains: [4]
+
+    - label:
+          "Step 0b :TH sends KeySetWrite command in the GroupKeyManagement
           cluster to DUT using a key that is pre-installed on the TH.
           GroupKeySet fields are as follows:"
       cluster: "Group Key Management"
@@ -103,7 +116,7 @@ tests:
                     }
 
     - label:
-          "Step 0b: TH binds GroupIds 0x0001 and 0x0002 with GroupKeySetID
+          "Step 0c: TH binds GroupIds 0x0001 and 0x0002 with GroupKeySetID
           0x01a1 in the GroupKeyMap attribute list on GroupKeyManagement cluster
           by writing the GroupKeyMap attribute with two entries as follows:"
       cluster: "Group Key Management"
@@ -117,7 +130,7 @@ tests:
                   { FabricIndex: 1, GroupId: G2, GroupKeySetID: 0x01a1 },
               ]
 
-    - label: "Step 0c: TH sends a RemoveAllGroups command to DUT."
+    - label: "Step 0d: TH sends a RemoveAllGroups command to DUT."
       PICS: G.S.C04.Rsp
       cluster: "Groups"
       endpoint: endpoint