[FAN] Fan add constraint checks (project-chip#32861)

* Changes per issue

* Update tests

* Restyled by autopep8

* Fix lint error from CI

* Added skip tests if bit not supported

* Remove delays

* Restyled by isort

---------

Co-authored-by: Restyled.io <commits@restyled.io>

Author: rbultman

src/python_testing/TC_FAN_3_3.py

@@ -16,11 +16,10 @@
 #
 
 import logging
-import time
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
 logger = logging.getLogger(__name__)
@@ -42,50 +41,96 @@ async def write_rock_setting(self, endpoint, rock_setting):
         result = await self.default_controller.WriteAttribute(self.dut_node_id, [(endpoint, Clusters.FanControl.Attributes.RockSetting(rock_setting))])
         asserts.assert_equal(result[0].Status, Status.Success, "RockSetting write failed")
 
+    async def write_rock_setting_expect_failure(self, endpoint, rock_setting):
+        result = await self.default_controller.WriteAttribute(self.dut_node_id, [(endpoint, Clusters.FanControl.Attributes.RockSetting(rock_setting))])
+        asserts.assert_equal(result[0].Status, Status.ConstraintError, "Expected ConstraintError but received a different error.")
+
+    def desc_TC_FAN_3_3(self) -> str:
+        return "[TC-FAN-3.3] Optional rock functionality with DUT as Server"
+
+    def steps_TC_FAN_3_3(self) -> list[TestStep]:
+        steps = [
+            TestStep(1, "Commissioning, already done", is_commissioning=True),
+            TestStep(2, "Read from the DUT the RockSupport attribute and store"),
+            TestStep(3, "RockLeftRight is supported, so write 0x01 to RockSetting"),
+            TestStep(4, "Read from the DUT the RockSetting attribute"),
+            TestStep(5, "RockLeftRight is not supported, so write 0x01 to RockSetting to check for constraint error"),
+            TestStep(6, "RockUpDown is supported, so write 0x02 to RockSetting"),
+            TestStep(7, "Read from the DUT the RockSetting attribute"),
+            TestStep(8, "RockUpDown is not supported, so write 0x02 to RockSetting to check for constraint error"),
+            TestStep(9, "RockRound is supported, so write 0x04 to RockSetting"),
+            TestStep(10, "Read from the DUT the RockSetting attribute"),
+            TestStep(11, "RockRound is not supported, so write 0x04 to RockSetting to check for constraint error"),
+            TestStep(12, "Write RockSetting to 0x00"),
+        ]
+        return steps
+
     def pics_TC_FAN_3_3(self) -> list[str]:
         return ["FAN.S"]
 
     @async_test_body
     async def test_TC_FAN_3_3(self):
         if not self.check_pics("FAN.S.F02"):
             logger.info("Test skipped because PICS FAN.S.F02 is not set")
+            self.skip_all_remaining_steps(1)
             return
 
         endpoint = self.user_params.get("endpoint", 1)
 
-        self.print_step(1, "Commissioning, already done")
+        self.step(1)
 
-        self.print_step(2, "Read from the DUT the RockSupport attribute and store")
+        self.step(2)
         rock_support = await self.read_rock_support(endpoint=endpoint)
 
         if rock_support & Clusters.FanControl.Bitmaps.RockBitmap.kRockLeftRight:
-            self.print_step(3, "RockLeftRight is supported, so write 0x01 to RockSetting")
+            self.step(3)
             await self.write_rock_setting(endpoint=endpoint, rock_setting=Clusters.FanControl.Bitmaps.RockBitmap.kRockLeftRight)
-            time.sleep(1)
 
-            self.print_step(4, "Read from the DUT the RockSetting attribute")
+            self.step(4)
             rock_setting = await self.read_rock_setting(endpoint=endpoint)
             asserts.assert_equal(rock_setting, Clusters.FanControl.Bitmaps.RockBitmap.kRockLeftRight, "RockSetting is not 0x01")
 
+            self.skip_step(5)
+        else:
+            self.skip_step(3)
+            self.skip_step(4)
+
+            self.step(5)
+            self.write_rock_setting_expect_failure(
+                endpoint=endpoint, rock_setting=Clusters.FanControl.Bitmaps.RockBitmap.kRockLeftRight)
+
         if rock_support & Clusters.FanControl.Bitmaps.RockBitmap.kRockUpDown:
-            self.print_step(5, "RockUpDown is supported, so write 0x02 to RockSetting")
+            self.step(6)
             await self.write_rock_setting(endpoint=endpoint, rock_setting=Clusters.FanControl.Bitmaps.RockBitmap.kRockUpDown)
-            time.sleep(1)
 
-            self.print_step(6, "Read from the DUT the RockSetting attribute")
+            self.step(7)
             rock_setting = await self.read_rock_setting(endpoint=endpoint)
             asserts.assert_equal(rock_setting, Clusters.FanControl.Bitmaps.RockBitmap.kRockUpDown, "RockSetting is not 0x02")
 
+            self.skip_step(8)
+        else:
+            self.skip_step(6)
+            self.skip_step(7)
+
+            self.step(8)
+            await self.write_rock_setting_expect_failure(endpoint=endpoint, rock_setting=Clusters.FanControl.Bitmaps.RockBitmap.kRockUpDown)
+
         if rock_support & Clusters.FanControl.Bitmaps.RockBitmap.kRockRound:
-            self.print_step(7, "RockRound is supported, so write 0x04 to RockSetting")
+            self.step(9)
             await self.write_rock_setting(endpoint=endpoint, rock_setting=Clusters.FanControl.Bitmaps.RockBitmap.kRockRound)
-            time.sleep(1)
 
-            self.print_step(8, "Read from the DUT the RockSetting attribute")
+            self.step(10)
             rock_setting = await self.read_rock_setting(endpoint=endpoint)
             asserts.assert_equal(rock_setting, Clusters.FanControl.Bitmaps.RockBitmap.kRockRound, "RockSetting is not 0x04")
+            self.skip_step(11)
+        else:
+            self.skip_step(9)
+            self.skip_step(10)
+
+            self.step(11)
+            await self.write_rock_setting_expect_failure(endpoint=endpoint, rock_setting=Clusters.FanControl.Bitmaps.RockBitmap.kRockRound)
 
-        self.print_step(9, "Write RockSetting to 0x00")
+        self.step(12)
         await self.write_rock_setting(endpoint=endpoint, rock_setting=0x00)
 
 

src/python_testing/TC_FAN_3_4.py

@@ -16,13 +16,15 @@
 #
 
 import logging
-import time
 
 import chip.clusters as Clusters
 from chip.interaction_model import Status
-from matter_testing_support import MatterBaseTest, async_test_body, default_matter_test_main
+from matter_testing_support import MatterBaseTest, TestStep, async_test_body, default_matter_test_main
 from mobly import asserts
 
+#import time
+
+
 logger = logging.getLogger(__name__)
 
 
@@ -42,41 +44,79 @@ async def write_wind_setting(self, endpoint, wind_setting):
         result = await self.default_controller.WriteAttribute(self.dut_node_id, [(endpoint, Clusters.FanControl.Attributes.WindSetting(wind_setting))])
         asserts.assert_equal(result[0].Status, Status.Success, "WindSetting write failed")
 
+    async def write_wind_setting_expect_failure(self, endpoint, wind_setting):
+        result = await self.default_controller.WriteAttribute(self.dut_node_id, [(endpoint, Clusters.FanControl.Attributes.WindSetting(wind_setting))])
+        asserts.assert_equal(result[0].Status, Status.ConstraintError, "Expected ConstraintError but received a different error.")
+
+    def desc_TC_FAN_3_4(self) -> str:
+        return "[TC-FAN-3.4] Optional wind functionality with DUT as Server"
+
+    def steps_TC_FAN_3_4(self) -> list[TestStep]:
+        steps = [
+            TestStep(1, "Commissioning, already done", is_commissioning=True),
+            TestStep(2, "Read from the DUT the WindSupport attribute and store"),
+            TestStep(3, "SleepWind is supported, so write 0x01 to WindSetting"),
+            TestStep(4, "Read from the DUT the WindSetting attribute"),
+            TestStep(5, "SleepWind is not supported, so write 0x01 to WindSetting to check for constraint error"),
+            TestStep(6, "NaturalWind is supported, so write 0x02 to WindSetting"),
+            TestStep(7, "Read from the DUT the WindSetting attribute"),
+            TestStep(8, "NaturalWind is not supported, so write 0x02 to WindSetting to check for constraint error"),
+            TestStep(9, "Write WindSetting to 0x00"),
+        ]
+        return steps
+
     def pics_TC_FAN_3_4(self) -> list[str]:
         return ["FAN.S"]
 
     @async_test_body
     async def test_TC_FAN_3_4(self):
         if not self.check_pics("FAN.S.F03"):
+            self.skip_all_remaining_steps(1)
             logger.info("Test skipped because PICS FAN.S.F03 is not set")
             return
 
         endpoint = self.user_params.get("endpoint", 1)
 
-        self.print_step(1, "Commissioning, already done")
+        self.step(1)
 
-        self.print_step(2, "Read from the DUT the WindSupport attribute and store")
+        self.step(2)
         wind_support = await self.read_wind_support(endpoint=endpoint)
 
         if wind_support & Clusters.FanControl.Bitmaps.WindBitmap.kSleepWind:
-            self.print_step(3, "SleepWind is supported, so write 0x01 to WindSetting")
+            self.step(3)
             await self.write_wind_setting(endpoint=endpoint, wind_setting=Clusters.FanControl.Bitmaps.WindBitmap.kSleepWind)
-            time.sleep(1)
+            # time.sleep(1)
 
-            self.print_step(4, "Read from the DUT the WindSetting attribute")
+            self.step(4)
             wind_setting = await self.read_wind_setting(endpoint=endpoint)
             asserts.assert_equal(wind_setting, Clusters.FanControl.Bitmaps.WindBitmap.kSleepWind, "WindSetting is not 0x01")
 
+            self.skip_step(5)
+        else:
+            self.skip_step(3)
+            self.skip_step(4)
+
+            self.step(5)
+            await self.write_wind_setting_expect_failure(endpoint=endpoint, wind_setting=Clusters.FanControl.Bitmaps.WindBitmap.kSleepWind)
+
         if wind_support & Clusters.FanControl.Bitmaps.WindBitmap.kNaturalWind:
-            self.print_step(5, "NaturalWind is supported, so write 0x02 to WindSetting")
+            self.step(6)
             await self.write_wind_setting(endpoint=endpoint, wind_setting=Clusters.FanControl.Bitmaps.WindBitmap.kNaturalWind)
-            time.sleep(1)
+            # time.sleep(1)
 
-            self.print_step(6, "Read from the DUT the WindSetting attribute")
+            self.step(7)
             wind_setting = await self.read_wind_setting(endpoint=endpoint)
             asserts.assert_equal(wind_setting, Clusters.FanControl.Bitmaps.WindBitmap.kNaturalWind, "WindSetting is not 0x02")
 
-        self.print_step(9, "Write WindSetting to 0x00")
+            self.skip_step(8)
+        else:
+            self.skip_step(6)
+            self.skip_step(7)
+
+            self.step(8)
+            await self.write_wind_setting_expect_failure(endpoint=endpoint, wind_setting=Clusters.FanControl.Bitmaps.WindBitmap.kNaturalWind)
+
+        self.step(9)
         await self.write_wind_setting(endpoint=endpoint, wind_setting=0x00)