Merge b8903bc into ccaa0ed

Author: j-ororke

src/python_testing/TC_SEAR_1_3.py

@@ -97,6 +97,8 @@ async def test_TC_SEAR_1_3(self):
                 asserts.fail("The --app-pid flag must be set when PICS_SDK_CI_ONLY is set")
             self.app_pipe = self.app_pipe + str(app_pid)
 
+        features = await self.read_sear_attribute_expect_success(endpoint=self.endpoint, attribute=Clusters.ServiceArea.Attributes.FeatureMap)
+
         self.print_step(1, "Commissioning, already done")
 
         # Ensure that the device is in the correct state
@@ -163,7 +165,7 @@ async def test_TC_SEAR_1_3(self):
             else:
                 self.wait_for_user_input(prompt_msg=f"{test_step}, and press Enter when done.\n")
 
-            if self.check_pics("SEAR.S.F00"):
+            if bool(features & Clusters.ServiceArea.Bitmaps.Feature.kSelectWhileRunning):
                 await self.send_cmd_select_areas_expect_response(step=15, new_areas=valid_areas, expected_response=Clusters.ServiceArea.Enums.SelectAreasStatus.kSuccess)
             else:
                 await self.send_cmd_select_areas_expect_response(step=15, new_areas=valid_areas, expected_response=Clusters.ServiceArea.Enums.SelectAreasStatus.kInvalidInMode)

src/python_testing/TC_SEAR_1_5.py

@@ -98,7 +98,7 @@ async def send_cmd_skip_area_expect_response(self, step, skipped_area, expected_
                              f"Command response ({ret.status}) doesn't match the expected one")
 
     def TC_SEAR_1_5(self) -> list[str]:
-        return ["SEAR.S", "SEAR.S.C02.Rsp"]
+        return ["SEAR.S"]
 
     @async_test_body
     async def test_TC_SEAR_1_5(self):
@@ -111,6 +111,14 @@ async def test_TC_SEAR_1_5(self):
                 asserts.fail("The --app-pid flag must be set when PICS_SDK_CI_ONLY is set")
             self.app_pipe = self.app_pipe + str(app_pid)
 
+        attribute_list = await self.read_sear_attribute_expect_success(
+            endpoint=self.endpoint, attribute=Clusters.ServiceArea.Attributes.AttributeList)
+        accepted_cmd_list = await self.read_sear_attribute_expect_success(
+            endpoint=self.endpoint, attribute=Clusters.ServiceArea.Attributes.AcceptedCommandList)
+
+        if Clusters.ServiceArea.Commands.SkipArea.command_id not in accepted_cmd_list:
+            asserts.fail("Skip Area Response command needs to be supported to run this test")
+
         self.print_step(1, "Commissioning, already done")
 
         # Ensure that the device is in the correct state
@@ -167,15 +175,15 @@ async def test_TC_SEAR_1_5(self):
         if not self.check_pics("SEAR.S.M.VALID_STATE_FOR_SKIP"):
             return
 
-        if self.check_pics("SEAR.S.A0005"):
+        if Clusters.ServiceArea.Attributes.Progress.attribute_id in attribute_list:
             old_progress_list = await self.read_progress(step=9)
             asserts.assert_true(len(old_progress_list) > 0, f"len of Progress({len(old_progress_list)}) should not be zero)")
 
         selected_areas = await self.read_selected_areas(step=10)
         asserts.assert_true(len(selected_areas) > 0, "SelectedAreas is empty")
 
         old_current_area = NullValue
-        if self.check_pics("SEAR.S.A0003"):
+        if Clusters.ServiceArea.Attributes.CurrentArea.attribute_id in attribute_list:
             old_current_area = await self.read_current_area(step=11)
 
             self.print_step("12", "")
@@ -189,7 +197,7 @@ async def test_TC_SEAR_1_5(self):
                     if not self.is_ci:
                         self.wait_for_user_input(prompt_msg=f"{test_step}, and press Enter when done.\n")
 
-                if self.check_pics("SEAR.S.A0005"):
+                if Clusters.ServiceArea.Attributes.Progress.attribute_id in attribute_list:
                     new_progress_list = await self.read_progress(step=15)
                     asserts.assert_true(len(new_progress_list) > 0,
                                         f"len of Progress({len(new_progress_list)}) should not be zero)")
@@ -230,7 +238,7 @@ async def test_TC_SEAR_1_5(self):
                     self.print_step("17", "")
                     return
 
-        if not self.check_pics("SEAR.S.A0005"):
+        if Clusters.ServiceArea.Attributes.Progress.attribute_id not in attribute_list:
             return
 
         if self.check_pics("SEAR.S.M.HAS_MANUAL_SKIP_STATE_CONTROL"):

src/python_testing/TC_SEAR_1_6.py

@@ -81,7 +81,7 @@ async def read_progress(self, step):
         return progress
 
     def TC_SEAR_1_6(self) -> list[str]:
-        return ["SEAR.S", "SEAR.S.A0005", "SEAR.S.A0000", "SEAR.S.A0002", "SEAR.S.M.HAS_MANUAL_OPERATING_STATE_CONTROL"]
+        return ["SEAR.S", "SEAR.S.M.HAS_MANUAL_OPERATING_STATE_CONTROL"]
 
     @async_test_body
     async def test_TC_SEAR_1_6(self):
@@ -94,6 +94,22 @@ async def test_TC_SEAR_1_6(self):
                 asserts.fail("The --app-pid flag must be set when PICS_SDK_CI_ONLY is set")
             self.app_pipe = self.app_pipe + str(app_pid)
 
+        attributes = Clusters.ServiceArea.Attributes
+        attribute_list = await self.read_sear_attribute_expect_success(
+            endpoint=self.endpoint, attribute=Clusters.ServiceArea.Attributes.AttributeList)
+        SupportedAreas = attributes.SupportedAreas.attribute_id
+        SelectedAreas = attributes.SelectedAreas.attribute_id
+        Progress = attributes.Progress.attribute_id
+
+        if SupportedAreas not in attribute_list:
+            asserts.fail("Supported areas attribute required in attribute list to run test")
+
+        if SelectedAreas not in attribute_list:
+            asserts.fail("Selected areas attribute required in attribute list to run test")
+
+        if Progress not in attribute_list:
+            asserts.fail("Progress attribute required in attribute list to run test")
+
         self.print_step(1, "Commissioning, already done")
 
         # Ensure that the device is in the correct state