Modified tests after rebase

project-chip · Jul 1, 2022 · 0cc24e7 · 0cc24e7
1 parent a7b8db6
commit 0cc24e7
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 25 deletions.
diff --git a/src/app/tests/suites/certification/PICS.yaml b/src/app/tests/suites/certification/PICS.yaml
@@ -859,6 +859,9 @@ PICS:
     - label: "Skip sample app"
       id: PICS_SKIP_SAMPLE_APP
 
+    - label: "Run steps in SDK and CI only"
+      id: PICS_SDK_CI_ONLY
+
     - label: "Level Control for Lighting"
       id: OO_LT
 

diff --git a/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml b/src/app/tests/suites/certification/Test_TC_BINFO_2_2.yaml
@@ -43,12 +43,17 @@ tests:
           constraints:
               type: bool
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -71,12 +76,17 @@ tests:
           value: SoftwareVersionValue
 
     ##Event 11343 implementation not done
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -104,12 +114,17 @@ tests:
               - name: "nodeId"
                 value: nodeId
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"

diff --git a/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml b/src/app/tests/suites/certification/Test_TC_DGGEN_2_1.yaml
@@ -43,25 +43,35 @@ tests:
           constraints:
               type: uint16
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
                 value: "Please reboot the DUT and enter 'y' after DUT starts"
               - name: "expectedValue"
                 value: "y"
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -93,12 +103,17 @@ tests:
           constraints:
               type: uint32
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"

diff --git a/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml b/src/app/tests/suites/certification/Test_TC_OO_2_4.yaml
@@ -37,12 +37,18 @@ tests:
       arguments:
           value: 0
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in chip-tool
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -70,12 +76,18 @@ tests:
       arguments:
           value: 1
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in chip-tool
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -103,12 +115,18 @@ tests:
       arguments:
           value: 2
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in chip-tool
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
@@ -130,18 +148,22 @@ tests:
       response:
           value: 0
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in chip-tool
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
-                value:
-                    "Please reboot the DUT and enter 'y' for success after DUT
-                    starts"
+                value: "Please reboot the DUT and enter 'y' after DUT starts"
               - name: "expectedValue"
                 value: "y"
 
@@ -165,18 +187,22 @@ tests:
       arguments:
           value: null
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in chip-tool
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
-                value:
-                    "Please reboot the DUT and enter 'y' for success after DUT
-                    starts"
+                value: "Please reboot the DUT and enter 'y' after DUT starts"
               - name: "expectedValue"
                 value: "y"
 
@@ -197,18 +223,22 @@ tests:
     - label: "TH sends Off command to DUT"
       command: "Off"
 
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in YAML
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"
-                value:
-                    "Please reboot the DUT and enter 'y' for success after DUT
-                    starts"
+                value: "Please reboot the DUT and enter 'y' after DUT starts"
               - name: "expectedValue"
                 value: "y"
 

diff --git a/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml b/src/app/tests/suites/certification/Test_TC_WNCV_4_5.yaml
@@ -133,12 +133,18 @@ tests:
               notValue: 0
 
     ### DUT TurnOff
+    - label: "Reboot target device"
+      PICS: PICS_SDK_CI_ONLY
+      cluster: "SystemCommands"
+      endpoint: 0
+      command: "Reboot"
+
     - label: "Reboot target device(DUT)"
       verification: |
           Not implemented in chip-tool
       cluster: "LogCommands"
       command: "UserPrompt"
-      PICS: PICS_USER_PROMPT
+      PICS: PICS_SKIP_SAMPLE_APP
       arguments:
           values:
               - name: "message"

diff --git a/src/app/tests/suites/certification/ci-pics-values b/src/app/tests/suites/certification/ci-pics-values
@@ -63,6 +63,7 @@ PH_KEY=1
 PI_KEY=1
 PICS_USER_PROMPT=0
 PICS_SKIP_SAMPLE_APP=0
+PICS_SDK_CI_ONLY=1
 OO_LT=1
 A_UNOCCUPIEDCOOLINGSETPOINT=0
 A_UNOCCUPIEDHEATINGSETPOINT=0

diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
@@ -163,7 +163,6 @@ function getManualTests() {
   ];
 
   const GeneralDiagnostics = [
-    'Test_TC_DGGEN_2_1',
     'Test_TC_DGGEN_2_2',
     'Test_TC_DGGEN_2_3',
     'Test_TC_DGGEN_3_1',
@@ -329,7 +328,6 @@ function getManualTests() {
   ];
 
   const WindowCovering = [
-    'Test_TC_WNCV_4_5',
     'Test_TC_WNCV_6_1',
     'Test_TC_WNCV_7_1',
   ];
@@ -398,7 +396,6 @@ function getManualTests() {
 
   const OnOff = [
     'Test_TC_OO_2_3',
-    'Test_TC_OO_2_4',
     'Test_TC_OO_3_1',
     'Test_TC_OO_3_2',
   ];
@@ -597,6 +594,7 @@ function getTests() {
 
   const GeneralDiagnostics = [
     'Test_TC_DGGEN_1_1',
+    'Test_TC_DGGEN_2_1',
   ];
 
   const Identify = [
@@ -690,6 +688,7 @@ function getTests() {
     'Test_TC_OO_1_1',
     'Test_TC_OO_2_1',
     'Test_TC_OO_2_2',
+    'Test_TC_OO_2_4',
   ];
 
   const PowerSource = [
@@ -772,6 +771,7 @@ function getTests() {
     'Test_TC_WNCV_4_2',
     'Test_TC_WNCV_4_3',
     'Test_TC_WNCV_4_4',
+    'Test_TC_WNCV_4_5',
   ];
 
   const TV = [