[AVSUM Test Scripts] Update AVSUM test cases as per issue 5438 (project-chip#40762)

* Update AVSUM test cases as per issue 5438

* Restyled by autopep8

* Restyled by isort

* Address Gemini comments

* Align with changed attribute name

* Restyled by autopep8

---------

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

Author: marktrayer

src/python_testing/TC_AVSUMTestBase.py

@@ -211,6 +211,22 @@ async def send_mptz_relative_move_command(self, endpoint, panDelta, tiltDelta, z
         except InteractionModelError as e:
             asserts.assert_equal(e.status, expected_status, "Unexpected error returned")
 
+    async def dptzstreamentryvalid(self, endpoint, videoStreamID, viewport):
+        dptz_streams_dut = await self.read_avsum_attribute_expect_success(endpoint, Clusters.Objects.CameraAvSettingsUserLevelManagement.attributes.DPTZStreams)
+        match_found = False
+        if dptz_streams_dut is not None:
+            for streams in dptz_streams_dut:
+                if streams.videoStreamID == videoStreamID:
+                    # verify the viewport matches
+                    if (streams.viewport == viewport):
+                        match_found = True
+                        break
+
+        else:
+            asserts.assert_fail("DPTZStreams is empty, even though a stream has been allocated")
+
+        return match_found
+
     async def video_stream_allocate_command(self, endpoint, expected_status: Status = Status.Success):
         cluster = Clusters.Objects.CameraAvStreamManagement
         attrs = cluster.Attributes

src/python_testing/TC_AVSUM_2_2.py

@@ -59,28 +59,28 @@ def steps_TC_AVSUM_2_2(self) -> list[TestStep]:
             TestStep(1, "Commissioning, already done", is_commissioning=True),
             TestStep(2, "Read and verify MPTZPosition attribute."),
             TestStep(3, "Send an MPTZSetPosition command with no fields. Verify failure response"),
-            TestStep(4, "If Pan is supported, read and verify the PanMin attribute. If not skip to step 8"),
+            TestStep(4, "If Pan is supported, read and verify the PanMin attribute. If not skip to step 14"),
             TestStep(5, "Read and verify the PanMax attribute."),
             TestStep(6, "Create a valid value for a Pan"),
             TestStep(7, "Set the new Pan value via the MPTZSetPosition command. Verify success response."),
-            TestStep(8, "Read MPTZPosition. Verify the Pan value is that set in Step 7."),
+            TestStep(8, "Read MPTZPosition. Verify the Pan value is that set in Step 7. Verify the Tilt and Zoom are unchanged."),
             TestStep(9, "If PIXIT.CANBEMADEBUSY is set, place the DUT into a state where it cannot accept a command. Else jump to step 11."),
             TestStep(10, "Send an MPTZSetPositionCommand with the previously set Pan value. Verify failure response."),
             TestStep(11, "Create an invalid value for a Pan."),
             TestStep(12, "Set the invalid value via the MPTZSetPosition command. Verify failure response."),
             TestStep(13, "Read MPTZPosition. Verify the Pan value is that set in Step 7."),
-            TestStep(14, "If Tilt is supported, read and verify the TiltMin and TiltMax attributes. If not skip to step 13"),
+            TestStep(14, "If Tilt is supported, read and verify the TiltMin and TiltMax attributes. If not skip to step 22"),
             TestStep(15, "Read and verify the TiltMax attribute."),
             TestStep(16, "Create a valid value for a Tilt different from the initial value."),
             TestStep(17, "Set the new Tilt value via the MPTZSetPosition command. Verify success response."),
-            TestStep(18, "Read MPTZPosition. Verify the Tilt value is that set in Step 16."),
+            TestStep(18, "Read MPTZPosition. Verify the Tilt value is that set in Step 17. Verify that Pan and Zoom are unchanged"),
             TestStep(19, "Create an invalid value for a Tilt."),
             TestStep(20, "Set the invalid value via the MPTZSetPosition command. Verify failure response."),
-            TestStep(21, "Read MPTZPosition. Verify the Tilt value is that set in Step 16."),
+            TestStep(21, "Read MPTZPosition. Verify the Tilt value is that set in Step 17."),
             TestStep(22, "If Zoom is supported, read and verify the ZoomMax attribute."),
             TestStep(23, "Create a valid value for Zoom."),
             TestStep(24, "Set the new Zoom value via the MPTZSetPosition command. Verify success response."),
-            TestStep(25, "Read MPTZPosition. Verify the Zoom value is that set in Step 24."),
+            TestStep(25, "Read MPTZPosition. Verify the Zoom value is that set in Step 24. Verify Pan and Tilt are unchanged"),
             TestStep(26, "Create an invalid value for a Zoom."),
             TestStep(27, "Set the invalid value via the MPTZSetPosition command. Verify failure response."),
             TestStep(28, "Read MPTZPosition. Verify the Zoom value is that set in Step 24."),
@@ -117,9 +117,9 @@ async def test_TC_AVSUM_2_2(self):
         asserts.assert_in(attributes.MPTZPosition.attribute_id, attribute_list,
                           "MPTZPosition attribute is mandatory if the command is supported.")
         mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
-        initialPan = mptzposition_dut.pan
-        initialTilt = mptzposition_dut.tilt
-        initialZoom = mptzposition_dut.zoom
+        currentPan = mptzposition_dut.pan
+        currentTilt = mptzposition_dut.tilt
+        currentZoom = mptzposition_dut.zoom
 
         self.step(3)
         await self.send_null_mptz_set_position_command(endpoint, expected_status=Status.InvalidCommand)
@@ -143,7 +143,7 @@ async def test_TC_AVSUM_2_2(self):
             # Create new Value for Pan
             while True:
                 newPan = random.randint(pan_min_dut, pan_max_dut)
-                if newPan != initialPan:
+                if newPan != currentPan:
                     break
 
             self.step(7)
@@ -154,6 +154,9 @@ async def test_TC_AVSUM_2_2(self):
             # Read the attribute back and make sure it was set
             newpan_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newpan_mptzposition_dut.pan, newPan, "Received Pan does not match set Pan")
+            asserts.assert_equal(newpan_mptzposition_dut.tilt, currentTilt, "Tilt unexpectedly changed when only changing Pan")
+            asserts.assert_equal(newpan_mptzposition_dut.zoom, currentZoom, "Zoom unexpectedly changed when only changing Pan")
+            currentPan = newPan
 
             self.step(9)
             # PIXIT check
@@ -210,7 +213,7 @@ async def test_TC_AVSUM_2_2(self):
             # Create new Value for Tilt
             while True:
                 newTilt = random.randint(tilt_min_dut, tilt_max_dut)
-                if newTilt != initialTilt:
+                if newTilt != currentTilt:
                     break
 
             self.step(17)
@@ -221,6 +224,9 @@ async def test_TC_AVSUM_2_2(self):
             # Read the attribute back and make sure it was set
             newtilt_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newtilt_mptzposition_dut.tilt, newTilt, "Received Tilt does not match set Tilt")
+            asserts.assert_equal(newtilt_mptzposition_dut.pan, currentPan, "Pan unexpectedly changed when only changing Tilt")
+            asserts.assert_equal(newtilt_mptzposition_dut.zoom, currentZoom, "Zoom unexpectedly changed when only changing Tilt")
+            currentTilt = newTilt
 
             self.step(19)
             # Create an out of range value for Tilt, verify failure
@@ -255,7 +261,7 @@ async def test_TC_AVSUM_2_2(self):
             # Create new Value for Zoom
             while True:
                 newZoom = random.randint(2, zoom_max_dut)
-                if newZoom != initialZoom:
+                if newZoom != currentZoom:
                     break
 
             self.step(24)
@@ -278,6 +284,8 @@ async def test_TC_AVSUM_2_2(self):
             # Verify no change in the Zoom value
             newzoom_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newzoom_mptzposition_dut.zoom, newZoom, "Received Zoom does not match set Zoom")
+            asserts.assert_equal(newzoom_mptzposition_dut.pan, currentPan, "Pan unexpectedly changed when only changing Zoom")
+            asserts.assert_equal(newzoom_mptzposition_dut.tilt, currentTilt, "Tilt unexpectedly changed when only changing Zoom")
         else:
             self.skip_step(22)
             self.skip_step(23)

src/python_testing/TC_AVSUM_2_3.py

@@ -56,30 +56,30 @@ def steps_TC_AVSUM_2_3(self) -> list[TestStep]:
             TestStep(1, "Commissioning, already done", is_commissioning=True),
             TestStep(2, "Read and verify MPTZPosition attribute."),
             TestStep(3, "Send an MPTZRelativeMove command with no fields. Verify failure response"),
-            TestStep(4, "If Pan is supported, read and verify the PanMin attribute. If not skip to step 14"),
+            TestStep(4, "If Pan is supported, read and verify the PanMin attribute. If not skip to step 12"),
             TestStep(5, "Read and verify the PanMax attribute."),
             TestStep(6, "Create a valid value for a Pan, calculate the relative distance from the current Pan."),
             TestStep(7, "Set via MPTZRelativeMove command the relative Pan. Verify success response."),
-            TestStep(8, "Read MPTZPosition. Verify the Pan value is that set in Step 6."),
+            TestStep(8, "Read MPTZPosition. Verify the Pan value is that set in Step 7. Verify the Tilt and Zoom are unchanged."),
             TestStep(9, "Create an invalid value for a relative Pan that would exceed PanMax."),
             TestStep(10, "Set via MPTZSetRelativeMove command the invalid relative Pan. Verify success response."),
             TestStep(11, "Read MPTZPosition. Verify the Pan value is set to PanMax."),
-            TestStep(12, "If Tilt is supported, read and verify the TiltMin attribute. If not skip to step 22"),
+            TestStep(12, "If Tilt is supported, read and verify the TiltMin attribute. If not skip to step 20"),
             TestStep(13, "Read and verify the TiltMax attribute."),
             TestStep(14, "Create a valid value for a Tilt, calculate the relative distance from the current Tilt."),
             TestStep(15, "Set via MPTZRelativeMove command the relative Tilt. Verify success response."),
-            TestStep(16, "Read MPTZPosition. Verify the Tilt value is that set in Step 17."),
+            TestStep(16, "Read MPTZPosition. Verify the Tilt value is that set in Step 15. Verify that Pan and Zoom are unchanged."),
             TestStep(17, "Create an invalid value for a relative Tilt that would exceed TiltMax."),
             TestStep(18, "Set via MPTZSetRelativeMove command the relative Tilt. Verify success response."),
             TestStep(19, "Read MPTZPosition. Verify the Tilt value is set to TiltMax."),
             TestStep(20, "If Zoom is supported, read and verify the ZoomMax attribute."),
             TestStep(21, "Create a valid value for a Zoom, calculate the relative distance from the current Zoom."),
             TestStep(22, "Set via MPTZRelativeMove command the relative Zoom. Verify success response."),
-            TestStep(23, "Read MPTZPosition. Verify the Zoom value is that set in Step 24."),
+            TestStep(23, "Read MPTZPosition. Verify the Zoom value is that set in Step 22. Verify the Pan and Tilt are unchanged"),
             TestStep(24, "Create an invalid value for a relative Zoom that would exceed ZoomMax."),
             TestStep(25, "Set via MPTZSetRelativeMove command the relative Zoom. Verify success response."),
             TestStep(26, "Read MPTZPosition. Verify the Zoom value is set to ZoomMax."),
-            TestStep(27, "If PIXIT.CANBEMADEBUSY is set, place the DUT into a state where it cannot accept a command. Else end the test cse."),
+            TestStep(27, "If PIXIT.CANBEMADEBUSY is set, place the DUT into a state where it cannot accept a command. Else end the test case."),
             TestStep(28, "Send an MPTZRelativeMove Command with any previously set relative value. Verify busy failure response."),
         ]
         return steps
@@ -112,9 +112,9 @@ async def test_TC_AVSUM_2_3(self):
         asserts.assert_in(attributes.MPTZPosition.attribute_id, attribute_list,
                           "MPTZPosition attribute is mandatory for command support.")
         mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
-        initialPan = mptzposition_dut.pan
-        initialTilt = mptzposition_dut.tilt
-        initialZoom = mptzposition_dut.zoom
+        currentPan = mptzposition_dut.pan
+        currentTilt = mptzposition_dut.tilt
+        currentZoom = mptzposition_dut.zoom
 
         self.step(3)
         await self.send_null_mptz_relative_move_command(endpoint, expected_status=Status.InvalidCommand)
@@ -140,11 +140,11 @@ async def test_TC_AVSUM_2_3(self):
             # Create new Value for Pan
             while True:
                 newPan = random.randint(pan_min_dut+1, pan_max_dut)
-                if newPan != initialPan:
+                if newPan != currentPan:
                     break
 
             # Calulate the difference, this is the relative move
-            relativePan = abs(initialPan - newPan) if (initialPan < newPan) else -abs(newPan - initialPan)
+            relativePan = abs(currentPan - newPan) if (currentPan < newPan) else -abs(newPan - currentPan)
 
             self.step(7)
             # Invoke the command with the new Pan value
@@ -154,6 +154,9 @@ async def test_TC_AVSUM_2_3(self):
             # Read the attribute back and make sure it was set
             newpan_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newpan_mptzposition_dut.pan, newPan, "Received Pan does not match set Pan")
+            asserts.assert_equal(newpan_mptzposition_dut.tilt, currentTilt, "Tilt unexpectedly changed when only changing Pan")
+            asserts.assert_equal(newpan_mptzposition_dut.zoom, currentZoom, "Zoom unexpectedly changed when only changing Pan")
+            currentPan = newPan
 
             self.step(9)
             # Create an out of range value for Pan, verify it's clipped to PanMax
@@ -165,6 +168,8 @@ async def test_TC_AVSUM_2_3(self):
             self.step(11)
             newpan_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newpan_mptzposition_dut.pan, pan_max_dut, "Received Pan does not match PanMax")
+            currentPan = pan_max_dut
+
         else:
             self.skip_step(4)
             self.skip_step(5)
@@ -194,10 +199,10 @@ async def test_TC_AVSUM_2_3(self):
             # Create new Value for Tilt
             while True:
                 newTilt = random.randint(tilt_min_dut+1, tilt_max_dut)
-                if newTilt != initialTilt:
+                if newTilt != currentTilt:
                     break
 
-            relativeTilt = abs(initialTilt - newTilt) if (initialTilt < newTilt) else -abs(newTilt - initialTilt)
+            relativeTilt = abs(currentTilt - newTilt) if (currentTilt < newTilt) else -abs(newTilt - currentTilt)
 
             self.step(15)
             # Invoke the command with the new Tilt value
@@ -207,6 +212,9 @@ async def test_TC_AVSUM_2_3(self):
             # Read the attribute back and make sure it was set
             newtilt_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newtilt_mptzposition_dut.tilt, newTilt, "Received Tilt does not match set Tilt")
+            asserts.assert_equal(newtilt_mptzposition_dut.pan, currentPan, "Pan unexpectedly changed when only changing Tilt")
+            asserts.assert_equal(newtilt_mptzposition_dut.zoom, currentZoom, "Zoom unexpectedly changed when only changing Tilt")
+            currentTilt = newTilt
 
             self.step(17)
             # Create an out of range value for Tilt, verify it's clipped to TiltMax
@@ -218,6 +226,8 @@ async def test_TC_AVSUM_2_3(self):
             self.step(19)
             newtilt_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newtilt_mptzposition_dut.tilt, tilt_max_dut, "Received Tilt does not match TiltMax")
+            currentTilt = tilt_max_dut
+
         else:
             self.skip_step(12)
             self.skip_step(13)
@@ -240,10 +250,10 @@ async def test_TC_AVSUM_2_3(self):
             # Create new Value for Zoom
             while True:
                 newZoom = random.randint(2, zoom_max_dut)
-                if newZoom != initialZoom:
+                if newZoom != currentZoom:
                     break
 
-            relativeZoom = abs(initialZoom - newZoom) if (initialZoom < newZoom) else -abs(newZoom - initialZoom)
+            relativeZoom = abs(currentZoom - newZoom) if (currentZoom < newZoom) else -abs(newZoom - currentZoom)
 
             self.step(22)
             # Invoke the command with the new Zoom value
@@ -253,6 +263,8 @@ async def test_TC_AVSUM_2_3(self):
             # Read the attribute back and make sure it was set
             newzoom_mptzposition_dut = await self.read_avsum_attribute_expect_success(endpoint, attributes.MPTZPosition)
             asserts.assert_equal(newzoom_mptzposition_dut.zoom, newZoom, "Received Zoom does not match set Zoom")
+            asserts.assert_equal(newzoom_mptzposition_dut.pan, currentPan, "Pan unexpectedly changed when only changing Zoom")
+            asserts.assert_equal(newzoom_mptzposition_dut.tilt, currentTilt, "Tilt unexpectedly changed when only changing Zoom")
 
             self.step(24)
             # Create an out of range value for Zoom, verify it's clipped to ZoomMax