Commit 096902d9 authored by jamesr@google.com's avatar jamesr@google.com
Browse files

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: http://svn.webkit.org/repository/webkit/trunk@76623 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7e6de6b9
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.
2011-01-20 Jer Noble <jer.noble@apple.com>
 
Reviewed by Eric Carlson.
......
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
<!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>
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
<!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>
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
<!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>
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
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
<!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>
<!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>
<!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>
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;
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;
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;
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;
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;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment