2011-01-25 James Robinson <jamesr@chromium.org>

Reviewed by Mihai Parparita. Convert requestAnimationFrame tests to be script-tests https://bugs.webkit.org/show_bug.cgi?id=53109 This converts the new requestAnimationFrame tests to be proper script-tests using make-script-test-wrapper. * fast/animation/request-animation-frame-cancel-expected.txt: * fast/animation/request-animation-frame-cancel.html: * fast/animation/request-animation-frame-cancel2-expected.txt: * fast/animation/request-animation-frame-cancel2.html: * fast/animation/request-animation-frame-display-expected.txt: * fast/animation/request-animation-frame-display.html: * fast/animation/request-animation-frame-expected.txt: * fast/animation/request-animation-frame-within-callback-expected.txt: * fast/animation/request-animation-frame-within-callback.html: * fast/animation/request-animation-frame.html: * fast/animation/script-tests/TEMPLATE.html: Added. * fast/animation/script-tests/request-animation-frame-cancel.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel.html. * fast/animation/script-tests/request-animation-frame-cancel2.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel2.html. (secondCallbackId): * fast/animation/script-tests/request-animation-frame-display.js: Added. * fast/animation/script-tests/request-animation-frame-within-callback.js: Copied from LayoutTests/fast/animation/request-animation-frame-within-callback.html. (window): * fast/animation/script-tests/request-animation-frame.js: Added. git-svn-id: svn://svn.chromium.org/blink/trunk@76623 bbb929c8-8fbe-4397-9dbb-9b2b20218538
author: jamesr@google.com <jamesr@google.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> 2011-01-25 20:01:12 +0000
committer: jamesr@google.com <jamesr@google.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538> 2011-01-25 20:01:12 +0000
commit: 308ee2e9cda05bdf32b21fe1c10d2293719d726e (patch)
tree: 9426a000cc81922b2774f4019597016d171a9d3a /third_party/WebKit/LayoutTests/fast
parent: 3f052c9d02c424634d1e793bc8ec12882783c997 (diff)
download: chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.zip
chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.tar.gz
chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.tar.bz2
16 files changed, 215 insertions, 96 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
index 7ef22e9..8e972f1 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt
@@ -1 +1,9 @@
-PASS
+This tests cancelling a webkitRequestAnimationFrame callback
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel.html
index 4210f7b..36c85bc 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel.html
@@ -1,17 +1,15 @@
 <!DOCTYPE html>
 <html>
-<span id="e">PASS</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var id = window.webkitRequestAnimationFrame(function() {
-    e.innerHTML = "FAIL";
-}, e);
-
-window.webkitCancelRequestAnimationFrame(id);
-
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<span id="e"></span>
+<span id="f"></span>
+<script src="script-tests/request-animation-frame-cancel.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
index 7ef22e9..361cf6f 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt
@@ -1 +1,9 @@
-PASS
+Tests one requestAnimationFrame callback cancelling a second
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2.html
index 4ac2e93..1dc77a8 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-cancel2.html
@@ -1,21 +1,15 @@
 <!DOCTYPE html>
 <html>
-<span id="e">PASS</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var secondCallbackId;
-
-window.webkitRequestAnimationFrame(function() {
-    window.webkitCancelRequestAnimationFrame(secondCallbackId);
-}, e);
-
-secondCallbackId = window.webkitRequestAnimationFrame(function() {
-    e.innerHTML =  "FAIL";
-}, e);
-
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<span id="e"></span>
+<span id="f"></span>
+<script src="script-tests/request-animation-frame-cancel2.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display-expected.txt b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
index 7ef22e9..e982638 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display-expected.txt
@@ -1 +1,10 @@
-PASS
+Tests requestAnimationFrame callback handling of display: property changed within another callback
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS callbackInvokedOnA is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display.html
index b822577..f9495ab 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-display.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
 <html>
-<span id="a" style="display:none"></span>
-<span id="b">FAIL</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var a = document.getElementById("a");
-window.webkitRequestAnimationFrame(function() {
-    b.innerHTML="PASS";
-}, a);
-
-var b = document.getElementById("b");
-window.webkitRequestAnimationFrame(function() {
-    a.style.display="";
-}, b);
-
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<span id="e"></span>
+<span id="f"></span>
+<script src="script-tests/request-animation-frame-display.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
 </html>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-expected.txt b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-expected.txt
index 7ef22e9..25fd89d 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-expected.txt
@@ -1 +1,10 @@
-PASS
+Tests basic use of requestAnimationFrame
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS callbackInvoked is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
index 7ef22e9..873bf1f 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt
@@ -1 +1,10 @@
-PASS
+Tests adding one callback within another
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS sameFrame is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html
index d5a366f..96fbbf0 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame-within-callback.html
@@ -1,28 +1,15 @@
 <!DOCTYPE html>
 <html>
-<span id="e">FAIL</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-var sameFrame;
-window.webkitRequestAnimationFrame(function() {
-    sameFrame = true;
-}, e);
-window.webkitRequestAnimationFrame(function() {
-    window.webkitRequestAnimationFrame(function() {
-        e.innerHTML = sameFrame ? "FAIL" : "PASS";
-    }, e);
-}, e);
-window.webkitRequestAnimationFrame(function() {
-    sameFrame = false;
-}, e);
-
-// This should fire the three already registered callbacks, but not the one dynamically registered.
-if (window.layoutTestController)
-    layoutTestController.display();
-// This should fire the dynamically registered callback.
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<span id="e"></span>
+<span id="f"></span>
+<script src="script-tests/request-animation-frame-within-callback.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame.html b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame.html
index 7d67a97..fb80417 100644
--- a/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame.html
+++ b/third_party/WebKit/LayoutTests/fast/animation/request-animation-frame.html
@@ -1,14 +1,15 @@
 <!DOCTYPE html>
 <html>
-<span id="e">FAIL</span>
-<script>
-if (window.layoutTestController)
-    layoutTestController.dumpAsText();
-
-var e = document.getElementById("e");
-window.webkitRequestAnimationFrame(function() {
-    e.innerHTML="PASS";
-}, e);
-if (window.layoutTestController)
-    layoutTestController.display();
-</script>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<span id="e"></span>
+<span id="f"></span>
+<script src="script-tests/request-animation-frame.js"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/TEMPLATE.html b/third_party/WebKit/LayoutTests/fast/animation/script-tests/TEMPLATE.html
new file mode 100644
index 0000000..dbbd9d9
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/TEMPLATE.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+<link rel="stylesheet" href="../js/resources/js-test-style.css">
+<script src="../js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<p id="description"></p>
+<div id="console"></div>
+<span id="e"></span>
+<span id="f"></span>
+<script src="YOUR_JS_FILE_HERE"></script>
+<script src="../js/resources/js-test-post.js"></script>
+</body>
+</html>
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
new file mode 100644
index 0000000..d67afbe
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js
@@ -0,0 +1,13 @@
+description("This tests cancelling a webkitRequestAnimationFrame callback");
+
+var e = document.getElementById("e");
+var id = window.webkitRequestAnimationFrame(function() {
+    testFailed("callback invoked after cancelled");
+}, e);
+
+window.webkitCancelRequestAnimationFrame(id);
+
+if (window.layoutTestController)
+    layoutTestController.display();
+
+var successfullyParsed = true;
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
new file mode 100644
index 0000000..7af694f
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js
@@ -0,0 +1,17 @@
+description("Tests one requestAnimationFrame callback cancelling a second");
+
+var e = document.getElementById("e");
+var secondCallbackId;
+
+window.webkitRequestAnimationFrame(function() {
+    window.webkitCancelRequestAnimationFrame(secondCallbackId);
+}, e);
+
+secondCallbackId = window.webkitRequestAnimationFrame(function() {
+    testFailed("callback invoked after cancel");
+}, e);
+
+if (window.layoutTestController)
+    layoutTestController.display();
+
+var successfullyParsed = true;
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-display.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-display.js
new file mode 100644
index 0000000..8429242
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-display.js
@@ -0,0 +1,20 @@
+description("Tests requestAnimationFrame callback handling of display: property changed within another callback");
+
+var e = document.getElementById("e");
+e.style.display="none";
+var callbackInvokedOnA=false;
+window.webkitRequestAnimationFrame(function() {
+    callbackInvokedOnA=true;
+}, e);
+
+var f = document.getElementById("f");
+window.webkitRequestAnimationFrame(function() {
+    e.style.display="";
+}, f);
+
+if (window.layoutTestController)
+    layoutTestController.display();
+
+shouldBeTrue("callbackInvokedOnA");
+
+var successfullyParsed = true;
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
new file mode 100644
index 0000000..dc9c4cc
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js
@@ -0,0 +1,24 @@
+description("Tests adding one callback within another");
+
+var e = document.getElementById("e");
+var sameFrame;
+window.webkitRequestAnimationFrame(function() {
+    sameFrame = true;
+}, e);
+window.webkitRequestAnimationFrame(function() {
+    window.webkitRequestAnimationFrame(function() {
+        shouldBeFalse("sameFrame");
+    }, e);
+}, e);
+window.webkitRequestAnimationFrame(function() {
+    sameFrame = false;
+}, e);
+
+// This should fire the three already registered callbacks, but not the one dynamically registered.
+if (window.layoutTestController)
+    layoutTestController.display();
+// This should fire the dynamically registered callback.
+if (window.layoutTestController)
+    layoutTestController.display();
+
+var successfullyParsed = true;
diff --git a/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js
new file mode 100644
index 0000000..e6ced5b
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/fast/animation/script-tests/request-animation-frame.js
@@ -0,0 +1,14 @@
+description("Tests basic use of requestAnimationFrame");
+
+var e = document.getElementById("e");
+var callbackInvoked = false;
+window.webkitRequestAnimationFrame(function() {
+    callbackInvoked = true;
+}, e);
+
+if (window.layoutTestController)
+    layoutTestController.display();
+
+shouldBeTrue("callbackInvoked");
+var successfullyParsed = true;
+
author	jamesr@google.com <jamesr@google.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>	2011-01-25 20:01:12 +0000
committer	jamesr@google.com <jamesr@google.com@bbb929c8-8fbe-4397-9dbb-9b2b20218538>	2011-01-25 20:01:12 +0000
commit	308ee2e9cda05bdf32b21fe1c10d2293719d726e (patch)
tree	9426a000cc81922b2774f4019597016d171a9d3a /third_party/WebKit/LayoutTests/fast
parent	3f052c9d02c424634d1e793bc8ec12882783c997 (diff)
download	chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.zip chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.tar.gz chromium_src-308ee2e9cda05bdf32b21fe1c10d2293719d726e.tar.bz2