Change overall dependency of TC-DRLK-2.12 on UBOLT feature flag (#28172)

* Change overall dependency of TC-DRLK-2.12 on UBOLT feature flag * zap regen
project-chip · Jul 26, 2023 · 6eab9e4 · 6eab9e4
1 parent 58d4109
commit 6eab9e4
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 56 deletions.
diff --git a/src/app/tests/suites/certification/Test_TC_DRLK_2_12.yaml b/src/app/tests/suites/certification/Test_TC_DRLK_2_12.yaml
@@ -15,7 +15,7 @@
 name: 121.3.2. [TC-DRLK-2.12] Verification for Ubolt Door command [DUT-Server]
 
 PICS:
-    - DRLK.S
+    - DRLK.S.F0c
 
 config:
     nodeId: 0x12344321
@@ -128,7 +128,7 @@ tests:
     - label:
           "Step 1: TH writes the RequirePINforRemoteOperation attribute value as
           False on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -137,7 +137,7 @@ tests:
     - label:
           "Step 1: TH writes the RequirePINforRemoteOperation attribute value as
           False on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -148,19 +148,19 @@ tests:
     - label:
           "Step 2: TH reads the RequirePINforRemoteOperation attribute from the
           DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
       command: "readAttribute"
       attribute: "RequirePINforRemoteOperation"
       response:
           value: false
 
     - label: "Step 3: TH sends Ubolt Door Command to the DUT without PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
 
     - label: "Step 4: TH sends Ubolt Door Command to the DUT with PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -171,7 +171,7 @@ tests:
     - label:
           "Step 5: TH writes the RequirePINforRemoteOperation attribute value as
           true on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -180,7 +180,7 @@ tests:
     - label:
           "Step 5: TH writes the RequirePINforRemoteOperation attribute value as
           true on the DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
+      PICS: DRLK.S.F07 && DRLK.S.F00 && !DRLK.S.A0033.Write
       command: "writeAttribute"
       attribute: "RequirePINforRemoteOperation"
       arguments:
@@ -191,14 +191,14 @@ tests:
     - label:
           "Step 6: TH reads the RequirePINforRemoteOperation attribute from the
           DUT"
-      PICS: DRLK.S.F0c && DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
+      PICS: DRLK.S.F07 && DRLK.S.F00 && DRLK.S.A0033
       command: "readAttribute"
       attribute: "RequirePINforRemoteOperation"
       response:
           value: true
 
     - label: "Step 7: TH sends Ubolt Door Command to the DUT with valid PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -208,7 +208,7 @@ tests:
 
     - label:
           "Step 8: TH sends Unbolt Door Command to the DUT with Invalid PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       arguments:
@@ -219,7 +219,7 @@ tests:
           error: FAILURE
 
     - label: "Step 9: TH sends Unbolt Door Command to the DUT without PINCode"
-      PICS: DRLK.S.C27.Rsp && DRLK.S.F0c
+      PICS: DRLK.S.C27.Rsp
       command: "UnboltDoor"
       timedInteractionTimeoutMs: 1000
       response:
@@ -228,7 +228,7 @@ tests:
     - label:
           "Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the
           DUT"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0030.Write
       command: "writeAttribute"
       attribute: "WrongCodeEntryLimit"
       arguments:
@@ -237,7 +237,7 @@ tests:
     - label:
           "Step 10: TH writes WrongCodeEntryLimit attribute value as 3 on the
           DUT"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0030.Write
       command: "writeAttribute"
       attribute: "WrongCodeEntryLimit"
       arguments:
@@ -248,7 +248,7 @@ tests:
     - label:
           "Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15
           Seconds on the DUT and Verify that the DUT sends Success response"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031.Write
       command: "writeAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       arguments:
@@ -257,7 +257,7 @@ tests:
     - label:
           "Step 11: TH writes UserCodeTemporaryDisableTime attribute value as 15
           Seconds on the DUT and Verify that the DUT sends Success response"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && !DRLK.S.A0031.Write
       command: "writeAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       arguments:
@@ -319,7 +319,7 @@ tests:
 
     - label:
           "Step 13: TH reads UserCodedTemporaryDisableTime attribute from DUT"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
       command: "readAttribute"
       attribute: "UserCodeTemporaryDisableTime"
       response:
@@ -341,7 +341,7 @@ tests:
     - label: "Wait for UserCodeTemporaryDisableTime expires"
       cluster: "DelayCommands"
       command: "WaitForMs"
-      PICS: DRLK.S.F0c && ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
+      PICS: ( DRLK.S.F00 || DRLK.S.F01 ) && DRLK.S.A0031
       arguments:
           values:
               - name: "ms"

diff --git a/zzz_generated/chip-tool/zap-generated/test/Commands.h b/zzz_generated/chip-tool/zap-generated/test/Commands.h