Changeset 49321 in webkit

Timestamp:

Oct 8, 2009 2:27:58 PM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-08 Aaron Boodman <​aa@chromium.org>

Reviewed by Eric Seidel.

r49278 added support for reusing isolated worlds, and the
corresponding change to Chromium's LayoutTestController changed
to expect two arguments. The first argument is the world that
the script should run in.

This change fixes the tests by updating them all to pass 0
for the world id. The specific world id used for these tests
doesn't really matter because they don't test world interaction.

​https://bugs.webkit.org/show_bug.cgi?id=30231

• http/tests/security/isolatedWorld/all-window-properties.html:
• http/tests/security/isolatedWorld/all-window-prototypes.html:
• http/tests/security/isolatedWorld/body-properties.html:
• http/tests/security/isolatedWorld/body-prototype.html:
• http/tests/security/isolatedWorld/click-event.html:
• http/tests/security/isolatedWorld/document-open.html:
• http/tests/security/isolatedWorld/document-properties.html:
• http/tests/security/isolatedWorld/document-prototype.html:
• http/tests/security/isolatedWorld/global-variables.html:
• http/tests/security/isolatedWorld/image-properties.html:
• http/tests/security/isolatedWorld/image-prototype.html:
• http/tests/security/isolatedWorld/location-properties.html:
• http/tests/security/isolatedWorld/location-prototype.html:
• http/tests/security/isolatedWorld/number-prototype.html:
• http/tests/security/isolatedWorld/object-prototype.html:
• http/tests/security/isolatedWorld/storage-properties.html:
• http/tests/security/isolatedWorld/storage-prototype.html:
• http/tests/security/isolatedWorld/string-prototype.html:
• http/tests/security/isolatedWorld/window-properties.html:
• http/tests/security/isolatedWorld/window-setTimeout-function.html:
• http/tests/security/isolatedWorld/window-setTimeout-string.html:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• http/tests/security/isolatedWorld/all-window-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/all-window-prototypes.html (modified) (1 diff)
• http/tests/security/isolatedWorld/body-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/body-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/click-event.html (modified) (1 diff)
• http/tests/security/isolatedWorld/document-open.html (modified) (1 diff)
• http/tests/security/isolatedWorld/document-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/document-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/global-variables.html (modified) (1 diff)
• http/tests/security/isolatedWorld/image-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/image-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/location-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/location-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/number-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/object-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/storage-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/storage-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/string-prototype.html (modified) (1 diff)
• http/tests/security/isolatedWorld/window-properties.html (modified) (1 diff)
• http/tests/security/isolatedWorld/window-setTimeout-function.html (modified) (1 diff)
• http/tests/security/isolatedWorld/window-setTimeout-string.html (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-08  Aaron Boodman  <aa@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        r49278 added support for reusing isolated worlds, and the
+        corresponding change to Chromium's LayoutTestController changed
+        to expect two arguments. The first argument is the world that
+        the script should run in.
+
+        This change fixes the tests by updating them all to pass 0
+        for the world id. The specific world id used for these tests
+        doesn't really matter because they don't test world interaction.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30231
+
+        * http/tests/security/isolatedWorld/all-window-properties.html:
+        * http/tests/security/isolatedWorld/all-window-prototypes.html:
+        * http/tests/security/isolatedWorld/body-properties.html:
+        * http/tests/security/isolatedWorld/body-prototype.html:
+        * http/tests/security/isolatedWorld/click-event.html:
+        * http/tests/security/isolatedWorld/document-open.html:
+        * http/tests/security/isolatedWorld/document-properties.html:
+        * http/tests/security/isolatedWorld/document-prototype.html:
+        * http/tests/security/isolatedWorld/global-variables.html:
+        * http/tests/security/isolatedWorld/image-properties.html:
+        * http/tests/security/isolatedWorld/image-prototype.html:
+        * http/tests/security/isolatedWorld/location-properties.html:
+        * http/tests/security/isolatedWorld/location-prototype.html:
+        * http/tests/security/isolatedWorld/number-prototype.html:
+        * http/tests/security/isolatedWorld/object-prototype.html:
+        * http/tests/security/isolatedWorld/storage-properties.html:
+        * http/tests/security/isolatedWorld/storage-prototype.html:
+        * http/tests/security/isolatedWorld/string-prototype.html:
+        * http/tests/security/isolatedWorld/window-properties.html:
+        * http/tests/security/isolatedWorld/window-setTimeout-function.html:
+        * http/tests/security/isolatedWorld/window-setTimeout-string.html:
+
 2009-10-08  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/LayoutTests/http/tests/security/isolatedWorld/all-window-properties.html

@@ -14 +14 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "(function() {\n" +
     "  for (p in window) {\n" +

trunk/LayoutTests/http/tests/security/isolatedWorld/all-window-prototypes.html

@@ -13 +13 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "(function() {\n" +
     "  for (p in window) {\n" +

trunk/LayoutTests/http/tests/security/isolatedWorld/body-properties.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = document.body.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/body-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = document.body.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/click-event.html

@@ -16 +16 @@
 if (window.layoutTestController) {
   layoutTestController.dumpAsText();
-  layoutTestController.evaluateScriptInIsolatedWorld(document.getElementById('isolatedScript').innerHTML);
+  layoutTestController.evaluateScriptInIsolatedWorld(0, document.getElementById('isolatedScript').innerHTML);
 }
 </script>

trunk/LayoutTests/http/tests/security/isolatedWorld/document-open.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "window.open = function () { alert('PASS'); };\n" +
     "document.open(1, 2, 3);");

trunk/LayoutTests/http/tests/security/isolatedWorld/document-properties.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = document.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/document-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = document.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/global-variables.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = window.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/image-properties.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = Image.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/image-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = Image.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/location-properties.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = location.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/location-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = location.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/number-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = (42).foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/object-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = {}.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/storage-properties.html

@@ -11 +11 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = localStorage.foo + ' and ' + sessionStorage.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/storage-prototype.html

@@ -11 +11 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = localStorage.foo + ' and ' + sessionStorage.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/string-prototype.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = ''.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/window-properties.html

@@ -8 +8 @@
   layoutTestController.dumpAsText();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.getElementById('console').innerHTML = window.foo");
 }

trunk/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-function.html

@@ -17 +17 @@
   layoutTestController.waitUntilDone();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.foo = 'PASS';\n" +
     "window.func = function () {\n" +

trunk/LayoutTests/http/tests/security/isolatedWorld/window-setTimeout-string.html

@@ -17 +17 @@
   layoutTestController.waitUntilDone();
   layoutTestController.evaluateScriptInIsolatedWorld(
+    0,
     "document.foo = 'PASS';\n" +
     "window.func = function () {\n" +