Fix TTS-1861 to update the config.xml file for 2 cases.
authorgex.zhang <gex.zhang@intel.com>
Fri, 9 Aug 2013 08:25:51 +0000 (01:25 -0700)
committergex.zhang <gex.zhang@intel.com>
Fri, 9 Aug 2013 08:25:51 +0000 (01:25 -0700)
Change-Id: I216f55001775315a70db86b25dd255a039a3c322
Signed-off-by: gex.zhang <gex.zhang@intel.com>
tct-sp02-wrt-tests/default-policy-by-directives-csp/config.xml
tct-sp02-wrt-tests/default-policy-by-directives-csp/index.html
tct-sp02-wrt-tests/default-policy-by-directives-report-only/config.xml
tct-sp02-wrt-tests/default-policy-by-directives-report-only/index.html

index 9a3c72a6196315530df022ae8362f9969d174921..39943cce0fec9dffc7b3c2d7dd2d086dd42b2dbd 100644 (file)
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://tizen.org/default-policy-by-directives-csp" version="1.0.0" viewmodes="maximized">
-  <tizen:content-security-policy></tizen:content-security-policy>
+  <tizen:content-security-policy>style-src 'self' 'unsafe-inline';script-src 'self' 'unsafe-inline'</tizen:content-security-policy>
+  <tizen:allow-navigation>*</tizen:allow-navigation>
   <tizen:application id="wrt8dpb004.DefaultPolicyByDirectivesCsp" package="wrt8dpb004" required_version="2.2"/>
   <content src="index.html"/>
   <icon src="custom.png"/>
   <name>default-policy-by-directives-csp</name>
   <tizen:setting install-location="auto"/>
-</widget>
\ No newline at end of file
+</widget>
index 3cd4262cdf7088b1e86d09a70732ac6d4683cb5c..3ecdea49a4a8b3be1af4abc8a263a6322415a7b0 100644 (file)
@@ -89,6 +89,8 @@ Authors:
 
         if(script_allow && script_not_allow && style_not_allow && style_allow && style_green_allow && connect) {
             document.getElementById("test_result").innerHTML = "PASS";
+        }else{
+            document.getElementById("test_result").innerHTML = "FAIL"; 
         }
     </script>
     <p style="color:blue">Four:The screen shows two green squares in two frames,respectively.</p>
@@ -97,10 +99,8 @@ Authors:
     <p style="color:blue">Five:The screen shows two green squares.</p>
     <div><img src="support/green-100x100.png" /></div>
     <div><img src="http://127.0.0.1:8081/opt/tct-sp02-wrt-tests/support/green-100x100.png"/></div>
-    <p style="color:blue">Six: The screen shows two videos and no red square.</p>
+    <p style="color:blue">Six: The screen shows two videos.</p>
     <div><video src="support/red-green.theora.ogv" /></div>
     <div><video src="http://127.0.0.1:8081/opt/tct-sp02-wrt-tests/support/red-green.theora.ogv"/></div>
-    <div><object data="support/red-100x100.png"></object></div>
-    <div><object data="http://127.0.0.1:8081/opt/tct-sp02-wrt-tests/support/red-100x100.png"></object></div>
   </body>
-</html>
\ No newline at end of file
+</html>
index a003a9250da156d4e74e68f5e8e525f747dc6fe4..1ac0f3dad5480c725d696b978905a0c11e05f065 100644 (file)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://tizen.org/default-policy-by-directives-report-only" version="1.0.0" viewmodes="maximized">
-  <tizen:content-security-policy-report-only></tizen:content-security-policy-report-only>
+  <tizen:content-security-policy-report-only>style-src 'self' 'unsafe-inline';script-src 'self' 'unsafe-inline'</tizen:content-security-policy-report-only>
+  <tizen:allow-navigation>*</tizen:allow-navigation>
+  <tizen:content-security-policy>style-src 'self' 'unsafe-inline';script-src 'self' 'unsafe-inline'</tizen:content-security-policy>
   <tizen:application id="wrt8dpb005.DefaultPolicyByDirectivesReportOnly" package="wrt8dpb005" required_version="2.2"/>
   <content src="index.html"/>
   <icon src="custom.png"/>
   <name>default-policy-by-directives-report-only</name>
   <tizen:setting install-location="auto"/>
-</widget>
\ No newline at end of file
+</widget>
index b7cae2fb6bd3698d57d6b5152cdcd8a5c448cdb2..3fa0b684673a5feb6414c44a99f4f6f2beb62aa8 100644 (file)
@@ -89,6 +89,8 @@ Authors:
 
         if(script_allow && script_not_allow && style_not_allow && style_allow && style_green_allow && connect) {
             document.getElementById("test_result").innerHTML = "PASS";
+        }else{
+            document.getElementById("test_result").innerHTML = "FAIL"; 
         }
     </script>
     <p style="color:blue">Four:The screen shows two green squares in two frames,respectively.</p>
@@ -97,10 +99,8 @@ Authors:
     <p style="color:blue">Five:The screen shows two green squares.</p>
     <div><img src="support/green-100x100.png" /></div>
     <div><img src="http://127.0.0.1:8081/opt/tct-sp02-wrt-tests/support/green-100x100.png"/></div>
-    <p style="color:blue">Six: The screen shows two videos and no red square.</p>
+    <p style="color:blue">Six: The screen shows two videos.</p>
     <div><video src="support/red-green.theora.ogv" /></div>
     <div><video src="http://127.0.0.1:8081/opt/tct-sp02-wrt-tests/support/red-green.theora.ogv"/></div>
-    <div><object data="support/red-100x100.png"></object></div>
-    <div><object data="http://127.0.0.1:8081/opt/tct-sp02-wrt-tests/support/red-100x100.png"></object></div>
   </body>
-</html>
\ No newline at end of file
+</html>