Modified tests Aug 31 (#28985)

* Modified tests: TC_ACL_2_10 TC_ACL_2_7 TC_ACT_2_1 TC_ALOGIN_12_1 TC_BIND_2_3 TC_BRBINFO_1_1 TC_BR_4 TC_CADMIN_1_13 TC_CADMIN_1_15 TC_CADMIN_1_17 TC_CADMIN_1_18 TC_DESC_2_1 TC_DGGEN_2_2 TC_DRLK_3_2 TC_G_2_2 TC_G_2_3 TC_G_3_2 TC_ICDM_2_2 TC_ICDM_2_3 TC_IDM_4_4 TC_IDM_6_2 TC_IDM_6_4 TC_IDM_7_1 TC_I_2_2 TC_MC_11_1 TC_OPCREDS_3_2 TC_OPCREDS_3_3 TC_OPSTATE_2_2 TC_OPSTATE_2_3 TC_RVCCLEANM_3_1 TC_RVCOPSTATE_2_2 TC_RVCRUNM_3_1 TC_SC_3_1 TC_SC_3_2 TC_SC_3_3 TC_SC_4_10 TC_SC_4_2 TC_SC_4_3 TC_SC_4_4 TC_SC_4_5 TC_SC_4_6 TC_SC_4_7 TC_SC_4_9 TC_SC_6_1 TC_SU_2_8 TC_SU_3_3 TC_SU_4_1 TC_S_2_5 TC_S_2_6 TC_TCTL_2_2 TC_TSTAT_3_2 TC_WASHERCTRL_1_1 TC_WASHERCTRL_2_1 TC_WASHERCTRL_2_2 * Restyled by whitespace * Fixes script issue 629 * Disabled TC-RVCRUNM-3.1 test in init.py Removed step 2a subscribe operationalstatus from test: TC-WNCV-3.1 TC-WNCV-3.2 * Restyled by whitespace * Modified tests: TC-WNCV-3.1 TC-WNCV-3.2 * Fix script issue: 953 Updated DRLK writable PICS in drl_2_x_common.py * Disabled RVCCLEANM-3.1 test in init.py * Added high level PICS for tests: TC-CADMIN-1.25 TC-CADMIN-1.26 TC-DA-1.8 * Fix script issue 632. * Restyled by whitespace * Fix issue 28997 * Removed WASHERCTRL-2.2 from Darwin JSON file. Modified manual script : TC-GRPKEY-5.4 TC-SC-6.1 TC-OPCREDS-3.6 TC-G-3.2 * Restyled by whitespace * Modified test: TC-SC-6.1 * Restyled by whitespace * Modified test: TC-SC-6.1 * Restyled by whitespace * Added WASHERCTRL-2.2 test in Darwin --------- Co-authored-by: Restyled.io <[email protected]>
project-chip · Nov 2, 2023 · 3ce0e34 · 3ce0e34
1 parent 921a843
commit 3ce0e34
Show file tree

Hide file tree

Showing 82 changed files with 4,171 additions and 5,731 deletions.
diff --git a/scripts/tests/chiptest/__init__.py b/scripts/tests/chiptest/__init__.py
@@ -174,6 +174,8 @@ def _GetChipReplUnsupportedTests() -> Set[str]:
         "Test_TC_DGGEN_2_3.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_LWM_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
         "Test_TC_G_2_4.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
+        "Test_TC_RVCRUNM_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
+        "Test_TC_RVCCLEANM_3_1.yaml",            # chip-repl does not support EqualityCommands pseudo-cluster
     }
 
 

diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -2664,67 +2664,60 @@ PICS:
     #
     # Server write attributes
     #
+    - label: "Does the device implement simulation of a Not Fully Locked State?"
+      id: DRLK.S.M.SimulateNotFullyLocked
 
-    - label: "Does the DUT(server) support the DoorOpen Events attribute?"
-      id: DRLK.S.A0004.Write
-
-    - label: "Does the DUT(server) support the DoorClosedEvents attribute?"
-      id: DRLK.S.A0005.Write
-
-    - label: "Does the DUT(server) support the OpenPeriod attribute?"
-      id: DRLK.S.A0006.Write
-
-    - label: "Does the DUT(server) support the Language attribute?"
-      id: DRLK.S.A0021.Write
-
-    - label: "Does the DUT(server) support the LEDSettings attribute?"
-      id: DRLK.S.A0022.Write
-
-    - label: "Does the DUT(server) support the AutoRelockTime attribute?"
-      id: DRLK.S.A0023.Write
-
-    - label: "Does the DUT(server) support the SoundVolume attribute?"
-      id: DRLK.S.A0024.Write
+    - label: "Does the device implement detection of a LockJammed State?"
+      id: DRLK.S.M.DetectLockJammed
 
-    - label: "Does the DUT(server) support the OperatingMode attribute?"
-      id: DRLK.S.A0025.Write
+    - label: "Does the device implement Language attribute with write access?"
+      id: DRLK.S.M.LanguageAttributeWritable
 
     - label:
-          "Does the DUT(server) support the EnableLocalProgramming attribute?"
-      id: DRLK.S.A0028.Write
+          "Does the device implement LEDSettings attribute with write access?"
+      id: DRLK.S.M.LEDSettingsAttributeWritable
 
-    - label: "Does the DUT(server) support the EnableOneTouchLocking attribute?"
-      id: DRLK.S.A0029.Write
+    - label:
+          "Does the device implement AutoRelockTime attribute with write access?"
+      id: DRLK.S.M.AutoRelockTimeAttributeWritable
 
-    - label: "Does the DUT(server) support the EnableInsideStatusLED attribute?"
-      id: DRLK.S.A002a.Write
+    - label:
+          "Does the device implement SoundVolume attribute with write access?"
+      id: DRLK.S.M.SoundVolumeAttributeWritable
 
     - label:
-          "Does the DUT(server) support the EnablePrivacyModeButton attribute?"
-      id: DRLK.S.A002b.Write
+          "Does the device implement OperatingMode attribute with write access?"
+      id: DRLK.S.M.OperatingModeAttributeWritable
 
     - label:
-          "Does the DUT(server) support the LocalProgrammingFeatures attribute?"
-      id: DRLK.S.A002c.Write
+          "Does the device implement EnableLocalProgramming attribute with write
+          access?"
+      id: DRLK.S.M.EnableLocalProgrammingAttributeWritable
 
-    - label: "Does the DUT(server) support the WrongCodeEntryLimit attribute?"
-      id: DRLK.S.A0030.Write
+    - label:
+          "Does the device implement LocalProgrammingFeatures attribute with
+          write access?"
+      id: DRLK.S.M.LocalProgrammingFeaturesAttributeWritable
 
     - label:
-          "Does the DUT(server) support the UserCodedTemporaryDisableTime
-          attribute?"
-      id: DRLK.S.A0031.Write
+          "Does the device implement WrongCodeEntryLimit attribute with write
+          access?"
+      id: DRLK.S.M.WrongCodeEntryLimitAttributeWritable
 
-    - label: "Does the DUT(server) support the SendPINOverTheAir attribute?"
-      id: DRLK.S.A0032.Write
+    - label:
+          "Does the device implement UserCodedTemporaryDisableTime attribute
+          with write access?"
+      id: DRLK.S.M.UserCodedTemporaryDisableTimeAttributeWritable
 
     - label:
-          "Does the DUT(server) support the RequirePINForRemoteOperation
-          attribute?"
-      id: DRLK.S.A0033.Write
+          "Does the device implement RequirePINForRemoteOperation attribute with
+          write access?"
+      id: DRLK.S.M.RequirePINForRemoteOperationAttributeWritable
 
-    - label: "Does the DUT(server) support the ExpiringUserTimeOut attribute?"
-      id: DRLK.S.A0035.Write
+    - label:
+          "Does the device implement ExpiringUserTimeOut attribute with write
+          access?"
+      id: DRLK.S.M.ExpiringUserTimeOutAttributeWritable
 
     #
     # server / commandsReceived
@@ -9237,6 +9230,9 @@ PICS:
           "Can the Rinse attribute changed by physical control at the device?"
       id: WASHERCTRL.S.M.ManuallyControlledRinse
 
+    - label: "Can the device be controlled manually?"
+      id: WASHERCTRL.S.M.ManuallyControlled
+
     #
     #RVC Run Mode
     #

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_10.yaml
@@ -557,13 +557,14 @@ tests:
       verification: |
           ./chip-tool accesscontrol read extension 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
-          On TH2(Chiptool) , Verify AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
+          Via the TH2(chip-tool), Verify the AccessControlExtensionStruct containing 1 element, and MUST NOT contain an element with FabricIndex F1
 
           [1657289746.737641][19293:19298] CHIP:TOO: Endpoint: 0 Cluster: 0x0000_001F Attribute 0x0000_0001 DataVersion: 1884338152
           [1657289746.737713][19293:19298] CHIP:TOO:   Extension: 1 entries
           [1657289746.737778][19293:19298] CHIP:TOO:     [1]: {
           [1657289746.737803][19293:19298] CHIP:TOO:       Data: 17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018
-          [1657289746.737844][19293:19298] CHIP:TOO:       Fab
+          [1657289746.737844][19293:19298] CHIP:TOO:       FabricIndex: 2
+          [1657289746.737862][19293:19298] CHIP:TOO:      }
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP && ACL.S.A0001

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_7.yaml
@@ -392,7 +392,7 @@ tests:
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
     - label: "TH2 writes Extension attribute value as empty list"
       verification: |
-          ./chip-tool accesscontrol write extension '[{}]' 2 0 --commissioner-name beta --commissioner-nodeid 223344
+          ./chip-tool accesscontrol write extension '[]' 2 0 --commissioner-name beta --commissioner-nodeid 223344
       cluster: "LogCommands"
       command: "UserPrompt"
       PICS: PICS_SKIP_SAMPLE_APP && ACL.S.A0001

diff --git a/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ACT_2_1.yaml
@@ -451,7 +451,7 @@ tests:
       disabled: true
 
     - label:
-          "Step 6d: Verify SetupURL appended by '?/a='' and the decimal numeric
+          "Step 6d: Verify SetupURL appended by '?/a=' and the decimal numeric
           value of one of the exposed ActionIDs (see step 5a) points to a site
           providing information about the action"
       PICS: ACT.S.A0002 && ACT.S.M.SetupURLWithSuffix

diff --git a/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml b/src/app/tests/suites/certification/Test_TC_ALOGIN_12_1.yaml
@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# Auto-generated scripts for harness use only, please review before automation. The endpoints and cluster names are currently set to default
 
 name: 3.14.1. [TC-ALOGIN-12.1] Account Login Verification
 
@@ -60,10 +59,11 @@ tests:
               - name: "Status"
                 value: 0
 
+    #Issue: https://github.com/project-chip/connectedhomeip/issues/28992
     - label:
           "Step 1: TH sends a GetSetupPIN command to the DUT with test values
           provided by the product maker."
-      PICS: ALOGIN.S.C00.Rsp
+      PICS: ALOGIN.S.C00.Rsp && PICS_SKIP_SAMPLE_APP
       command: "GetSetupPIN"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -74,11 +74,13 @@ tests:
           values:
               - name: "SetupPIN"
                 saveAs: setupPIN
+                constraints:
+                    minLength: 11
 
     - label:
           "Step 2: TH sends a Login command to the DUT with test values provided
           by the product maker."
-      PICS: ALOGIN.S.C02.Rsp
+      PICS: ALOGIN.S.C02.Rsp && PICS_SKIP_SAMPLE_APP
       command: "Login"
       timedInteractionTimeoutMs: 10000
       arguments:
@@ -91,6 +93,6 @@ tests:
     - label:
           "Step 3: TH sends a Logout command to the DUT with test values
           provided by the product maker."
-      PICS: ALOGIN.S.C03.Rsp
+      PICS: ALOGIN.S.C03.Rsp && PICS_SKIP_SAMPLE_APP
       command: "Logout"
       timedInteractionTimeoutMs: 10000
diff --git a/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml b/src/app/tests/suites/certification/Test_TC_BIND_2_3.yaml
@@ -127,11 +127,7 @@ tests:
 
           Run this command for lighting app in chip-tool:
 
-          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42,
-          "groupKeySecurityPolicy": 0, "epochKey0":
-          "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1":
-          "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2":
-          "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 2 0
+          ./chip-tool groupkeymanagement key-set-write '{"groupKeySetID": 42, "groupKeySecurityPolicy": 0, "epochKey0": "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime0": 2220000,"epochKey1": "d1d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime1": 2220001,"epochKey2": "d2d1d2d3d4d5d6d7d8d9dadbdcdddedf", "epochStartTime2": 2220002 }' 2 0
 
           On TH1, Verify the success response for KeySetWrite
 

diff --git a/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml b/src/app/tests/suites/certification/Test_TC_BRBINFO_1_1.yaml
@@ -34,26 +34,13 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    #Issue https://github.com/project-chip/connectedhomeip/issues/26602
     - label: "Step 2: TH reads the ClusterRevision from DUT"
-      verification: |
-          ./chip-tool bridgeddevicebasicinformation read cluster-revision 1 3
-
-          Via the TH (chip-tool), verify:
-          -that the ClusterRevision attribute contains value as 2.
-          -that value is in the type of uint16.
-
-          [1657695910.794487][15411:15416] CHIP:TOO: Endpoint: 3 Cluster: 0x0000_0039 Attribute 0x0000_FFFD DataVersion: 2577979325
-          [1657695910.794568][15411:15416] CHIP:TOO:   ClusterRevision: 2
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
+      command: "readAttribute"
+      attribute: "ClusterRevision"
+      response:
+          value: 2
+          constraints:
+              type: int16u
 
     - label: "Step 3: TH reads the FeatureMap from DUT"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_BR_4.yaml b/src/app/tests/suites/certification/Test_TC_BR_4.yaml
@@ -6042,7 +6042,7 @@ tests:
           contains the state of the battery of the (supported) devices from the
           above list"
       verification: |
-          ./chip-tool powersource read bat-charge-level 1 9
+          ./chip-tool powersource read bat-charge-level 1 6
 
           Verify BatChargeLevel attribute response on TH(bridge-app) Log:
 
@@ -6063,7 +6063,7 @@ tests:
           [1663925822.845919][1588:1588] CHIP:DMG:                                         Attribute = 0x0000_000E,
           [1663925822.845946][1588:1588] CHIP:DMG:                                 }
           [1663925822.845978][1588:1588] CHIP:DMG:
-          [1663925822.846007][1588:1588] CHIP:DMG:                                 Data = 58,
+          [1663925822.846007][1588:1588] CHIP:DMG:                                 Data = 3,
           [1663925822.846035][1588:1588] CHIP:DMG:                         },
           [1663925822.846063][1588:1588] CHIP:DMG:
           [1663925822.846086][1588:1588] CHIP:DMG:                 },

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_13.yaml
@@ -159,7 +159,7 @@ tests:
       verification: |
           On TH_CR3 send the below command
 
-           ./chip-tool pairing onnetwork 3 20202021  --commissioner-name gamma
+           ./chip-tool pairing code 3 34970112332  --commissioner-name gamma
 
           Verify you got below message  on TH_CR3(chip-tool) log
           Device commissioning completed with success
@@ -210,7 +210,7 @@ tests:
 
 
           On 2nd controller using chip tool connect to the accessory
-          ./chip-tool pairing onnetwork 2 20202021  --commissioner-name beta
+          ./chip-tool pairing code 2 34970112332   --commissioner-name beta
 
           Verify you got below message on TH_CR2(chip-tool) log
           Device commissioning completed with success

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_15.yaml
@@ -221,8 +221,8 @@ tests:
       disabled: true
 
     - label:
-          "Verify DUT_CE is now discoverable over DNS-SD with 2 Operational
-          service records (_matter._tcp SRV records)."
+          "Step 10: Verify DUT_CE is now discoverable over DNS-SD with 2
+          Operational service records (_matter._tcp SRV records)."
       PICS: CADMIN.S.C00.Rsp
       verification: |
           Execute the below command in any linux platform or in TH_CR1

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_17.yaml
@@ -358,8 +358,8 @@ tests:
       disabled: true
 
     - label:
-          "Verify TH_CE is now discoverable over DNS-SD with 2 Operational
-          service records (_matter._tcp SRV records)."
+          "Step 10: Verify TH_CE is now discoverable over DNS-SD with 2
+          Operational service records (_matter._tcp SRV records)."
       verification: |
           On any Linux platform execute this command or in TH_CR2
 

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_18.yaml
@@ -339,8 +339,8 @@ tests:
       disabled: true
 
     - label:
-          "Verify TH_CE is now discoverable over DNS-SD with 2 Operational
-          service records (_matter._tcp SRV records)."
+          "Step 10: Verify TH_CE is now discoverable over DNS-SD with 2
+          Operational service records (_matter._tcp SRV records)."
       verification: |
           Below are the example command for using single RPI as multiple controller. Vendor should have the provision to use the equivalent command in their DUT or use multiple commissioners/controllers
 

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_25.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_25.yaml
@@ -17,6 +17,9 @@ name:
     36.1.25. [TC-CADMIN-1.25] Subscription to the attributes - verify
     subscription response [ECM] [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+
 config:
     nodeId: 0x12344321
     cluster: "Basic Information"

diff --git a/src/app/tests/suites/certification/Test_TC_CADMIN_1_26.yaml b/src/app/tests/suites/certification/Test_TC_CADMIN_1_26.yaml
@@ -17,6 +17,10 @@ name:
     36.1.26. [TC-CADMIN-1.26] Subscription to the attributes - verify
     subscription response [BCM] [DUT - Commissionee]
 
+PICS:
+    - CADMIN.S
+    - CADMIN.S.F00
+
 config:
     nodeId: 0x12344321
     cluster: "Basic Information"

diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_8.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_8.yaml
@@ -17,6 +17,9 @@ name:
     29.1.8. [TC-DA-1.8] Device Attestation Request Validation-Success Scenario
     [DUT-Commissioner]
 
+PICS:
+    - MCORE.ROLE.COMMISSIONER
+
 config:
     nodeId: 0x12344321
     cluster: "Basic Information"