Changeset 58644 in webkit


Ignore:
Timestamp:
May 2, 2010 12:50:41 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-05-02 Ben Murdoch <​benm@google.com>

Reviewed by Darin Adler.

fast/events/touch has non-standard script test wrappers
​https://bugs.webkit.org/show_bug.cgi?id=38084

Tidy up the touch event layout tests. Make the script-tests TEMPLATE.html
generate asynchronous style tests using js-test-post-function.js and move
the non-standard synchronous test into the resources directory.

  • fast/events/touch/basic-multi-touch-events.html: Regenerate from TEMPLATE.html
  • fast/events/touch/basic-single-touch-events.html: ditto.
  • fast/events/touch/send-oncancel-event.html: ditto.
  • fast/events/touch/touch-target.html: ditto.
  • fast/events/touch/create-touch-event.html: Link to script in resources rather than

script-tests as this test is not generated from TEMPLATE.html.

  • fast/events/touch/resources/create-touch-event.js: Copied from LayoutTests/fast/events/touch/script-tests/create-touch-event.js.
  • fast/events/touch/script-tests/TEMPLATE.html: Update to generate asynchronous tests.
  • fast/events/touch/script-tests/create-touch-event.js: Removed.
  • fast/events/touch/script-tests/touch-target.js: Refactor to work with new wrapper

generated from TEMPLATE.html.

Location:
trunk/LayoutTests
Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r58640 r58644  
     12010-05-02  Ben Murdoch  <benm@google.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        fast/events/touch has non-standard script test wrappers
     6        https://bugs.webkit.org/show_bug.cgi?id=38084
     7
     8        Tidy up the touch event layout tests. Make the script-tests TEMPLATE.html
     9        generate asynchronous style tests using js-test-post-function.js and move
     10        the non-standard synchronous test into the resources directory.
     11
     12        * fast/events/touch/basic-multi-touch-events.html: Regenerate from TEMPLATE.html
     13        * fast/events/touch/basic-single-touch-events.html: ditto.
     14        * fast/events/touch/send-oncancel-event.html: ditto.
     15        * fast/events/touch/touch-target.html: ditto.
     16        * fast/events/touch/create-touch-event.html: Link to script in resources rather than
     17            script-tests as this test is not generated from TEMPLATE.html.
     18        * fast/events/touch/resources/create-touch-event.js: Copied from LayoutTests/fast/events/touch/script-tests/create-touch-event.js.
     19        * fast/events/touch/script-tests/TEMPLATE.html: Update to generate asynchronous tests.
     20        * fast/events/touch/script-tests/create-touch-event.js: Removed.
     21        * fast/events/touch/script-tests/touch-target.js: Refactor to work with new wrapper
     22            generated from TEMPLATE.html.
     23
     24
    1252010-05-01  Alexey Proskuryakov  <ap@apple.com>
    226

  • trunk/LayoutTests/fast/events/touch/basic-multi-touch-events.html

    r54817 r58644  
    55<script src="../../js/resources/js-test-pre.js"></script>
    66<script src="../../js/resources/js-test-post-function.js"></script>
     7<!--
     8  Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
     9  should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
     10  This template will generate an asynchronous style test by using the js-test-post-function script.
     11  You will need to invoke isSuccessfullyParsed() in your test script when the test completes.
     12-->
    713</head>
    814<body>
    … …  
    1016<div id="console"></div>
    1117<script src="script-tests/basic-multi-touch-events.js"></script>
    12 
    1318</body>
    1419</html>

  • trunk/LayoutTests/fast/events/touch/basic-single-touch-events.html

    r54817 r58644  
    55<script src="../../js/resources/js-test-pre.js"></script>
    66<script src="../../js/resources/js-test-post-function.js"></script>
     7<!--
     8  Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
     9  should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
     10  This template will generate an asynchronous style test by using the js-test-post-function script.
     11  You will need to invoke isSuccessfullyParsed() in your test script when the test completes.
     12-->
    713</head>
    814<body>

  • trunk/LayoutTests/fast/events/touch/create-touch-event.html

    r54253 r58644  
    88<p id="description"></p>
    99<div id="console"></div>
    10 <script src="script-tests/create-touch-event.js"></script>
     10<script src="resources/create-touch-event.js"></script>
    1111<script src="../../js/resources/js-test-post.js"></script>
    1212</body>

  • trunk/LayoutTests/fast/events/touch/script-tests/TEMPLATE.html

    r54253 r58644  
    44<link rel="stylesheet" href="../../js/resources/js-test-style.css">
    55<script src="../../js/resources/js-test-pre.js"></script>
     6<script src="../../js/resources/js-test-post-function.js"></script>
     7<!--
     8  Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
     9  should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
     10  This template will generate an asynchronous style test by using the js-test-post-function script.
     11  You will need to invoke isSuccessfullyParsed() in your test script when the test completes.
     12-->
    613</head>
    714<body>
    … …  
    916<div id="console"></div>
    1017<script src="YOUR_JS_FILE_HERE"></script>
    11 <script src="../../js/resources/js-test-post.js"></script>
    1218</body>
    1319</html>

  • trunk/LayoutTests/fast/events/touch/script-tests/touch-target.js

    r55230 r58644  
     1var targetsDiv = document.createElement("div");
     2targetsDiv.id = "targetsDiv";
     3
    14var div1 = document.createElement("div");
    25div1.id = "targetA";
    … …  
    1417var touchMoveCount = 0;
    1518
    16 document.getElementById('targetsDiv').appendChild(div1);
    17 document.getElementById('targetsDiv').appendChild(document.createElement('br'));
    18 document.getElementById('targetsDiv').appendChild(div2);
     19document.body.insertBefore(targetsDiv, document.getElementById('console'));
     20targetsDiv.appendChild(div1);
     21targetsDiv.appendChild(document.createElement('br'));
     22targetsDiv.appendChild(div2);
    1923
    2024function touchStartHandler()

  • trunk/LayoutTests/fast/events/touch/send-oncancel-event.html

    r58058 r58644  
    44<link rel="stylesheet" href="../../js/resources/js-test-style.css">
    55<script src="../../js/resources/js-test-pre.js"></script>
     6<script src="../../js/resources/js-test-post-function.js"></script>
     7<!--
     8  Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
     9  should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
     10  This template will generate an asynchronous style test by using the js-test-post-function script.
     11  You will need to invoke isSuccessfullyParsed() in your test script when the test completes.
     12-->
    613</head>
    714<body>
    … …  
    916<div id="console"></div>
    1017<script src="script-tests/send-oncancel-event.js"></script>
    11 <script src="../../js/resources/js-test-post-function.js"></script>
    1218</body>
    1319</html>

  • trunk/LayoutTests/fast/events/touch/touch-target.html

    r55230 r58644  
    55<script src="../../js/resources/js-test-pre.js"></script>
    66<script src="../../js/resources/js-test-post-function.js"></script>
     7<!--
     8  Touch tests that involve the ontouchstart, ontouchmove, ontouchend or ontouchcancel callbacks
     9  should be written in an asynchronous fashion so they can be run on mobile platforms like Android.
     10  This template will generate an asynchronous style test by using the js-test-post-function script.
     11  You will need to invoke isSuccessfullyParsed() in your test script when the test completes.
     12-->
    713</head>
    814<body>
    915<p id="description"></p>
    10 <div id="targetsDiv"></div>
    1116<div id="console"></div>
    1217<script src="script-tests/touch-target.js"></script>
Note: See TracChangeset for help on using the changeset viewer.