fix project-chip#35210: tc-icdm-2.1, 3.1, 3.4 (project-chip#35227)

* fix 35210: tc-icdm-2.1, 3.1, 3.4

* missing changes.

Author: yinyihu-silabs

src/python_testing/TC_ICDM_2_1.py

@@ -96,7 +96,8 @@ def desc_TC_ICDM_2_1(self) -> str:
 
     def steps_TC_ICDM_2_1(self) -> list[TestStep]:
         steps = [
-            TestStep(1, "Commissioning, already done", is_commissioning=True),
+            TestStep("1a", "Commissioning, already done", is_commissioning=True),
+            TestStep("1b", "CTH reads from the DUT the FeatureMap attribute."),
             TestStep(2, "TH reads from the DUT the ActiveModeThreshold attribute."),
             TestStep(3, "TH reads from the DUT the ActiveModeDuration attribute."),
             TestStep(4, "TH reads from the DUT the IdleModeDuration attribute."),
@@ -131,8 +132,9 @@ async def test_TC_ICDM_2_1(self):
         attributes = cluster.Attributes
 
         # Commissioning
-        self.step(1)
+        self.step("1a")
         # Read feature map
+        self.step("1b")
         featureMap = await self._read_icdm_attribute_expect_success(
             attributes.FeatureMap)
 

src/python_testing/TC_ICDM_3_1.py

@@ -85,7 +85,7 @@ def steps_TC_ICDM_3_1(self) -> list[TestStep]:
             TestStep(7, "TTH sends UnregisterClient command with the CheckInNodeID from Step 6."),
             TestStep(8, "TH sends UnregisterClient command with the CheckInNodeID from Step 2."),
             TestStep(9, "TH reads from the DUT the RegisteredClients attribute."),
-            TestStep(10, "Repeat Step 9 with the rest of CheckInNodeIDs from the list of RegisteredClients from Step 4, if any."),
+            TestStep(10, "Repeat Step 8-9 with the rest of CheckInNodeIDs from the list of RegisteredClients from Step 4, if any."),
             TestStep(11, "TH reads from the DUT the RegisteredClients attribute."),
             TestStep(12, "TH sends UnregisterClient command with the CheckInNodeID from Step 2."),
         ]
@@ -240,6 +240,11 @@ async def test_TC_ICDM_3_1(self):
                     e.status, Status.Success, "Unexpected error returned")
                 pass
 
+            registeredClients = await self._read_icdm_attribute_expect_success(attributes.RegisteredClients)
+            for remainingClient in registeredClients:
+                asserts.assert_not_equal(remainingClient.checkInNodeID, client["checkInNodeID"],
+                                         "CheckInNodeID was unregistered. It should not be present in the attribute list.")
+
         self.step(11)
         registeredClients = await self._read_icdm_attribute_expect_success(
             attributes.RegisteredClients)

src/python_testing/TC_ICDM_3_4.py

@@ -63,7 +63,7 @@ def steps_TC_ICDM_3_4(self) -> list[TestStep]:
         steps = [
             TestStep(0, "Commissioning, already done", is_commissioning=True),
             TestStep(1, "TH reads from the DUT the ICDCounter attribute."),
-            TestStep("2a", "Reboot DUT."),
+            TestStep("2a", "Power cycle DUT."),
             TestStep("2b", "TH waits for {PIXIT.WAITTIME.REBOOT}"),
             TestStep(3, "Verify that the DUT response contains value of ICDCounter and stores in IcdCounter2. \
                             IcdCounter2 is greater or equal to IcdCounter1. \