project-chip · woody-apple · Aug 26, 2022 · Aug 25, 2022 · Aug 25, 2022 · Aug 25, 2022
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -5157,12 +5157,6 @@ PICS:
     - label: "Does the Controller DUT support Service Advertising?"
       id: MCORE.SC.ADV
 
-    - label: "Does the DUT(Client) implement sending Keysetwrite Command?"
-      id: GRPKEY.C.C00.Tx
-
-    - label: "Does the DUT(Client) support the GroupKeyMap attribute?"
-      id: GRPKEY.C.A0000
-
     #133.1. Bridged Device Basic Information Cluster
     - label: "Does the DUT(server) support the DataModelRevision attribute?"
       id: BRBINFO.S.A0000
@@ -5564,3 +5558,6 @@ PICS:
           "Is the device a Client and supports subscribing for multiple
           attribute"
       id: MCORE.IDM.C.SubscribeRequest.MultipleAttributes
+
+    - label: "Does the device support the Factory Reset Method?"
+      id: MCORE.UI.FACTORYRESET
diff --git a/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml b/src/app/tests/suites/certification/Test_TC_ACL_1_1.yaml
@@ -53,7 +53,16 @@ tests:
       response:
           constraints:
               type: list
-              contains: [0, 1, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
+              contains: [0, 2, 3, 4, 65528, 65529, 65531, 65532, 65533]
+
+    - label: "TH reads optional attribute (Extension) in AttributeList"
+      PICS: ACL.S.A0001
+      command: "readAttribute"
+      attribute: "AttributeList"
+      response:
+          constraints:
+              type: list
+              contains: [1]
 
     - label: "TH reads AcceptedCommandList attribute from DUT"
       command: "readAttribute"

diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_1.yaml
@@ -78,6 +78,7 @@ tests:
     - label:
           "Factory reset DUT Perform the device discovery flow checks as covered
           in TC-DD-2.2"
+      PICS: MCORE.UI.FACTORYRESET
       verification: |
           1. TH starts matter announcement procedure using BLE transport : verify this by sending
           "./chip-tool discover commissionables" after launching all-clusters-app on DUT
@@ -90,31 +91,20 @@ tests:
 
     - label: "Commission DUT to TH2s Fabric"
       verification: |
-          To commission DUT to TH2 follow below procedure
-          1../chip-tool  pairing open-commissioning-window 1 1 400 2000 3840  on TH
-
-          Verify manual parin code on TH1 (chip-tool) Log:
-          CHIP:IN: Sending encrypted msg 0xaaaad3464d10 with MessageCounter:0 to 0x0000000000000001 at monotonic time: 5805157 msec
-          [1635691999.946536][3822:3827] CHIP:DMG: ICR moving to [CommandSen]
-          [1635691999.946586][3822:3827] CHIP:CTL: Manual pairing code: [35407541839]
-          [1635691999.946650][3822:3827] CHIP:CTL: SetupQRCode: [MT:00000CQM00G6V851H10]
-          [1635691999.946802][3822:3827] CHIP:EM: Sending Standalone Ack for MessageCounter:3234931243 on exchange 35324i
-          [1635691999.946850][3822:3827] CHIP:IN: Prepared plaintext message 0xffffaa58a960 to 0x0000000000000000 of type 0x10 and protocolId (0, 0) on exchange 35324i with MessageCounter:1726016118.
-          [1635691999.946895][3822:3827] CHIP:IN: Sending plaintext msg 0xffffaa58a960 with MessageCounter:1726016118 to 0x0000000000000000 at monotonic time: 5805158 msec
-          [1635691999.946983][3822:3827] CHIP:EM: Flushed pending ack for MessageCounter:3234931243 on exchange 35324i
+          sudo ./chip-all-clusters-app --wifi
 
+          ./chip-tool pairing ble-wifi 2 zigbeehome matter123 20202021 3841 --trace_decode 1
 
-          2. Verify TH2 is commissioned  by using "./chip-tool pairing code 2 36199720672" considering 36199720672 as manualcode generated in TH1
+          Verify in TH2 log:
 
-          Verify whether you got below message on TH2 (chip-tool) log
-          Device commissioning completed with success
+          [1650455358.501816][4366:4371] CHIP:TOO: Device commissioning completed with success
       disabled: true
 
     - label:
           "TH2 does a non-fabric-filtered read of Fabrics attribute list from
           DUT"
       verification: |
-          ./chip-tool operationalcredentials read fabrics 2 0
+          ./chip-tool operationalcredentials read fabrics 2 0  --commissioner-name beta
 
           Verify there is single entry and FabricID matches the FabricID of TH2 on TH2 (chip-tool) log
 
@@ -133,7 +123,7 @@ tests:
     - label:
           "TH2 does a non-fabric-filtered read of NOCs attribute list from DUT"
       verification: |
-          ./chip-tool operationalcredentials read nocs 2 0
+          ./chip-tool operationalcredentials read nocs 2 0   --commissioner-name beta
 
           Verify there is single entry on TH2 (chip-tool) log
 

diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_2.yaml
diff --git a/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml b/src/app/tests/suites/certification/Test_TC_DA_1_3.yaml
@@ -31,6 +31,13 @@ tests:
           Chip-tool command used below are an example to verify the  DUT as client test cases. For certification test, we expect DUT should have a capability or way to run the equivalent command.
       disabled: true
 
+    - label: "Pre-Conditions"
+      verification: |
+          1. PAI, DAC certificates are obtained and validated against externally obtained PAA certificate
+          2. Operations happen within the Fail-Safe Context
+          3. TH1 should be known about Commissioner based error condition/warning
+      disabled: true
+
     - label: "Start the commissioning process of TH1 on DUT"
       verification: |
           sudo ./chip-all-clusters-app --wifi  --trace_decode 1
@@ -182,7 +189,7 @@ tests:
           [1659763321.704116][2548:2548] CHIP:DMG: ICR moving to [AwaitingDe]"
       disabled: true
 
-    - label: ""
+    - label: "Verify that DUT Completes the commissioning process successfully"
       verification: |
           Verify that DUT Completes the commissioning process successfully on TH(all-clusters-app)
 
@@ -311,7 +318,7 @@ tests:
           [1659766925.558805][2548:2548] CHIP:DMG: }
       disabled: true
 
-    - label: ""
+    - label: "Verify that the Nonce_1 and Nonce_2 are different."
       verification: |
           Verify the value of NONCE in step 9 and 3 are different
 

diff --git a/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml b/src/app/tests/suites/certification/Test_TC_DGSW_2_3.yaml
@@ -39,7 +39,7 @@ tests:
     - label: "Reads a list of ThreadMetrics struct attribute from DUT."
       command: "readAttribute"
       attribute: "ThreadMetrics"
-      PICS: DGSW.S.A0001
+      PICS: DGSW.S.A0000
       response:
           constraints:
               type: list

diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_2.yaml
@@ -33,7 +33,7 @@ tests:
 
     - label: "Create new user"
       command: "SetUser"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "operationType"
@@ -82,7 +82,7 @@ tests:
 
     - label: "Create new PIN credential and lock/unlock user"
       command: "SetCredential"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "operationType"
@@ -155,31 +155,31 @@ tests:
     - label: "TH sends Lock Door Command to the DUT without PINCode"
       PICS: DRLK.S.C00.Rsp
       command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       response:
           error: 0x00
 
     - label: "TH sends Lock Door Command to the DUT with valid PINCode"
       PICS: DRLK.S.C00.Rsp
       command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "pinCode"
                 value: "123456"
 
     - label:
-          "TH writes the RequirePINforRemoteOperation attribute value as True on
-          the DUT"
+          "TH writes the RequirePINforRemoteOperation attribute value as False
+          on the DUT"
       PICS: DRLK.S.A0033
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
           value: true
 
     - label:
-          "TH writes the RequirePINforRemoteOperation attribute value as True on
-          the DUT and Verify DUT responds with UNSUPPORTED_WRITE"
+          "TH writes the RequirePINforRemoteOperation attribute value as False
+          on the DUT and Verify DUT responds with UNSUPPORTED_WRITE"
       PICS: "!DRLK.S.A0033"
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
@@ -198,7 +198,7 @@ tests:
     - label: "TH sends Lock Door Command to the DUT with valid PINCode"
       PICS: DRLK.S.C00.Rsp && DRLK.S.A0033
       command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "pinCode"
@@ -207,7 +207,7 @@ tests:
     - label: "TH sends Lock Door Command to the DUT without valid PINCode"
       PICS: DRLK.S.C00.Rsp && DRLK.S.A0033
       command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "pinCode"
@@ -219,22 +219,50 @@ tests:
           "TH sends Lock Door Command to the DUT without any argument PINCode"
       PICS: DRLK.S.C00.Rsp && DRLK.S.A0033
       command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       response:
           error: FAILURE
 
+    - label: "TH reads the WrongCodeEntryLimit attribute from the DUT"
+      PICS: DRLK.S.A0030
+      command: "readAttribute"
+      attribute: "WrongCodeEntryLimit"
+      constraints:
+          minValue: 1
+          maxValue: 255
+
+    - label: "TH sends the unlock Door command to the DUT with invalid PINCode"
+      PICS: DRLK.S.A0030
+      command: "UnlockDoor"
+      timedInteractionTimeoutMs: 1000
+      arguments:
+          values:
+              - name: "PINCode"
+                value: "1234568"
+      response:
+          error: FAILURE
+
+    - label: "TH sends the unlock Door command to the DUT with valid PINCode"
+      PICS: DRLK.S.A0030
+      command: "UnlockDoor"
+      timedInteractionTimeoutMs: 1000
+      arguments:
+          values:
+              - name: "PINCode"
+                value: "123456"
+
     - label:
-          "TH writes WrongCodeEntryLimit attribute value as 3 on the DUT and
-          Verify that the DUT sends Success response"
+          "TH writes WrongCodeEntryLimit attribute value as between 1 and 255 on
+          the DUT and Verify that the DUT sends Success response"
       PICS: DRLK.S.A0030
       command: "writeAttribute"
       attribute: "WrongCodeEntryLimit"
       arguments:
           value: 3
 
     - label:
-          "TH writes WrongCodeEntryLimit attribute value as 3 on the DUT and
-          verify DUT responds with UNSUPPORTED_WRITE"
+          "TH writes WrongCodeEntryLimit attribute value as between 1 and 255 on
+          the DUT and verify DUT responds with UNSUPPORTED_WRITE"
       PICS: "!DRLK.S.A0030"
       command: "writeAttribute"
       attribute: "WrongCodeEntryLimit"
@@ -243,18 +271,26 @@ tests:
       response:
           error: UNSUPPORTED_WRITE
 
+    - label: "TH reads the UserCodeTemporaryDisableTime attribute from the DUT"
+      PICS: DRLK.S.A0031
+      command: "readAttribute"
+      attribute: "UserCodeTemporaryDisableTime"
+      constraints:
+          minValue: 1
+          maxValue: 255
+
     - label:
-          "TH writes UserCodeTemporaryDisableTime attribute value as 15 seconds
-          on the DUT and Verify that the DUT send the Success response"
+          "TH writes UserCodeTemporaryDisableTime attribute value as between 1
+          and 255 on the DUT and Verify that the DUT sends Success response"
       PICS: DRLK.S.A0031
       command: "writeAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       arguments:
           value: 15
 
     - label:
-          "TH writes UserCodeTemporaryDisableTime attribute value as 15 seconds
-          on the DUT and Verify DUT responds with UNSUPPORTED_WRITE"
+          "TH writes UserCodeTemporaryDisableTime attribute value as between 1
+          and 255 on the DUT and verify DUT responds with UNSUPPORTED_WRITE"
       PICS: "!DRLK.S.A0031"
       command: "writeAttribute"
       attribute: "UserCodeTemporaryDisableTime"
@@ -263,93 +299,9 @@ tests:
       response:
           error: UNSUPPORTED_WRITE
 
-    - label: "TH sends Lock Door Command to the DUT with invalid PINCode"
-      PICS: DRLK.S.C00.Rsp
-      command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "pinCode"
-                value: "123458"
-      response:
-          error: FAILURE
-
-    - label: "TH sends Lock Door Command to the DUT with invalid PINCode"
-      PICS: DRLK.S.C00.Rsp
-      command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "pinCode"
-                value: "123458"
-      response:
-          error: FAILURE
-
-    - label: "TH sends Lock Door Command to the DUT with invalid PINCode"
-      PICS: DRLK.S.C00.Rsp
-      command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "pinCode"
-                value: "123458"
-      response:
-          error: FAILURE
-
-    - label: "TH sends Lock Door Command to the DUT with invalid PINCode"
-      PICS: DRLK.S.C00.Rsp
-      command: "LockDoor"
-      timedInteractionTimeoutMs: 10000
-      arguments:
-          values:
-              - name: "pinCode"
-                value: "123458"
-      response:
-          error: FAILURE
-
-    - label:
-          "TH reads UserCodeTemporaryDisableTime attribute from DUT and After
-          sending 3 failure responses verify that UserCodeTemporaryDisableTime
-          attribute is triggered"
-      verification: |
-          ./chip-tool doorlock read user-code-temporary-disable-time 1 1
-
-          On TH, verify the  UserCodeTemporaryDisableTime value as 15
-
-          [1657867358.396037][2551:2556] CHIP:DMG:
-          [1657867358.396067][2551:2556] CHIP:DMG:        SuppressResponse = true,
-          [1657867358.396099][2551:2556] CHIP:DMG:        InteractionModelRevision = 1
-          [1657867358.396129][2551:2556] CHIP:DMG: }
-          [1657867358.396286][2551:2556] CHIP:TOO: Endpoint: 1 Cluster: 0x0000_0101 Attribute 0x0000_0031 DataVersion: 2082875948
-          [1657867358.396378][2551:2556] CHIP:TOO:   UserCodeTemporaryDisableTime: 15
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && DRLK.S.A0031
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
-
-    - label:
-          "TH sends Lock Command to the DUT with valid PINCode before
-          UserCodeTemporaryDisableTime attribute time expires"
-      verification: |
-          Verify that DUT sends failure response to the TH
-      cluster: "LogCommands"
-      command: "UserPrompt"
-      PICS: PICS_USER_PROMPT && DRLK.S.C00.Rsp
-      arguments:
-          values:
-              - name: "message"
-                value: "Please enter 'y' for success"
-              - name: "expectedValue"
-                value: "y"
-
     - label: "Clean the created user"
       command: "ClearUser"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "userIndex"
@@ -358,7 +310,7 @@ tests:
     - label: "Cleanup the created credential"
       PICS: DRLK.S.C26.Rsp
       command: "ClearCredential"
-      timedInteractionTimeoutMs: 10000
+      timedInteractionTimeoutMs: 1000
       arguments:
           values:
               - name: "credential"