projects / test / tct / web / wrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2529b78)
Fix bug TTS-1742 for updateing 4 frame cases.
authorgex.zhang <gex.zhang@intel.com>
Mon, 15 Jul 2013 03:13:16 +0000 (20:13 -0700)
committergex.zhang <gex.zhang@intel.com>
Mon, 15 Jul 2013 03:13:16 +0000 (20:13 -0700)
Change-Id: I963f079717e79f28d8b1a7a79dcc0dbfb37f1f08
Signed-off-by: gex.zhang <gex.zhang@intel.com>
tct-ext02-wrt-tests/frame-src_asterisk/config.xml patch | blob | history
tct-ext02-wrt-tests/frame-src_asterisk/index.html patch | blob | history
tct-ext02-wrt-tests/frame-src_cross-origin_multi/config.xml patch | blob | history
tct-ext02-wrt-tests/frame-src_cross-origin_multi/index.html patch | blob | history
tct-ext02-wrt-tests/frame-src_none/config.xml patch | blob | history
tct-ext02-wrt-tests/frame-src_none/index.html patch | blob | history
tct-ext02-wrt-tests/frame-src_self/config.xml patch | blob | history
tct-ext02-wrt-tests/frame-src_self/index.html patch | blob | history
tct-ext02-wrt-tests/tests.xml patch | blob | history

diff --git a/tct-ext02-wrt-tests/frame-src_asterisk/config.xml b/tct-ext02-wrt-tests/frame-src_asterisk/config.xml
index 23f994a..b62de9c 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_asterisk/config.xml
+++ b/tct-ext02-wrt-tests/frame-src_asterisk/config.xml
@@ -1,6 +1,6 @@
 <?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/frame-src_asterisk" version="1.0.0" viewmodes="maximized">
-    <tizen:Content-Security-Policy>frame-src *</tizen:Content-Security-Policy>
+    <tizen:content-security-policy>frame-src *</tizen:content-security-policy>
     <tizen:application id="wrt2fra001.framesrcAsterisk" package="wrt2fra001" required_version="2.2"/>
     <content src="index.html"/>
     <icon src="custom.png"/>
diff --git a/tct-ext02-wrt-tests/frame-src_asterisk/index.html b/tct-ext02-wrt-tests/frame-src_asterisk/index.html
index a90a578..f42590d 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_asterisk/index.html
+++ b/tct-ext02-wrt-tests/frame-src_asterisk/index.html
@@ -40,7 +40,7 @@ Authors:
     <meta charset="utf-8"/>
   </head>
   <body>
-    <p>Test passes if there are two filled green squares.</p>
+    <p>Test passes if two green squares are displayed.</p>
     <p>1</P>
     <iframe src="http://127.0.0.1:8081/opt/tct-ext02-wrt-tests/support/green-100x100.png"></iframe>
     <p>2</P>
diff --git a/tct-ext02-wrt-tests/frame-src_cross-origin_multi/config.xml b/tct-ext02-wrt-tests/frame-src_cross-origin_multi/config.xml
index 33d76c2..374e143 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_cross-origin_multi/config.xml
+++ b/tct-ext02-wrt-tests/frame-src_cross-origin_multi/config.xml
@@ -1,6 +1,6 @@
 <?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/frame-src_cross-origin_multi" version="1.0.0" viewmodes="maximized">
-    <tizen:Content-Security-Policy>frame-src http://127.0.0.1:8081 http://127.0.0.1:8083 https://tizen.org</tizen:Content-Security-Policy>
+    <tizen:content-security-policy>frame-src http://127.0.0.1:8081 http://127.0.0.1:8083 https://tizen.org</tizen:content-security-policy>
     <tizen:application id="wrt2fra004.framesrcCrossOriginMulti" package="wrt2fra004" required_version="2.2"/>
     <content src="index.html"/>
     <icon src="custom.png"/>
diff --git a/tct-ext02-wrt-tests/frame-src_cross-origin_multi/index.html b/tct-ext02-wrt-tests/frame-src_cross-origin_multi/index.html
index 1dbf90e..bbb4ca3 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_cross-origin_multi/index.html
+++ b/tct-ext02-wrt-tests/frame-src_cross-origin_multi/index.html
@@ -40,7 +40,7 @@ Authors:
     <meta charset="utf-8"/>
   </head>
   <body>
-    <p>Test passes if there is only one filled green square and no red square.</p>
+    <p>Test passes if only the first green square is displayed.</p>
     <p>1</p>
     <iframe src="http://127.0.0.1:8081/opt/tct-ext02-wrt-tests/support/green-100x100.png"></iframe>
     <p>2</p>
diff --git a/tct-ext02-wrt-tests/frame-src_none/config.xml b/tct-ext02-wrt-tests/frame-src_none/config.xml
index 50fadc5..7bef2f7 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_none/config.xml
+++ b/tct-ext02-wrt-tests/frame-src_none/config.xml
@@ -1,6 +1,6 @@
 <?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/frame-src_none" version="1.0.0" viewmodes="maximized">
-    <tizen:Content-Security-Policy>frame-src 'none'</tizen:Content-Security-Policy>
+    <tizen:content-security-policy>frame-src 'none'</tizen:content-security-policy>
     <tizen:application id="wrt2fra002.framesrcNone" package="wrt2fra002" required_version="2.2"/>
     <content src="index.html"/>
     <icon src="custom.png"/>
diff --git a/tct-ext02-wrt-tests/frame-src_none/index.html b/tct-ext02-wrt-tests/frame-src_none/index.html
index d75c3f1..9bae6bb 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_none/index.html
+++ b/tct-ext02-wrt-tests/frame-src_none/index.html
@@ -40,7 +40,7 @@ Authors:
     <meta charset="utf-8"/>
   </head>
   <body>
-    <p>Test passes if there are no red squares.</p>
+    <p>Test passes if there is no square is displayed.</p>
     <p>1</p>
     <iframe src="http://127.0.0.1:8081/opt/tct-ext02-wrt-tests/support/red-100x100.png"></iframe>
     <p>2</p>
diff --git a/tct-ext02-wrt-tests/frame-src_self/config.xml b/tct-ext02-wrt-tests/frame-src_self/config.xml
index 44d5131..d68545f 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_self/config.xml
+++ b/tct-ext02-wrt-tests/frame-src_self/config.xml
@@ -1,6 +1,6 @@
 <?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/frame-src_self" version="1.0.0" viewmodes="maximized">
-    <tizen:Content-Security-Policy>frame-src 'self'</tizen:Content-Security-Policy>
+    <tizen:content-security-policy>frame-src 'self'</tizen:content-security-policy>
     <tizen:application id="wrt2fra003.framesrcSelf" package="wrt2fra003" required_version="2.2"/>
     <content src="index.html"/>
     <icon src="custom.png"/>
diff --git a/tct-ext02-wrt-tests/frame-src_self/index.html b/tct-ext02-wrt-tests/frame-src_self/index.html
index a9f2959..1d4976c 100644 (file)
--- a/tct-ext02-wrt-tests/frame-src_self/index.html
+++ b/tct-ext02-wrt-tests/frame-src_self/index.html
@@ -40,7 +40,7 @@ Authors:
     <meta charset="utf-8"/>
   </head>
   <body>
-    <p>Test passes if there is only one filled green square and no red square.</p>
+    <p>Test passes if only the first green square is displayed.</p>
     <p>1</p>
     <iframe src="support/green-100x100.png"></iframe>
     <p>2</p>
diff --git a/tct-ext02-wrt-tests/tests.xml b/tct-ext02-wrt-tests/tests.xml
index 52b1c6d..400babc 100644 (file)
--- a/tct-ext02-wrt-tests/tests.xml
+++ b/tct-ext02-wrt-tests/tests.xml
@@ -1234,7 +1234,7 @@
                  </step>
                  <step order="3">
                    <step_desc>Look at the launching page.</step_desc>
-                   <expected>Test passes if there are two filled green squares.</expected>
+                   <expected>Test passes if two green squares are displayed.</expected>
                  </step>
               </steps>
            <test_script_entry test_script_expected_result="0"></test_script_entry>
@@ -1262,7 +1262,7 @@
                  </step>
                  <step order="3">
                    <step_desc>Look at the launching page.</step_desc>
-                   <expected>Test passes if there are no red squares.</expected>
+                   <expected>Test passes if there is no square is displayed.</expected>
                  </step>
               </steps>
            <test_script_entry test_script_expected_result="0"></test_script_entry>
@@ -1290,7 +1290,7 @@
                  </step>
                  <step order="3">
                    <step_desc>Look at the launching page.</step_desc>
-                   <expected>Test passes if there is only one filled green square and no red square.</expected>
+                   <expected>Test passes if only the first green square is displayed.</expected>
                  </step>
               </steps>
            <test_script_entry test_script_expected_result="0"></test_script_entry>
@@ -1318,7 +1318,7 @@
                  </step>
                  <step order="3">
                    <step_desc>Look at the launching page.</step_desc>
-                   <expected>Test passes if there is only one filled green square and no red square.</expected>
+                   <expected>Test passes if only the first green square is displayed.</expected>
                  </step>
               </steps>
            <test_script_entry test_script_expected_result="0"></test_script_entry>
Domain: Testing;