Modified scripts July 17 (#28048)

* Fixes issue: 570 TC-DRLK-2.8 Semi-automated tests: TC-ACL-2.5 TC-ACL-2.6 Deleted manual tests: TC-ACE-1.2 TC-DA-1.2 TC-DA-1.5 TC-IDM-1.2 Added step number for all automated & semi-automated tests: TC_ACE_1_5 TC_ACFREMON_1_1 TC_ACFREMON_2_1 TC_ACL_1_1 TC_ACL_2_1 TC_ACL_2_3 TC_ACL_2_7 TC_ACL_2_8 TC_ACL_2_9 TC_ACT_1_1 TC_AIRQUAL_1_1 TC_AIRQUAL_2_1 TC_ALOGIN_1_12 TC_ALOGIN_12_1 TC_APBSC_1_10 TC_APBSC_9_1 TC_APPLAUNCHER_1_3 TC_APPLAUNCHER_3_5 TC_APPLAUNCHER_3_6 TC_APPLAUNCHER_3_7 TC_AUDIOOUTPUT_1_8 TC_AUDIOOUTPUT_7_1 TC_AUDIOOUTPUT_7_2 TC_BIND_1_1 TC_BINFO_1_1 TC_BINFO_2_1 TC_BINFO_2_2 TC_BOOL_1_1 TC_BOOL_2_1 TC_BRBINFO_1_1 TC_BRBINFO_2_1 TC_CADMIN_1_10 TC_CADMIN_1_16 TC_CADMIN_1_21 TC_CADMIN_1_22 TC_CADMIN_1_23 TC_CADMIN_1_24 TC_CADMIN_1_4 TC_CADMIN_1_6 TC_CC_1_1 TC_CC_2_1 TC_CC_3_1 TC_CC_3_2 TC_CC_3_3 TC_CC_4_1 TC_CC_4_2 TC_CC_4_3 TC_CC_4_4 TC_CC_5_1 TC_CC_5_2 TC_CC_5_3 TC_CC_6_1 TC_CC_6_2 TC_CC_6_3 TC_CC_6_5 TC_CC_7_1 TC_CC_7_2 TC_CC_7_3 TC_CC_7_4 TC_CC_8_1 TC_CC_9_1 TC_CC_9_2 TC_CC_9_3 TC_CDOCONC_1_1 TC_CDOCONC_2_1 TC_CFREMON_1_1 TC_CFREMON_2_1 TC_CGEN_1_1 TC_CGEN_2_1 TC_CHANNEL_1_6 TC_CHANNEL_5_1 TC_CHANNEL_5_2 TC_CHANNEL_5_3 TC_CMOCONC_1_1 TC_CMOCONC_2_1 TC_CNET_1_3 TC_CONTENTLAUNCHER_1_11 TC_CONTENTLAUNCHER_10_1 TC_CONTENTLAUNCHER_10_3 TC_CONTENTLAUNCHER_10_5 TC_CONTENTLAUNCHER_10_7 TC_DESC_1_1 TC_DGETH_1_1 TC_DGETH_2_1 TC_DGETH_2_2 TC_DGGEN_1_1 TC_DGGEN_2_1 TC_DGSW_1_1 TC_DGTHREAD_1_1 TC_DGTHREAD_2_1 TC_DGTHREAD_2_2 TC_DGTHREAD_2_3 TC_DGTHREAD_2_4 TC_DGWIFI_1_1 TC_DGWIFI_2_1 TC_DGWIFI_2_3 TC_DLOG_1_1 TC_DRLK_1_1 TC_DRLK_2_1 TC_DRLK_2_11 TC_DRLK_2_12 TC_DRLK_2_2 TC_DRLK_2_3 TC_DRLK_2_4 TC_DRLK_2_5 TC_DRLK_2_6 TC_DRLK_2_7 TC_DRLK_2_9 TC_ESFREMON_1_1 TC_ESFREMON_2_1 TC_FAN_1_1 TC_FAN_2_1 TC_FAN_2_2 TC_FAN_2_3 TC_FAN_2_4 TC_FAN_2_5 TC_FLABEL_1_1 TC_FLABEL_2_1 TC_FLDCONC_1_1 TC_FLDCONC_2_1 TC_FLW_1_1 TC_FLW_2_1 TC_FLW_2_2 TC_FTREMON_1_1 TC_FTREMON_2_1 TC_G_1_1 TC_G_2_1 TC_HEPAFREMON_1_1 TC_HEPAFREMON_2_1 TC_I_1_1 TC_I_2_1 TC_I_2_2 TC_I_2_3 TC_ICDM_1_1 TC_ICDM_2_1 TC_ILL_1_1 TC_ILL_2_1 TC_ILL_2_2 TC_INKCREMON_1_1 TC_INKCREMON_2_1 TC_IONFREMON_1_1 TC_IONFREMON_2_1 TC_KEYPADINPUT_1_2 TC_KEYPADINPUT_3_2 TC_KEYPADINPUT_3_3 TC_LCFG_1_1 TC_LOWPOWER_1_1 TC_LOWPOWER_2_1 TC_LTIME_1_2 TC_LUNIT_1_2 TC_LUNIT_3_1 TC_LVL_1_1 TC_LVL_2_1 TC_LVL_2_2 TC_LVL_3_1 TC_LVL_4_1 TC_LVL_5_1 TC_LVL_6_1 TC_MEDIAINPUT_1_4 TC_MEDIAINPUT_3_10 TC_MEDIAINPUT_3_11 TC_MEDIAINPUT_3_12 TC_MEDIAINPUT_3_13 TC_MEDIAPLAYBACK_1_7 TC_MEDIAPLAYBACK_6_1 TC_MEDIAPLAYBACK_6_2 TC_MEDIAPLAYBACK_6_3 TC_MEDIAPLAYBACK_6_4 TC_MOD_1_1 TC_NDOCONC_1_1 TC_NDOCONC_2_1 TC_OCC_1_1 TC_OCC_2_1 TC_OCC_2_3 TC_OCC_3_1 TC_OO_1_1 TC_OO_2_1 TC_OO_2_2 TC_OO_2_4 TC_OPCREDS_1_2 TC_OPSTATE_1_1 TC_OZCONC_1_1 TC_OZCONC_2_1 TC_OZFREMON_1_1 TC_OZFREMON_2_1 TC_PCC_1_1 TC_PCC_2_1 TC_PCC_2_2 TC_PCC_2_3 TC_PCC_2_4 TC_PMHCONC_1_1 TC_PMHCONC_2_1 TC_PMICONC_1_1 TC_PMICONC_2_1 TC_PMKCONC_1_1 TC_PMKCONC_2_1 TC_PRS_1_1 TC_PRS_2_1 TC_PRS_2_2 TC_PS_1_1 TC_PS_2_1 TC_PSCFG_1_1 TC_PSCFG_2_1 TC_RH_1_1 TC_RH_2_1 TC_RH_2_2 TC_RNCONC_1_1 TC_RNCONC_2_1 TC_RVCOPSTATE_1_1 TC_S_1_1 TC_S_2_1 TC_S_2_2 TC_S_2_3 TC_S_2_4 TC_SC_4_1 TC_SWTCH_1_1 TC_SWTCH_2_1 TC_TCREMON_1_1 TC_TCREMON_2_1 TC_TGTNAV_1_9 TC_TGTNAV_8_1 TC_TMP_1_1 TC_TMP_2_1 TC_TMP_2_2 TC_TSTAT_1_1 TC_TSTAT_2_1 TC_TSTAT_2_2 TC_TSUIC_1_1 TC_TSUIC_2_1 TC_TSUIC_2_2 TC_TVOCCONC_1_1 TC_TVOCCONC_2_1 TC_ULABEL_1_1 TC_ULABEL_2_1 TC_ULABEL_2_2 TC_ULABEL_2_3 TC_ULABEL_2_4 TC_ULABEL_3_1_Simulated TC_UVFREMON_1_1 TC_UVFREMON_2_1 TC_WAKEONLAN_1_5 TC_WAKEONLAN_4_1 TC_WNCV_1_1 TC_WNCV_2_1 TC_WNCV_2_2 TC_WNCV_2_3 TC_WNCV_2_4 TC_WNCV_2_5 TC_WNCV_3_1 TC_WNCV_3_2 TC_WNCV_3_3 TC_WNCV_3_4 TC_WNCV_3_5 TC_WNCV_4_1 TC_WNCV_4_2 TC_WNCV_4_3 TC_WNCV_4_4 TC_WNCV_4_5 TC_WTREMON_1_1 TC_WTREMON_2_1 TC_ZEOFREMON_1_1 TC_ZEOFREMON_2_1 * Auto generated files * Modified test TC-ACL-2.5 ciTests.json manualTests.json Disabled events tests in Darwin Json file * Auto generated files
project-chip · Jul 8, 2024 · 863a263 · 863a263
1 parent f79b45d
commit 863a263
Show file tree

Hide file tree

Showing 276 changed files with 21,218 additions and 23,695 deletions.
diff --git a/examples/darwin-framework-tool/templates/tests/ciTests.json b/examples/darwin-framework-tool/templates/tests/ciTests.json
@@ -120,6 +120,8 @@
         "Disabled due to OperationalState not being enabled in Matter.framework for now:",
         "Test_TC_OPSTATE_1_1",
         "Disabled due to Events verification not supported",
-        "Test_TC_BINFO_2_2"
+        "Test_TC_BINFO_2_2",
+        "Test_TC_ACL_2_5",
+        "Test_TC_ACL_2_6"
     ]
 }
diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_2.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_2.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml b/src/app/tests/suites/certification/Test_TC_ACE_1_5.yaml
@@ -36,7 +36,7 @@ config:
         defaultValue: "hex:b96170aae803346884724fe9a3b287c30330c2a660375d17bb205a8cf1aecb350457f8ab79ee253ab6a8e46bb09e543ae422736de501e3db37d441fe344920d09548e4c18240630c4ff4913c53513839b7c07fcc0627a1b8573a149fcd1fa466cf"
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved for TH1"
+    - label: "Step 1: Wait for the commissioned device to be retrieved for TH1"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -81,7 +81,7 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Open Commissioning Window from alpha"
+    - label: "Step 2: Open Commissioning Window from alpha"
       cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
@@ -108,7 +108,7 @@ tests:
               - name: "ms"
                 value: waitAfterCommissioning
 
-    - label: "Commission from TH2"
+    - label: "Step 3: Commission from TH2"
       identity: "beta"
       cluster: "CommissionerCommands"
       command: "PairWithCode"
@@ -130,7 +130,7 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "TH2 reads the fabric index"
+    - label: "Step 4: TH2 reads the fabric index"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       cluster: "Operational Credentials"
@@ -140,7 +140,7 @@ tests:
           saveAs: th2FabricIndex
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "TH2 reads the fabric index"
+    - label: "Step 4: TH2 reads the fabric index"
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 2 0 --commissioner-name beta
 
@@ -168,7 +168,8 @@ tests:
               - name: "nodeId"
                 saveAs: commissionerNodeIdAlpha
 
-    - label: "TH1 writes ACL giving view privilege for descriptor cluster"
+    - label:
+          "Step 5: TH1 writes ACL giving view privilege for descriptor cluster"
       command: "writeAttribute"
       attribute: "ACL"
       arguments:
@@ -201,7 +202,7 @@ tests:
               - name: "nodeId"
                 saveAs: commissionerNodeIdBeta
 
-    - label: "TH2 writes ACL giving view privilge for basic cluster"
+    - label: "Step 6: TH2 writes ACL giving view privilge for basic cluster"
       identity: beta
       PICS: PICS_SDK_CI_ONLY
       command: "writeAttribute"
@@ -227,7 +228,7 @@ tests:
               ]
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "TH2 writes ACL giving view privilge for basic cluster"
+    - label: "Step 6: TH2 writes ACL giving view privilge for basic cluster"
       verification: |
           ./chip-tool accesscontrol write acl '[{"fabricIndex": 2, "privilege": 5, "authMode": 2, "subjects": [223344], "targets": [{ "cluster": 31, "endpoint": 0, "deviceType": null }]}, {"fabricIndex": 2, "privilege": 1, "authMode": 2, "subjects": null, "targets": [{ "cluster": 40, "endpoint": 0, "deviceType": null }]}]' 2 0 --commissioner-name beta
 
@@ -248,19 +249,19 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "TH1 reads descriptor cluster - expect SUCCESS"
+    - label: "Step 7: TH1 reads descriptor cluster - expect SUCCESS"
       command: "readAttribute"
       cluster: "Descriptor"
       attribute: "DeviceTypeList"
 
-    - label: "TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"
+    - label: "Step 8: TH1 reads basic cluster - expect UNSUPPORTED_ACCESS"
       command: "readAttribute"
       cluster: "Basic Information"
       attribute: "VendorID"
       response:
           error: UNSUPPORTED_ACCESS
 
-    - label: "TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"
+    - label: "Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       command: "readAttribute"
@@ -270,7 +271,7 @@ tests:
           error: UNSUPPORTED_ACCESS
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"
+    - label: "Step 9: TH2 reads descriptor cluster - expect UNSUPPORTED_ACCESS"
       verification: |
           ./chip-tool descriptor read device-type-list 2 0 --commissioner-name beta
 
@@ -290,15 +291,15 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "TH2 reads basic cluster - expect SUCCESS"
+    - label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       command: "readAttribute"
       cluster: "Basic Information"
       attribute: "VendorID"
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "TH2 writes Extension attribute value as empty list"
+    - label: "Step 10: TH2 reads basic cluster - expect SUCCESS"
       verification: |
           ./chip-tool basicinformation read vendor-id 2 0 --commissioner-name beta
 
@@ -317,7 +318,7 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "TH1 resets ACL to default"
+    - label: "Step 11: TH1 resets ACL to default"
       command: "writeAttribute"
       attribute: "ACL"
       arguments:
@@ -331,7 +332,7 @@ tests:
                   },
               ]
 
-    - label: "TH1 sends RemoveFabric command for TH2"
+    - label: "Step 12: TH1 sends RemoveFabric command for TH2"
       cluster: "Operational Credentials"
       PICS: PICS_SDK_CI_ONLY
       command: "RemoveFabric"
@@ -341,7 +342,7 @@ tests:
                 value: th2FabricIndex
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "TH1 sends RemoveFabric command for TH2"
+    - label: "Step 12: TH1 sends RemoveFabric command for TH2"
       verification: |
           ./chip-tool operationalcredentials remove-fabric 2 1 0
 

diff --git a/src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACFREMON_1_1.yaml
@@ -23,23 +23,23 @@ config:
     endpoint: 1
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
+    - label: "Step 1: Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
           values:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "Read the global attribute: ClusterRevision"
+    - label: "Step 2: Read the global attribute: ClusterRevision"
       command: "readAttribute"
       attribute: "ClusterRevision"
       response:
           value: 1
           constraints:
               type: int16u
 
-    - label: "Read the global attribute: FeatureMap"
+    - label: "Step 3a: Read the global attribute: FeatureMap"
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS: "!ACFREMON.S.F00 && !ACFREMON.S.F01"
@@ -49,8 +49,8 @@ tests:
               type: bitmap32
 
     - label:
-          "Given ACFREMON.S.F00(Condition) ensure featuremap has the correct bit
-          set"
+          "Step 3b: Given ACFREMON.S.F00(Condition) ensure featuremap has the
+          correct bit set"
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS: ACFREMON.S.F00
@@ -60,8 +60,8 @@ tests:
               hasMasksSet: [0x1]
 
     - label:
-          "Given ACFREMON.S.F01(Warning) ensure featuremap has the correct bit
-          set"
+          "Step 3c: Given ACFREMON.S.F01(Warning) ensure featuremap has the
+          correct bit set"
       command: "readAttribute"
       attribute: "FeatureMap"
       PICS: ACFREMON.S.F01
@@ -70,7 +70,7 @@ tests:
               type: bitmap32
               hasMasksSet: [0x2]
 
-    - label: "Read the global attribute: AttributeList"
+    - label: "Step 4a: Read the global attribute: AttributeList"
       command: "readAttribute"
       attribute: "AttributeList"
       response:
@@ -79,7 +79,8 @@ tests:
               contains: [2, 65528, 65529, 65530, 65531, 65532, 65533]
 
     - label:
-          "Read the feature dependent(ACFREMON.S.F00) attribute in AttributeList"
+          "Step 4b: Read the feature dependent(ACFREMON.S.F00) attribute in
+          AttributeList"
       PICS: ACFREMON.S.F00
       command: "readAttribute"
       attribute: "AttributeList"
@@ -89,8 +90,8 @@ tests:
               contains: [0, 1]
 
     - label:
-          "Read the optional attribute InPlaceIndicator (ACFREMON.S.A0002) in
-          AttributeList"
+          "Step 4c: Read the optional attribute InPlaceIndicator
+          (ACFREMON.S.A0002) in AttributeList"
       PICS: ACFREMON.S.A0002
       command: "readAttribute"
       attribute: "AttributeList"
@@ -99,34 +100,36 @@ tests:
               type: list
               contains: [3]
 
-    - label: "Read the global attribute: AcceptedCommandList"
+    - label: "Step 5: TH reads EventList attribute from DUT"
       command: "readAttribute"
-      attribute: "AcceptedCommandList"
+      attribute: "EventList"
       response:
+          value: []
           constraints:
               type: list
-              contains: []
 
-    - label: "Read the optional command (ResetCondition) in AcceptedCommandList"
-      PICS: ACFREMON.S.C00.Rsp
+    - label: "Step 6a: Read the global attribute: AcceptedCommandList"
       command: "readAttribute"
       attribute: "AcceptedCommandList"
       response:
           constraints:
               type: list
-              contains: [0]
+              contains: []
 
-    - label: "Read the global attribute: GeneratedCommandList"
+    - label:
+          "Step 6b: Read the optional command (ResetCondition) in
+          AcceptedCommandList"
+      PICS: ACFREMON.S.C00.Rsp
       command: "readAttribute"
-      attribute: "GeneratedCommandList"
+      attribute: "AcceptedCommandList"
       response:
-          value: []
           constraints:
               type: list
+              contains: [0]
 
-    - label: "TH reads EventList attribute from DUT"
+    - label: "Step 7: Read the global attribute: GeneratedCommandList"
       command: "readAttribute"
-      attribute: "EventList"
+      attribute: "GeneratedCommandList"
       response:
           value: []
           constraints:

diff --git a/src/app/tests/suites/certification/Test_TC_ACFREMON_2_1.yaml b/src/app/tests/suites/certification/Test_TC_ACFREMON_2_1.yaml
@@ -23,15 +23,15 @@ config:
     endpoint: 1
 
 tests:
-    - label: "Wait for the commissioned device to be retrieved"
+    - label: "Step 1: Wait for the commissioned device to be retrieved"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
           values:
               - name: "nodeId"
                 value: nodeId
 
-    - label: "TH reads from the DUT the Condition attribute."
+    - label: "Step 2: TH reads from the DUT the Condition attribute."
       PICS: ACFREMON.S.A0000
       command: "readAttribute"
       attribute: "Condition"
@@ -41,7 +41,8 @@ tests:
               minValue: 0
               maxValue: 100
 
-    - label: "TH reads from the DUT the DegradationDirection attribute.."
+    - label:
+          "Step 3: TH reads from the DUT the DegradationDirection attribute.."
       PICS: ACFREMON.S.A0001
       command: "readAttribute"
       attribute: "DegradationDirection"
@@ -51,7 +52,7 @@ tests:
               minValue: 0
               maxValue: 1
 
-    - label: "TH reads from the DUT the ChangeIndication attribute."
+    - label: "Step 4: TH reads from the DUT the ChangeIndication attribute."
       PICS: ACFREMON.S.A0002
       command: "readAttribute"
       attribute: "ChangeIndication"
@@ -61,7 +62,7 @@ tests:
               minValue: 0
               maxValue: 2
 
-    - label: "TH reads from the DUT the InPlaceIndicator attribute"
+    - label: "Step 5: TH reads from the DUT the InPlaceIndicator attribute"
       PICS: ACFREMON.S.A0003
       command: "readAttribute"
       attribute: "InPlaceIndicator"