Fixes issue: 655, 660

Modified tests: TC-ACL-2.4 TC-ACL-2.5 TC-ACL-2.6 TC-ACL-2.7 TC-SC-5.2 Revert back the DGGEN-2.1 testcase
project-chip · Sep 21, 2023 · 82194fb · 82194fb
1 parent 69dc8f1
commit 82194fb
Show file tree

Hide file tree

Showing 6 changed files with 311 additions and 240 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_4.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_5.yaml
@@ -33,7 +33,7 @@ config:
         defaultValue: "hex:17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E6700D00000F1FF02003248656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E7420616761696E2E2E2E2E2E2E0018"
 
 tests:
-    - label: "Step 1: TH commissions DUT using admin node ID N1"
+    - label: "Step 1: TH1 commissions DUT using admin node ID N1"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -50,7 +50,7 @@ tests:
                 saveAs: CommissionerNodeId
 
     - label:
-          "Step 2: TH reads DUT Endpoint 0 OperationalCredentials cluster
+          "Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster
           CurrentFabricIndex attribute"
       command: "readAttribute"
       cluster: "Operational Credentials"
@@ -60,7 +60,7 @@ tests:
 
     #Issue: https://github.com/project-chip/connectedhomeip/issues/24081
     - label:
-          "Step 3: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       verification: |
           ./chip-tool   accesscontrol  read-event  access-control-extension-changed 1 0
@@ -87,7 +87,7 @@ tests:
                 value: "y"
 
     - label:
-          "Step 4: TH writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 1
           element struct Data field: D_OK_EMPTY"
       PICS: ACL.S.A0001
@@ -97,7 +97,7 @@ tests:
           value: [{ Data: D_OK_EMPTY, FabricIndex: CurrentFabricIndexValue }]
 
     - label:
-          "Step 5: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       command: "readEvent"
@@ -118,7 +118,7 @@ tests:
               }
 
     - label:
-          "Step 6: TH writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 1
           element struct Data field: D_OK_SINGLE"
       PICS: ACL.S.A0001
@@ -128,7 +128,7 @@ tests:
           value: [{ Data: D_OK_SINGLE, FabricIndex: CurrentFabricIndexValue }]
 
     - label:
-          "Step 7: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       command: "readEvent"
@@ -163,7 +163,7 @@ tests:
                       }
 
     - label:
-          "Step 8: TH writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 8: TH1 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 1
           element struct Data field: D_BAD_LENGTH"
       PICS: ACL.S.A0001
@@ -175,7 +175,7 @@ tests:
           error: CONSTRAINT_ERROR
 
     - label:
-          "Step 9: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       command: "readEvent"
@@ -196,7 +196,7 @@ tests:
               }
 
     - label:
-          "Step 10: TH writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 10: TH1 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 2
           elements struct Data field: D_OK_EMPTY struct Data field: D_OK_SINGLE"
       PICS: ACL.S.A0001
@@ -212,7 +212,7 @@ tests:
           error: CONSTRAINT_ERROR
 
     - label:
-          "Step 11: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 11: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       command: "readEvent"
@@ -233,7 +233,7 @@ tests:
               }
 
     - label:
-          "Step 12: TH writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 12: TH1 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is an empty list"
       PICS: ACL.S.A0001
       command: "writeAttribute"
@@ -242,7 +242,7 @@ tests:
           value: []
 
     - label:
-          "Step 13: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 13: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       command: "readEvent"

diff --git a/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml b/src/app/tests/suites/certification/Test_TC_ACL_2_6.yaml
@@ -23,7 +23,7 @@ config:
     endpoint: 0
 
 tests:
-    - label: "Step 1: TH commissions DUT using admin node ID N1"
+    - label: "Step 1: TH1 commissions DUT using admin node ID N1"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -40,7 +40,7 @@ tests:
                 saveAs: CommissionerNodeId
 
     - label:
-          "Step 2: TH reads DUT Endpoint 0 OperationalCredentials cluster
+          "Step 2: TH1 reads DUT Endpoint 0 OperationalCredentials cluster
           CurrentFabricIndex attribute"
       command: "readAttribute"
       cluster: "Operational Credentials"
@@ -49,7 +49,7 @@ tests:
           saveAs: CurrentFabricIndexValue
 
     - label:
-          "Step 3: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 3: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlEntryChanged event"
       PICS: ACL.S.E00
       command: "readEvent"
@@ -73,10 +73,10 @@ tests:
               }
 
     - label:
-          "Step 4: TH writes DUT Endpoint 0 AccessControl cluster ACL attribute,
-          value is list of AccessControlEntryStruct containing 2 elements
-          1.struct Privilege field: Administer (5) AuthMode field: CASE (2)
-          Subjects field: [N1] Targets field: null 2struct Privilege field:
+          "Step 4: TH1 writes DUT Endpoint 0 AccessControl cluster ACL
+          attribute, value is list of AccessControlEntryStruct containing 2
+          elements 1.struct Privilege field: Administer (5) AuthMode field: CASE
+          (2) Subjects field: [N1] Targets field: null 2struct Privilege field:
           Operate (3) AuthMode field: Group (3) Subjects field: null Targets
           field: null"
       PICS: ACL.S.E00
@@ -102,7 +102,7 @@ tests:
               ]
 
     - label:
-          "Step 5: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 5: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlEntryChanged event"
       PICS: ACL.S.E00
       command: "readEvent"
@@ -159,13 +159,13 @@ tests:
                       }
 
     - label:
-          "Step 6: TH writes DUT Endpoint 0 AccessControl cluster ACL attribute,
-          value is list of AccessControlEntryStruct containing 2 elements. The
-          first item is valid, the second item is invalid due to group ID 0
-          being used, which is illegal. 1.struct Privilege field: Administer (5)
-          AuthMode field: CASE (2) Subjects field: [N1] Targets field: null
-          2.struct Privilege field: Operate (3) AuthMode field: Group (3)
-          Subjects field: [0] Targets field: null"
+          "Step 6: TH1 writes DUT Endpoint 0 AccessControl cluster ACL
+          attribute, value is list of AccessControlEntryStruct containing 2
+          elements. The first item is valid, the second item is invalid due to
+          group ID 0 being used, which is illegal. 1.struct Privilege field:
+          Administer (5) AuthMode field: CASE (2) Subjects field: [N1] Targets
+          field: null 2.struct Privilege field: Operate (3) AuthMode field:
+          Group (3) Subjects field: [0] Targets field: null"
       PICS: ACL.S.E00
       command: "writeAttribute"
       attribute: "ACL"
@@ -191,7 +191,7 @@ tests:
           error: CONSTRAINT_ERROR
 
     - label:
-          "Step 7: TH reads DUT Endpoint 0 AccessControl cluster
+          "Step 7: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlEntryChanged event"
       PICS: ACL.S.E00
       command: "readEvent"

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
@@ -45,7 +45,7 @@ config:
         defaultValue: "hex:17D00000F1FF01003D48656C6C6F20576F726C642E205468697320697320612073696E676C6520656C656D656E74206C6976696E6720617320612063686172737472696E670018"
 
 tests:
-    - label: "Step 1:Wait for the commissioned device to be retrieved"
+    - label: "Step 1: TH1 commissions DUT using admin node ID N1"
       cluster: "DelayCommands"
       command: "WaitForCommissionee"
       arguments:
@@ -62,15 +62,15 @@ tests:
                 saveAs: TH1CommissionerNodeId
 
     - label:
-          "Step 2:TH1 reads OperationalCredentials cluster CurrentFabricIndex
+          "Step 2: TH1 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"
       command: "readAttribute"
       cluster: "Operational Credentials"
       attribute: "CurrentFabricIndex"
       response:
           saveAs: TH1FabricIndex
 
-    - label: "Step 3:TH1 puts DUT into commissioning mode"
+    - label: "Step 3a: TH1 puts DUT into commissioning mode"
       cluster: "Administrator Commissioning"
       command: "OpenCommissioningWindow"
       timedInteractionTimeoutMs: 10000
@@ -128,7 +128,7 @@ tests:
               - name: "ms"
                 value: waitAfterCommissioning
 
-    - label: "Step 4:TH2 starts a commissioning process with DUT"
+    - label: "Step 3b:TH2 starts a commissioning process with DUT"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
       cluster: "CommissionerCommands"
@@ -161,7 +161,7 @@ tests:
                 saveAs: TH2CommissionerNodeId
 
     - label:
-          "Step 5:TH2 reads OperationalCredentials cluster CurrentFabricIndex
+          "Step 4: TH2 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"
       identity: "beta"
       PICS: PICS_SDK_CI_ONLY
@@ -172,7 +172,7 @@ tests:
           saveAs: TH2FabricIndex
 
     - label:
-          "Step 5:TH2 reads OperationalCredentials cluster CurrentFabricIndex
+          "Step 4: TH2 reads OperationalCredentials cluster CurrentFabricIndex
           attribute"
       verification: |
           ./chip-tool operationalcredentials read current-fabric-index 2 0 --commissioner-name beta --commissioner-nodeid 223344
@@ -191,7 +191,7 @@ tests:
                 value: "y"
 
     - label:
-          "Step 6:TH1 writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 5: TH1 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 1
           element"
       PICS: ACL.S.A0001
@@ -201,7 +201,7 @@ tests:
           value: [{ Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }]
 
     - label:
-          "Step 7:TH2 writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 6: TH2 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 1
           element"
       PICS: ACL.S.A0001 && PICS_SDK_CI_ONLY
@@ -213,7 +213,7 @@ tests:
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
     - label:
-          "Step 7:TH2 writes DUT Endpoint 0 AccessControl cluster Extension
+          "Step 6: TH2 writes DUT Endpoint 0 AccessControl cluster Extension
           attribute, value is list of AccessControlExtensionStruct containing 1
           element"
       verification: |
@@ -272,14 +272,14 @@ tests:
               - name: "expectedValue"
                 value: "y"
 
-    - label: "Step 8:TH1 reads AccessControl cluster Extension attribute"
+    - label: "Step 7: TH1 reads AccessControl cluster Extension attribute"
       PICS: ACL.S.A0001
       command: "readAttribute"
       attribute: "Extension"
       response:
           value: [{ Data: D_OK_EMPTY, FabricIndex: TH1FabricIndex }]
 
-    - label: "Step 9:TH2 reads AccessControl cluster Extension attribute"
+    - label: "Step 8: TH2 reads AccessControl cluster Extension attribute"
       PICS: ACL.S.A0001 && PICS_SDK_CI_ONLY
       identity: "beta"
       command: "readAttribute"
@@ -288,7 +288,7 @@ tests:
           value: [{ Data: D_OK_SINGLE, FabricIndex: TH2FabricIndex }]
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
-    - label: "Step 9:TH2 reads AccessControl cluster Extension attribute"
+    - label: "Step 8: TH2 reads AccessControl cluster Extension attribute"
       verification: |
           ./chip-tool accesscontrol read extension 2 0 --commissioner-name beta --commissioner-nodeid 223344
 
@@ -310,7 +310,7 @@ tests:
                 value: "y"
 
     - label:
-          "Step 10:TH1 reads DUT Endpoint 0 AccessControl cluster
+          "Step 9: TH1 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01
       command: "readEvent"
@@ -327,7 +327,7 @@ tests:
               }
 
     - label:
-          "Step 11:TH2 reads DUT Endpoint 0 AccessControl cluster
+          "Step 10: TH2 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       PICS: ACL.S.E01 && PICS_SDK_CI_ONLY
       identity: "beta"
@@ -346,7 +346,7 @@ tests:
 
     #Issue https://github.com/CHIP-Specifications/chip-certification-tool/issues/768
     - label:
-          "Step 11:TH2 reads DUT Endpoint 0 AccessControl cluster
+          "Step 10: TH2 reads DUT Endpoint 0 AccessControl cluster
           AccessControlExtensionChanged event"
       verification: |
           ./chip-tool accesscontrol read-event access-control-extension-changed  2 0 --commissioner-name beta  --commissioner-nodeid 223344