[common][csp][TFDF-6011, improve test description]

Change-Id: I56f89b5b741a36bfb9b3f5352cbc0d7ba002b950

diff --git a/common/tct-csp-w3c-tests/tests.full.xml b/common/tct-csp-w3c-tests/tests.full.xml
index 1c0bdf2afdc172748c92c3c38a18954b09c1f4b9..90e5bec5707017cc6c912b2826ecb6ad704b86b1 100755 (executable)
--- a/common/tct-csp-w3c-tests/tests.full.xml
+++ b/common/tct-csp-w3c-tests/tests.full.xml
@@ -2758,8 +2758,15 @@
       </testcase>
     </set>
     <set name="frame-ancestors" type="js">
-      <testcase purpose="Check user agent is able to use the sources that can embed the current page with embed tag" type="compliance" status="approved" component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="auto" priority="P2" id="csp_frame-ancestors_embed_allowed">
+      <testcase purpose="Check user agent is able to use the sources that can embed the current page with embed tag" type="compliance" status="approved" component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" priority="P2" id="csp_frame-ancestors_embed_allowed">
         <description>
+          <pre_condition>Connect to internet</pre_condition>
+          <steps>
+            <step order="1">
+              <step_desc>Click Run button, wait a few minutes</step_desc>
+              <expected>Test passes if there is a video can be displayed.</expected>
+            </step>
+          </steps>
           <test_script_entry test_script_expected_result="0">http://127.0.0.1:8080/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_embed_allowed.php</test_script_entry>
         </description>
         <specs>
@@ -2865,8 +2872,8 @@
           <post_condition/>
           <steps>
             <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_iframe_blocked.</step_desc>
-              <expected>Test passes if there is no red.</expected>
+              <step_desc>Click Run button</step_desc>
+              <expected>Nothing should happen, since iframe is blocked</expected>
             </step>
           </steps>
           <test_script_entry test_script_expected_result="0">http://127.0.0.1:8080/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_iframe_blocked.php</test_script_entry>

diff --git a/common/tct-csp-w3c-tests/tests.xml b/common/tct-csp-w3c-tests/tests.xml
index 0c6554219468454d891e7d8579857eedcb0089e0..95e0155ec3092e5cdab087ee58160bc3a4737702 100755 (executable)
--- a/common/tct-csp-w3c-tests/tests.xml
+++ b/common/tct-csp-w3c-tests/tests.xml
@@ -1641,10 +1641,10 @@
     <set name="frame-ancestors" type="js">
       <testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_embed_allowed" priority="P2">
         <description>
-          <pre_condition>Connect to PHP server</pre_condition>
+          <pre_condition>Connect to internet</pre_condition>
           <steps>
             <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_embed_allowed.</step_desc>
+              <step_desc>Click Run button, wait a few minutes</step_desc>
               <expected>Test passes if there is a video can be displayed.</expected>
             </step>
           </steps>
@@ -1656,73 +1656,13 @@
           <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_embed_blocked.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>
         </description>
       </testcase>
-      <!--<testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_applet_blocked" priority="P2">
-        <description>
-          <pre_condition>Connect to PHP server</pre_condition>
-          <steps>
-            <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_applet_blocked.</step_desc>
-              <expected>Test passes if there is No words displayed.</expected>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_applet_blocked.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>
-        </description>
-      </testcase>-->
-      <!--<testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_applet_allowed" priority="P2">
-        <description>
-          <pre_condition>Connect to PHP server</pre_condition>
-          <steps>
-            <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_applet_allowed.</step_desc>
-              <expected>Test passes if "hello world" words displayed.</expected>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_applet_allowed.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>
-        </description>
-      </testcase>-->
-      <!--<testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_frame_allowed" priority="P2">
-        <description>
-          <pre_condition>Connect to PHP server</pre_condition>
-          <steps>
-            <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_frame_allowed.</step_desc>
-              <expected>Test passes if there is a filled green square.</expected>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_frame_allowed.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>
-        </description>
-      </testcase>-->
-      <!--<testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_frame_blocked" priority="P2">
-        <description>
-          <pre_condition>Connect to PHP server</pre_condition>
-          <steps>
-            <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_frame_blocked.</step_desc>
-              <expected>Test passes if there is no red.</expected>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_frame_blocked.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>
-        </description>
-      </testcase>-->
-      <!--<testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_iframe_allowed" priority="P2">
-        <description>
-          <pre_condition>Connect to PHP server</pre_condition>
-          <steps>
-            <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_iframe_allowed.</step_desc>
-              <expected>Test passes if there is a filled green square.</expected>
-            </step>
-          </steps>
-          <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_iframe_allowed.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>
-        </description>
-      </testcase>-->
       <testcase component="W3C_HTML5 APIs/Security/Content Security Policy 2.0 (Partial)" execution_type="manual" id="csp_frame-ancestors_iframe_blocked" priority="P2">
         <description>
           <pre_condition>Connect to PHP server</pre_condition>
           <steps>
             <step order="1">
-              <step_desc>Run the manual testcase: csp_frame-ancestors_iframe_blocked.</step_desc>
-              <expected>Test passes if there is no red.</expected>
+              <step_desc>Click Run button</step_desc>
+              <expected>Nothing should happen, since iframe is blocked</expected>
             </step>
           </steps>
           <test_script_entry test_script_expected_result="0">/opt/tct-csp-w3c-tests/csp/csp_frame-ancestors_iframe_blocked.php?total_num=1&amp;amp;locator_key=id&amp;amp;value=1</test_script_entry>