Changeset 76623 in webkit


Ignore:
Timestamp:
Jan 25, 2011 12:01:12 PM (13 years ago)
Author:
jamesr@google.com
Message:

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.
Location:
trunk/LayoutTests
Files:
4 added
11 edited
3 copied

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r76621 r76623  
     12011-01-25  James Robinson  <jamesr@chromium.org>
     2
     3        Reviewed by Mihai Parparita.
     4
     5        Convert requestAnimationFrame tests to be script-tests
     6        https://bugs.webkit.org/show_bug.cgi?id=53109
     7
     8        This converts the new requestAnimationFrame tests to be proper script-tests using make-script-test-wrapper.
     9
     10        * fast/animation/request-animation-frame-cancel-expected.txt:
     11        * fast/animation/request-animation-frame-cancel.html:
     12        * fast/animation/request-animation-frame-cancel2-expected.txt:
     13        * fast/animation/request-animation-frame-cancel2.html:
     14        * fast/animation/request-animation-frame-display-expected.txt:
     15        * fast/animation/request-animation-frame-display.html:
     16        * fast/animation/request-animation-frame-expected.txt:
     17        * fast/animation/request-animation-frame-within-callback-expected.txt:
     18        * fast/animation/request-animation-frame-within-callback.html:
     19        * fast/animation/request-animation-frame.html:
     20        * fast/animation/script-tests/TEMPLATE.html: Added.
     21        * fast/animation/script-tests/request-animation-frame-cancel.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel.html.
     22        * fast/animation/script-tests/request-animation-frame-cancel2.js: Copied from LayoutTests/fast/animation/request-animation-frame-cancel2.html.
     23        (secondCallbackId):
     24        * fast/animation/script-tests/request-animation-frame-display.js: Added.
     25        * fast/animation/script-tests/request-animation-frame-within-callback.js: Copied from LayoutTests/fast/animation/request-animation-frame-within-callback.html.
     26        (window):
     27        * fast/animation/script-tests/request-animation-frame.js: Added.
     28
    1292011-01-20  Jer Noble  <jer.noble@apple.com>
    230

  • trunk/LayoutTests/fast/animation/request-animation-frame-cancel-expected.txt

    r76278 r76623  
    1 PASS
     1This tests cancelling a webkitRequestAnimationFrame callback
     2
     3On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
     4
     5
     6PASS successfullyParsed is true
     7
     8TEST COMPLETE
     9

  • trunk/LayoutTests/fast/animation/request-animation-frame-cancel.html

    r76278 r76623  
    11<!DOCTYPE html>
    22<html>
    3 <span id="e">PASS</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
    7 
    8 var e = document.getElementById("e");
    9 var id = window.webkitRequestAnimationFrame(function() {
    10     e.innerHTML = "FAIL";
    11 }, e);
    12 
    13 window.webkitCancelRequestAnimationFrame(id);
    14 
    15 if (window.layoutTestController)
    16     layoutTestController.display();
    17 </script>
     3<head>
     4<link rel="stylesheet" href="../js/resources/js-test-style.css">
     5<script src="../js/resources/js-test-pre.js"></script>
     6</head>
     7<body>
     8<p id="description"></p>
     9<div id="console"></div>
     10<span id="e"></span>
     11<span id="f"></span>
     12<script src="script-tests/request-animation-frame-cancel.js"></script>
     13<script src="../js/resources/js-test-post.js"></script>
     14</body>
     15</html>

  • trunk/LayoutTests/fast/animation/request-animation-frame-cancel2-expected.txt

    r76278 r76623  
    1 PASS
     1Tests one requestAnimationFrame callback cancelling a second
     2
     3On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
     4
     5
     6PASS successfullyParsed is true
     7
     8TEST COMPLETE
     9

  • trunk/LayoutTests/fast/animation/request-animation-frame-cancel2.html

    r76278 r76623  
    11<!DOCTYPE html>
    22<html>
    3 <span id="e">PASS</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
    7 
    8 var e = document.getElementById("e");
    9 var secondCallbackId;
    10 
    11 window.webkitRequestAnimationFrame(function() {
    12     window.webkitCancelRequestAnimationFrame(secondCallbackId);
    13 }, e);
    14 
    15 secondCallbackId = window.webkitRequestAnimationFrame(function() {
    16     e.innerHTML =  "FAIL";
    17 }, e);
    18 
    19 if (window.layoutTestController)
    20     layoutTestController.display();
    21 </script>
     3<head>
     4<link rel="stylesheet" href="../js/resources/js-test-style.css">
     5<script src="../js/resources/js-test-pre.js"></script>
     6</head>
     7<body>
     8<p id="description"></p>
     9<div id="console"></div>
     10<span id="e"></span>
     11<span id="f"></span>
     12<script src="script-tests/request-animation-frame-cancel2.js"></script>
     13<script src="../js/resources/js-test-post.js"></script>
     14</body>
     15</html>

  • trunk/LayoutTests/fast/animation/request-animation-frame-display-expected.txt

    r76278 r76623  
    1 PASS
     1Tests requestAnimationFrame callback handling of display: property changed within another callback
     2
     3On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
     4
     5
     6PASS callbackInvokedOnA is true
     7PASS successfullyParsed is true
     8
     9TEST COMPLETE
     10

  • trunk/LayoutTests/fast/animation/request-animation-frame-display.html

    r76278 r76623  
    11<!DOCTYPE html>
    22<html>
    3 <span id="a" style="display:none"></span>
    4 <span id="b">FAIL</span>
    5 <script>
    6 if (window.layoutTestController)
    7     layoutTestController.dumpAsText();
    8 
    9 var a = document.getElementById("a");
    10 window.webkitRequestAnimationFrame(function() {
    11     b.innerHTML="PASS";
    12 }, a);
    13 
    14 var b = document.getElementById("b");
    15 window.webkitRequestAnimationFrame(function() {
    16     a.style.display="";
    17 }, b);
    18 
    19 if (window.layoutTestController)
    20     layoutTestController.display();
    21 </script>
     3<head>
     4<link rel="stylesheet" href="../js/resources/js-test-style.css">
     5<script src="../js/resources/js-test-pre.js"></script>
     6</head>
     7<body>
     8<p id="description"></p>
     9<div id="console"></div>
     10<span id="e"></span>
     11<span id="f"></span>
     12<script src="script-tests/request-animation-frame-display.js"></script>
     13<script src="../js/resources/js-test-post.js"></script>
     14</body>
    2215</html>

  • trunk/LayoutTests/fast/animation/request-animation-frame-expected.txt

    r76278 r76623  
    1 PASS
     1Tests basic use of requestAnimationFrame
     2
     3On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
     4
     5
     6PASS callbackInvoked is true
     7PASS successfullyParsed is true
     8
     9TEST COMPLETE
     10

  • trunk/LayoutTests/fast/animation/request-animation-frame-within-callback-expected.txt

    r76278 r76623  
    1 PASS
     1Tests adding one callback within another
     2
     3On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
     4
     5
     6PASS sameFrame is false
     7PASS successfullyParsed is true
     8
     9TEST COMPLETE
     10

  • trunk/LayoutTests/fast/animation/request-animation-frame-within-callback.html

    r76278 r76623  
    11<!DOCTYPE html>
    22<html>
    3 <span id="e">FAIL</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
    7 
    8 var e = document.getElementById("e");
    9 var sameFrame;
    10 window.webkitRequestAnimationFrame(function() {
    11     sameFrame = true;
    12 }, e);
    13 window.webkitRequestAnimationFrame(function() {
    14     window.webkitRequestAnimationFrame(function() {
    15         e.innerHTML = sameFrame ? "FAIL" : "PASS";
    16     }, e);
    17 }, e);
    18 window.webkitRequestAnimationFrame(function() {
    19     sameFrame = false;
    20 }, e);
    21 
    22 // This should fire the three already registered callbacks, but not the one dynamically registered.
    23 if (window.layoutTestController)
    24     layoutTestController.display();
    25 // This should fire the dynamically registered callback.
    26 if (window.layoutTestController)
    27     layoutTestController.display();
    28 </script>
     3<head>
     4<link rel="stylesheet" href="../js/resources/js-test-style.css">
     5<script src="../js/resources/js-test-pre.js"></script>
     6</head>
     7<body>
     8<p id="description"></p>
     9<div id="console"></div>
     10<span id="e"></span>
     11<span id="f"></span>
     12<script src="script-tests/request-animation-frame-within-callback.js"></script>
     13<script src="../js/resources/js-test-post.js"></script>
     14</body>
     15</html>

  • trunk/LayoutTests/fast/animation/request-animation-frame.html

    r76278 r76623  
    11<!DOCTYPE html>
    22<html>
    3 <span id="e">FAIL</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
    7 
    8 var e = document.getElementById("e");
    9 window.webkitRequestAnimationFrame(function() {
    10     e.innerHTML="PASS";
    11 }, e);
    12 if (window.layoutTestController)
    13     layoutTestController.display();
    14 </script>
     3<head>
     4<link rel="stylesheet" href="../js/resources/js-test-style.css">
     5<script src="../js/resources/js-test-pre.js"></script>
     6</head>
     7<body>
     8<p id="description"></p>
     9<div id="console"></div>
     10<span id="e"></span>
     11<span id="f"></span>
     12<script src="script-tests/request-animation-frame.js"></script>
     13<script src="../js/resources/js-test-post.js"></script>
     14</body>
     15</html>

  • trunk/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel.js

    r76622 r76623  
    1 <!DOCTYPE html>
    2 <html>
    3 <span id="e">PASS</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
     1description("This tests cancelling a webkitRequestAnimationFrame callback");
    72
    83var e = document.getElementById("e");
    94var id = window.webkitRequestAnimationFrame(function() {
    10     e.innerHTML = "FAIL";
     5    testFailed("callback invoked after cancelled");
    116}, e);
    127
    … …  
    1510if (window.layoutTestController)
    1611    layoutTestController.display();
    17 </script>
     12
     13var successfullyParsed = true;

  • trunk/LayoutTests/fast/animation/script-tests/request-animation-frame-cancel2.js

    r76622 r76623  
    1 <!DOCTYPE html>
    2 <html>
    3 <span id="e">PASS</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
     1description("Tests one requestAnimationFrame callback cancelling a second");
    72
    83var e = document.getElementById("e");
    … …  
    149
    1510secondCallbackId = window.webkitRequestAnimationFrame(function() {
    16     e.innerHTML =  "FAIL";
     11    testFailed("callback invoked after cancel");
    1712}, e);
    1813
    1914if (window.layoutTestController)
    2015    layoutTestController.display();
    21 </script>
     16
     17var successfullyParsed = true;

  • trunk/LayoutTests/fast/animation/script-tests/request-animation-frame-within-callback.js

    r76622 r76623  
    1 <!DOCTYPE html>
    2 <html>
    3 <span id="e">FAIL</span>
    4 <script>
    5 if (window.layoutTestController)
    6     layoutTestController.dumpAsText();
     1description("Tests adding one callback within another");
    72
    83var e = document.getElementById("e");
    … …  
    138window.webkitRequestAnimationFrame(function() {
    149    window.webkitRequestAnimationFrame(function() {
    15         e.innerHTML = sameFrame ? "FAIL" : "PASS";
     10        shouldBeFalse("sameFrame");
    1611    }, e);
    1712}, e);
    … …  
    2621if (window.layoutTestController)
    2722    layoutTestController.display();
    28 </script>
     23
     24var successfullyParsed = true;
Note: See TracChangeset for help on using the changeset viewer.