Changeset 90354 in webkit


Ignore:
Timestamp:
Jul 4, 2011 2:18:37 AM (13 years ago)
Author:
yutak@chromium.org
Message:

2011-07-04 Yuta Kitamura <​yutak@chromium.org>

WebSocket: Use jsTestIsAsync and finishJSTest() wherever possible in WebSocket tests
​https://bugs.webkit.org/show_bug.cgi?id=63892

Reviewed by Kent Tamura.

Use jsTestIsAsync and finishJSTest() in WebSocket tests which are run asynchronously.
Script tags loading js-test-post-function.js must be removed, and instead js-test-post.js
must be loaded after each test.

  • http/tests/websocket/tests/alert-in-event-handler.html:
  • http/tests/websocket/tests/bad-handshake-crash.html:
  • http/tests/websocket/tests/bad-sub-protocol-control-chars.html: This test is done synchronously, thus there is no need to use jsTestIsAsync and finishJSTest(). As we are moving away from js-test-post-function.js, isSuccessfullyParsed() should not be used anymore.
  • http/tests/websocket/tests/bad-sub-protocol-empty.html:
  • http/tests/websocket/tests/bad-sub-protocol-non-ascii.html:
  • http/tests/websocket/tests/bufferedAmount-after-close.html:
  • http/tests/websocket/tests/close-before-open.html:
  • http/tests/websocket/tests/close-on-navigate-new-location.html:
  • http/tests/websocket/tests/close-on-unload-and-force-gc.html:
  • http/tests/websocket/tests/close-on-unload-reference-in-parent.html:
  • http/tests/websocket/tests/close-on-unload.html:
  • http/tests/websocket/tests/close-unref-websocket.html:
  • http/tests/websocket/tests/cross-origin.html:
  • http/tests/websocket/tests/error-detect.html:
  • http/tests/websocket/tests/frame-length-longer-than-buffer.html:
  • http/tests/websocket/tests/frame-length-overflow.html: Add close tags for <body> and <html> elements which were not present for some reason.
  • http/tests/websocket/tests/frame-length-skip.html:
  • http/tests/websocket/tests/handshake-challenge-randomness.html:
  • http/tests/websocket/tests/handshake-error.html:
  • http/tests/websocket/tests/handshake-fail-by-cross-origin.html:
  • http/tests/websocket/tests/handshake-fail-by-maxlength.html:
  • http/tests/websocket/tests/handshake-fail-by-no-connection-header.html:
  • http/tests/websocket/tests/handshake-fail-by-no-cr.html:
  • http/tests/websocket/tests/handshake-fail-by-no-upgrade-header.html:
  • http/tests/websocket/tests/handshake-fail-by-prepended-null.html:
  • http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html:
  • http/tests/websocket/tests/long-invalid-header.html:
  • http/tests/websocket/tests/null-character.html:
  • http/tests/websocket/tests/reload-crash.html:
  • http/tests/websocket/tests/send-after-close-on-unload.html:
  • http/tests/websocket/tests/send-throw.html:
  • http/tests/websocket/tests/send.html:
  • http/tests/websocket/tests/simple.html:
  • http/tests/websocket/tests/sub-protocol-with-space.html:
  • http/tests/websocket/tests/sub-protocol.html:
  • http/tests/websocket/tests/unicode.html:
  • http/tests/websocket/tests/url-no-trailing-slash.html:
  • http/tests/websocket/tests/url-parsing.html:
  • http/tests/websocket/tests/url-with-credential.html:
  • http/tests/websocket/tests/url-with-empty-query.html:
  • http/tests/websocket/tests/url-with-query-for-no-query.html:
  • http/tests/websocket/tests/url-with-query.html:
  • http/tests/websocket/tests/websocket-event-target.html:
  • http/tests/websocket/tests/websocket-protocol-ignored.html:
Location:
trunk/LayoutTests
Files:
45 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r90353 r90354  
     12011-07-04  Yuta Kitamura  <yutak@chromium.org>
     2
     3        WebSocket: Use jsTestIsAsync and finishJSTest() wherever possible in WebSocket tests
     4        https://bugs.webkit.org/show_bug.cgi?id=63892
     5
     6        Reviewed by Kent Tamura.
     7
     8        Use jsTestIsAsync and finishJSTest() in WebSocket tests which are run asynchronously.
     9        Script tags loading js-test-post-function.js must be removed, and instead js-test-post.js
     10        must be loaded after each test.
     11
     12        * http/tests/websocket/tests/alert-in-event-handler.html:
     13        * http/tests/websocket/tests/bad-handshake-crash.html:
     14        * http/tests/websocket/tests/bad-sub-protocol-control-chars.html:
     15        This test is done synchronously, thus there is no need to use jsTestIsAsync and
     16        finishJSTest(). As we are moving away from js-test-post-function.js,
     17        isSuccessfullyParsed() should not be used anymore.
     18        * http/tests/websocket/tests/bad-sub-protocol-empty.html:
     19        * http/tests/websocket/tests/bad-sub-protocol-non-ascii.html:
     20        * http/tests/websocket/tests/bufferedAmount-after-close.html:
     21        * http/tests/websocket/tests/close-before-open.html:
     22        * http/tests/websocket/tests/close-on-navigate-new-location.html:
     23        * http/tests/websocket/tests/close-on-unload-and-force-gc.html:
     24        * http/tests/websocket/tests/close-on-unload-reference-in-parent.html:
     25        * http/tests/websocket/tests/close-on-unload.html:
     26        * http/tests/websocket/tests/close-unref-websocket.html:
     27        * http/tests/websocket/tests/cross-origin.html:
     28        * http/tests/websocket/tests/error-detect.html:
     29        * http/tests/websocket/tests/frame-length-longer-than-buffer.html:
     30        * http/tests/websocket/tests/frame-length-overflow.html:
     31        Add close tags for <body> and <html> elements which were not present for some reason.
     32        * http/tests/websocket/tests/frame-length-skip.html:
     33        * http/tests/websocket/tests/handshake-challenge-randomness.html:
     34        * http/tests/websocket/tests/handshake-error.html:
     35        * http/tests/websocket/tests/handshake-fail-by-cross-origin.html:
     36        * http/tests/websocket/tests/handshake-fail-by-maxlength.html:
     37        * http/tests/websocket/tests/handshake-fail-by-no-connection-header.html:
     38        * http/tests/websocket/tests/handshake-fail-by-no-cr.html:
     39        * http/tests/websocket/tests/handshake-fail-by-no-upgrade-header.html:
     40        * http/tests/websocket/tests/handshake-fail-by-prepended-null.html:
     41        * http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html:
     42        * http/tests/websocket/tests/long-invalid-header.html:
     43        * http/tests/websocket/tests/null-character.html:
     44        * http/tests/websocket/tests/reload-crash.html:
     45        * http/tests/websocket/tests/send-after-close-on-unload.html:
     46        * http/tests/websocket/tests/send-throw.html:
     47        * http/tests/websocket/tests/send.html:
     48        * http/tests/websocket/tests/simple.html:
     49        * http/tests/websocket/tests/sub-protocol-with-space.html:
     50        * http/tests/websocket/tests/sub-protocol.html:
     51        * http/tests/websocket/tests/unicode.html:
     52        * http/tests/websocket/tests/url-no-trailing-slash.html:
     53        * http/tests/websocket/tests/url-parsing.html:
     54        * http/tests/websocket/tests/url-with-credential.html:
     55        * http/tests/websocket/tests/url-with-empty-query.html:
     56        * http/tests/websocket/tests/url-with-query-for-no-query.html:
     57        * http/tests/websocket/tests/url-with-query.html:
     58        * http/tests/websocket/tests/websocket-event-target.html:
     59        * http/tests/websocket/tests/websocket-protocol-ignored.html:
     60
    1612011-07-03  Balazs Kelemen  <kbalazs@webkit.org>
    262

  • trunk/LayoutTests/http/tests/websocket/tests/alert-in-event-handler.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure event handler called serially.");
    1312
    14 if (window.layoutTestController) {
    15     layoutTestController.waitUntilDone();
    16 }
    17 
    18 function endTest()
    19 {
    20     isSuccessfullyParsed();
    21     if (window.layoutTestController) {
    22         layoutTestController.notifyDone();
    23     }
    24 }
     13window.jsTestIsAsync = true;
    2514
    2615var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/send2");
    … …  
    4231{
    4332    debug("Closed");
    44     endTest();
     33    finishJSTest();
    4534};
    4635
    … …  
    5039var successfullyParsed = true;
    5140</script>
     41<script src="../../../js-test-resources/js-test-post.js"></script>
    5242</body>
    5343</html>

  • trunk/LayoutTests/http/tests/websocket/tests/bad-handshake-crash.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1110<script type="text/javascript">
    1211description("Make sure WebSocket doesn't crash with bad handshake message.");
    13 if (window.layoutTestController)
    14     layoutTestController.waitUntilDone();
    1512
    16 function finish() {
    17     isSuccessfullyParsed();
    18     if (window.layoutTestController)
    19         layoutTestController.notifyDone();
    20 }
     13window.jsTestIsAsync = true;
    2114
    2215var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/bad-handshake-crash");
    … …  
    2619ws.onclose = function () {
    2720    debug("WebSocket is closed");
    28     finish();
     21    finishJSTest();
    2922};
    3023
    3124var successfullyParsed = true;
    3225</script>
     26<script src="../../../js-test-resources/js-test-post.js"></script>
    3327</body>
    3428</html>

  • trunk/LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    2019
    2120var successfullyParsed = true;
    22 isSuccessfullyParsed();
    2321</script>
     22<script src="../../../js-test-resources/js-test-post.js"></script>
    2423</body>
    2524</html>

  • trunk/LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1615
    1716var successfullyParsed = true;
    18 isSuccessfullyParsed();
    1917</script>
     18<script src="../../../js-test-resources/js-test-post.js"></script>
    2019</body>
    2120</html>

  • trunk/LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    2322
    2423var successfullyParsed = true;
    25 isSuccessfullyParsed();
    2624</script>
     25<script src="../../../js-test-resources/js-test-post.js"></script>
    2726</body>
    2827</html>

  • trunk/LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Web Socket bufferedAmount after closed");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
    16 
    17 function endTest()
    18 {
    19     isSuccessfullyParsed();
    20     if (window.layoutTestController)
    21         layoutTestController.notifyDone();
    22 }
     13window.jsTestIsAsync = true;
    2314
    2415var ws = new WebSocket("ws://localhost:8880/websocket/tests/simple");
    … …  
    4031    // (the number does not reset to zero once the connection closes).
    4132    shouldBe("ws.bufferedAmount", "23");
    42     endTest();
     33    finishJSTest();
    4334};
    4435
    4536var successfullyParsed = true;
    4637</script>
     38<script src="../../../js-test-resources/js-test-post.js"></script>
    4739</body>
    4840</html>

  • trunk/LayoutTests/http/tests/websocket/tests/close-before-open.html

    r87135 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket fires close event when WebSocket is opened and closed fore open event is received.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hanging-handshake");
    1816ws.onclose = function() {
    1917    debug("closed");
    20     isSuccessfullyParsed();
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
     18    finishJSTest();
    2319};
    2420var successfullyParsed = true;
    2521ws.close();
    2622</script>
    27 
     23<script src="../../../js-test-resources/js-test-post.js"></script>
    2824</body>
    2925</html>

  • trunk/LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location.html

    r68914 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket is closed when navigating to new location.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var frameDiv;
    1816var closedSocket;
    19 
    20 function endTest()
    21 {
    22     shouldBe("closedSocket", '"socket1"');
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
    26 };
    2717
    2818var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
    … …  
    4232ws.onclose = function()
    4333{
    44     endTest();
     34    shouldBe("closedSocket", '"socket1"');
     35    finishJSTest();
    4536};
    4637
    … …  
    5344var successfullyParsed = true;
    5445</script>
    55 
     46<script src="../../../js-test-resources/js-test-post.js"></script>
    5647</body>
    5748</html>

  • trunk/LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc.html

    r68914 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket is closed on unload and not crashed if garbage collected");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715function gc()
    … …  
    2725var frameDiv;
    2826var closedSocket;
    29 
    30 function endTest()
    31 {
    32     shouldBe("closedSocket", '"socket1"');
    33     isSuccessfullyParsed();
    34     if (window.layoutTestController)
    35         layoutTestController.notifyDone();
    36 };
    3727
    3828var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
    … …  
    5242ws.onclose = function()
    5343{
    54     endTest();
     44    shouldBe("closedSocket", '"socket1"');
     45    finishJSTest();
    5546};
    5647
    … …  
    6455var successfullyParsed = true;
    6556</script>
    66 
     57<script src="../../../js-test-resources/js-test-post.js"></script>
    6758</body>
    6859</html>

  • trunk/LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent.html

    r86732 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket opened in iframe but referred in parent document is closed on unloading the frame.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var frameDiv;
    1816var closedSocket;
    1917document.childWebSocket = null;
    20 
    21 function endTest()
    22 {
    23     shouldBe("closedSocket", '"socket1"');
    24     shouldBe("document.childWebSocket.readyState", "3");
    25     isSuccessfullyParsed();
    26     if (window.layoutTestController)
    27         layoutTestController.notifyDone();
    28 };
    2918
    3019var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
    … …  
    4433ws.onclose = function()
    4534{
    46     endTest();
     35    shouldBe("closedSocket", '"socket1"');
     36    shouldBe("document.childWebSocket.readyState", "3");
     37    finishJSTest();
    4738};
    4839
    … …  
    5647var successfullyParsed = true;
    5748</script>
    58 
     49<script src="../../../js-test-resources/js-test-post.js"></script>
    5950</body>
    6051</html>

  • trunk/LayoutTests/http/tests/websocket/tests/close-on-unload.html

    r68914 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket is closed on unload");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var frameDiv;
    1816var closedSocket;
    19 
    20 function endTest()
    21 {
    22     shouldBe("closedSocket", '"socket1"');
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
    26 };
    2717
    2818var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
    … …  
    4232ws.onclose = function()
    4333{
    44     endTest();
     34    shouldBe("closedSocket", '"socket1"');
     35    finishJSTest();
    4536};
    4637
    … …  
    5344var successfullyParsed = true;
    5445</script>
    55 
     46<script src="../../../js-test-resources/js-test-post.js"></script>
    5647</body>
    5748</html>

  • trunk/LayoutTests/http/tests/websocket/tests/close-unref-websocket.html

    r82088 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket is closed while handshaking and unreferenced, it should fire close event at most once.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var countCloseEvent = 0;
    … …  
    2018{
    2119    shouldBeGreaterThanOrEqual("1", "countCloseEvent");
    22     isSuccessfullyParsed();
    23     if (window.layoutTestController)
    24         layoutTestController.notifyDone();
     20    finishJSTest();
    2521};
    2622
    … …  
    3531var successfullyParsed = true;
    3632</script>
    37 
     33<script src="../../../js-test-resources/js-test-post.js"></script>
    3834</body>
    3935</html>

  • trunk/LayoutTests/http/tests/websocket/tests/cross-origin.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Web Socket Cross Origin test");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var origin;
    … …  
    2119    shouldBe("origin", '"http://127.0.0.1:8000"');
    2220    clearTimeout(timeoutID);
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
     21    finishJSTest();
    2622}
    2723
    … …  
    5753var successfullyParsed = true;
    5854</script>
     55<script src="../../../js-test-resources/js-test-post.js"></script>
    5956</body>
    6057</html>

  • trunk/LayoutTests/http/tests/websocket/tests/error-detect.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1110<script type="text/javascript">
    1211description("Make sure WebSocket correctly fire error event for unknown frame type.");
    13 if (window.layoutTestController)
    14     layoutTestController.waitUntilDone();
     12
     13window.jsTestIsAsync = true;
    1514
    1615var errorCount = 0;
    17 
    18 function finish() {
    19     shouldBe("errorCount", "255");
    20     isSuccessfullyParsed();
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
    23 }
    2416
    2517var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/unknown-frame-type");
    … …  
    3527ws.onclose = function () {
    3628    debug("WebSocket is closed");
    37     finish();
     29    shouldBe("errorCount", "255");
     30    finishJSTest();
    3831};
    3932
    4033var successfullyParsed = true;
    4134</script>
     35<script src="../../../js-test-resources/js-test-post.js"></script>
    4236</body>
    4337</html>

  • trunk/LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1110<script type="text/javascript">
    1211description("Make sure WebSocket correctly skip lengthed frame even if received data has incomplete frame.");
    13 if (window.layoutTestController)
    14     layoutTestController.waitUntilDone();
     12
     13window.jsTestIsAsync = true;
    1514
    1615var received_messages = [];
    … …  
    2524    shouldBeTrue("areArraysEqual(received_messages, expected_messages)");
    2625
    27     isSuccessfullyParsed();
    28     if (window.layoutTestController)
    29         layoutTestController.notifyDone();
     26    finishJSTest();
    3027}
    3128
    … …  
    4643var successfullyParsed = true;
    4744</script>
     45<script src="../../../js-test-resources/js-test-post.js"></script>
    4846</body>
    4947</html>

  • trunk/LayoutTests/http/tests/websocket/tests/frame-length-overflow.html

    r68914 r90354  
    33<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    44<script src="../../../js-test-resources/js-test-pre.js"></script>
    5 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    65</head>
    76<body>
    … …  
    109<script>
    1110description("Make sure WebSocket does not crash and report error when it sees length overflow");
    12 if (window.layoutTestController)
    13     layoutTestController.waitUntilDone();
    1411
    15 function finish() {
    16     isSuccessfullyParsed();
    17     if (window.layoutTestController)
    18         layoutTestController.notifyDone();
    19 }
     12window.jsTestIsAsync = true;
    2013
    2114var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/frame-length-overflow");
    … …  
    3124ws.onclose = function () {
    3225    debug("WebSocket is closed");
    33     finish();
     26    finishJSTest();
    3427};
    3528
    3629var successfullyParsed = true;
    3730</script>
    38 
     31<script src="../../../js-test-resources/js-test-post.js"></script>
     32</body>
     33</html>

  • trunk/LayoutTests/http/tests/websocket/tests/frame-length-skip.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1110<script type="text/javascript">
    1211description("Make sure WebSocket correctly skip lengthed frame.");
    13 if (window.layoutTestController)
    14     layoutTestController.waitUntilDone();
     12
     13window.jsTestIsAsync = true;
    1514
    1615var received_messages = [];
    … …  
    2524    shouldBeTrue("areArraysEqual(received_messages, expected_messages)");
    2625
    27     isSuccessfullyParsed();
    28     if (window.layoutTestController)
    29         layoutTestController.notifyDone();
     26    finishJSTest();
    3027}
    3128
    … …  
    4643var successfullyParsed = true;
    4744</script>
     45<script src="../../../js-test-resources/js-test-post.js"></script>
    4846</body>
    4947</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description('Handshake request should contain random challenge values.');
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var challenge1;
    1816var challenge2;
    19 
    20 function endTest()
    21 {
    22     shouldBeFalse('challenge1 === challenge2');
    23     if (challenge1 === challenge2)
    24         debug('challenge was ' + challenge1);
    25 
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
    29 }
    3017
    3118var url = 'ws://localhost:8880/websocket/tests/echo-challenge';
    … …  
    5037    ws2.onclose = function()
    5138    {
    52         endTest();
     39        shouldBeFalse('challenge1 === challenge2');
     40        if (challenge1 === challenge2)
     41            debug('challenge was ' + challenge1);
     42        finishJSTest();
    5343    }
    5444}
    … …  
    5646var successfullyParsed = true;
    5747</script>
     48<script src="../../../js-test-resources/js-test-post.js"></script>
    5849</body>
    5950</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-error.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Handshake error test");
    1312
    14 if (window.layoutTestController) {
    15     layoutTestController.waitUntilDone();
    16 }
     13window.jsTestIsAsync = true;
    1714
    1815function endTest()
    1916{
    20     isSuccessfullyParsed();
    2117    clearTimeout(timeoutID);
    22     if (window.layoutTestController) {
    23         layoutTestController.notifyDone();
    24     }
     18    finishJSTest();
    2519}
    2620
    … …  
    5448var successfullyParsed = true;
    5549</script>
     50<script src="../../../js-test-resources/js-test-post.js"></script>
    5651</body>
    5752</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure Web Socket connection failed if origin mismatches.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var connected = false;
    … …  
    2321    shouldBeUndefined("origin");
    2422    clearTimeout(timeoutID);
    25     isSuccessfullyParsed();
    26     if (window.layoutTestController)
    27         layoutTestController.notifyDone();
     23    finishJSTest();
    2824}
    2925
    … …  
    6157var successfullyParsed = true;
    6258</script>
     59<script src="../../../js-test-resources/js-test-post.js"></script>
    6360</body>
    6461</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength.html

    r75461 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description('Connection should fail immediately, rather than succeeding or staying in limbo until timeout, if handshake is longer than 1024 bytes.');
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone()
     13window.jsTestIsAsync = true;
    1614
    1715var timedOut = false;
    … …  
    2422    shouldBeUndefined('origin');
    2523    clearTimeout(timeoutID);
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
     24    finishJSTest();
    2925}
    3026
    … …  
    6157var successfullyParsed = true;
    6258</script>
     59<script src="../../../js-test-resources/js-test-post.js"></script>
    6360</body>
    6461</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header.html

    r80252 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test that WebSocket handshake fails if Connection header field isn't reflected by the server.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715function endTest()
    1816{
    1917    clearTimeout(timeoutID);
    20     isSuccessfullyParsed();
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
     18    finishJSTest();
    2319}
    2420
    … …  
    5248var successfullyParsed = true;
    5349</script>
     50<script src="../../../js-test-resources/js-test-post.js"></script>
    5451</body>
    5552</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description('Handshake should fail when the first line does not end with CRLF.');
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone()
     13window.jsTestIsAsync = true;
    1614
    1715var connected = false;
    … …  
    2220    shouldBeUndefined('origin');
    2321    clearTimeout(timeoutID);
    24     isSuccessfullyParsed();
    25     if (window.layoutTestController)
    26         layoutTestController.notifyDone();
     22    finishJSTest();
    2723}
    2824
    … …  
    5854var successfullyParsed = true;
    5955</script>
     56<script src="../../../js-test-resources/js-test-post.js"></script>
    6057</body>
    6158</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header.html

    r80252 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test that WebSocket handshake fails if Upgrade header field isn't reflected by the server.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715function endTest()
    1816{
    1917    clearTimeout(timeoutID);
    20     isSuccessfullyParsed();
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
     18    finishJSTest();
    2319}
    2420
    … …  
    5248var successfullyParsed = true;
    5349</script>
     50<script src="../../../js-test-resources/js-test-post.js"></script>
    5451</body>
    5552</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null.html

    r75461 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description('Connection should fail immediately, rather than succeeding or staying in limbo until timeout, if a null byte is received before the handshake.');
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone()
     13window.jsTestIsAsync = true;
    1614
    1715var timedOut = false;
    … …  
    2422    shouldBeUndefined('origin');
    2523    clearTimeout(timeoutID);
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
     24    finishJSTest();
    2925}
    3026
    … …  
    6157var successfullyParsed = true;
    6258</script>
     59<script src="../../../js-test-resources/js-test-post.js"></script>
    6360</body>
    6461</html>

  • trunk/LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test WebSocket handshake fail if sub protocol name mismatches.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var protocol;
    … …  
    2119    shouldBeUndefined("protocol");
    2220    clearTimeout(timeoutID);
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
     21    finishJSTest();
    2622}
    2723
    … …  
    5551var successfullyParsed = true;
    5652</script>
     53<script src="../../../js-test-resources/js-test-post.js"></script>
    5754</body>
    5855</html>

  • trunk/LayoutTests/http/tests/websocket/tests/long-invalid-header.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1110<script type="text/javascript">
    1211description("Make sure WebSocket gives errors on long invalid upgrade header.");
    13 if (window.layoutTestController)
    14     layoutTestController.waitUntilDone();
     12
     13window.jsTestIsAsync = true;
    1514
    1615function finish() {
    1716    clearTimeout(timeoutID);
    18 
    19     isSuccessfullyParsed();
    20     if (window.layoutTestController)
    21         layoutTestController.notifyDone();
     17    finishJSTest();
    2218}
    2319
    … …  
    3430var successfullyParsed = true;
    3531</script>
     32<script src="../../../js-test-resources/js-test-post.js"></script>
    3633</body>
    3734</html>

  • trunk/LayoutTests/http/tests/websocket/tests/null-character.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure WebSocket transfer null character");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
    16 
    17 function finish()
    18 {
    19     isSuccessfullyParsed();
    20     if (window.layoutTestController)
    21         layoutTestController.notifyDone();
    22 }
     13window.jsTestIsAsync = true;
    2314
    2415var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
    … …  
    4435{
    4536    debug("WebSocket closed");
    46     finish();
     37    finishJSTest();
    4738};
    4839
    4940var successfullyParsed = true;
    5041</script>
     42<script src="../../../js-test-resources/js-test-post.js"></script>
    5143</body>
    5244</html>

  • trunk/LayoutTests/http/tests/websocket/tests/reload-crash.html

    r68914 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if it doesn't crash when reloading while Web Socket is busy");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var frameDiv;
    1816var reloadCount = 0;
    19 
    20 function endTest()
    21 {
    22     isSuccessfullyParsed();
    23     if (window.layoutTestController)
    24         layoutTestController.notifyDone();
    25 };
    2617
    2718document.iframeReady = function ()
    … …  
    3122    if (reloadCount == 1) {
    3223       debug("PASS reloaded iframe while WebSocket is busy");
    33        endTest();
     24       finishJSTest();
    3425       return;
    3526    }
    … …  
    4435var successfullyParsed = true;
    4536</script>
    46 
     37<script src="../../../js-test-resources/js-test-post.js"></script>
    4738</body>
    4839</html>

  • trunk/LayoutTests/http/tests/websocket/tests/send-after-close-on-unload.html

    r86732 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test if Web Socket opened in iframe, referred in parent document is, and try to send() returns false.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var frameDiv;
    1816var closedSocket;
    1917document.childWebSocket = null;
    20 
    21 function endTest()
    22 {
    23     shouldBe("closedSocket", '"socket1"');
    24     shouldBe("document.childWebSocket.readyState", "3");
    25     isSuccessfullyParsed();
    26     if (window.layoutTestController)
    27         layoutTestController.notifyDone();
    28 };
    2918
    3019var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
    … …  
    4433ws.onclose = function()
    4534{
    46     endTest();
     35    shouldBe("closedSocket", '"socket1"');
     36    shouldBe("document.childWebSocket.readyState", "3");
     37    finishJSTest();
    4738};
    4839
    … …  
    5748var successfullyParsed = true;
    5849</script>
    59 
     50<script src="../../../js-test-resources/js-test-post.js"></script>
    6051</body>
    6152</html>

  • trunk/LayoutTests/http/tests/websocket/tests/send-throw.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Web Socket send test");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715function endTest()
    1816{
    19     isSuccessfullyParsed();
    2017    clearTimeout(timeoutID);
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
     18    finishJSTest();
    2319}
    2420
    … …  
    5854var successfullyParsed = true;
    5955</script>
     56<script src="../../../js-test-resources/js-test-post.js"></script>
    6057</body>
    6158</html>

  • trunk/LayoutTests/http/tests/websocket/tests/send.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Web Socket send test");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715function endTest()
    1816{
    19     isSuccessfullyParsed();
    2017    clearTimeout(timeoutID);
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
     18    finishJSTest();
    2319}
    2420
    … …  
    6561var successfullyParsed = true;
    6662</script>
     63<script src="../../../js-test-resources/js-test-post.js"></script>
    6764</body>
    6865</html>

  • trunk/LayoutTests/http/tests/websocket/tests/simple.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Simple Web Socket test");
    1312
    14 if (window.layoutTestController) {
    15     layoutTestController.waitUntilDone();
    16 }
     13window.jsTestIsAsync = true;
    1714
    1815function endTest()
    1916{
    20     isSuccessfullyParsed();
    2117    clearTimeout(timeoutID);
    22     if (window.layoutTestController) {
    23         layoutTestController.notifyDone();
    24     }
     18    finishJSTest();
    2519}
    2620
    … …  
    5448var successfullyParsed = true;
    5549</script>
     50<script src="../../../js-test-resources/js-test-post.js"></script>
    5651</body>
    5752</html>

  • trunk/LayoutTests/http/tests/websocket/tests/sub-protocol-with-space.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test WebSocket handshake success with sub protocol contains space.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var protocol;
    … …  
    2018{
    2119    shouldBe("protocol", '"sub protocol"');
    22     clearTimeout(timeoutID);
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
     20    finishJSTest();
    2621}
    2722
    … …  
    5550var successfullyParsed = true;
    5651</script>
     52<script src="../../../js-test-resources/js-test-post.js"></script>
    5753</body>
    5854</html>

  • trunk/LayoutTests/http/tests/websocket/tests/sub-protocol.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test WebSocket handshake success with sub protocol.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var protocol;
    … …  
    2018{
    2119    shouldBe("protocol", '"sub-protocol"');
    22     clearTimeout(timeoutID);
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
     20    finishJSTest();
    2621}
    2722
    … …  
    5550var successfullyParsed = true;
    5651</script>
     52<script src="../../../js-test-resources/js-test-post.js"></script>
    5753</body>
    5854</html>

  • trunk/LayoutTests/http/tests/websocket/tests/unicode.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Web Socket unicode message test");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715function endTest()
    1816{
    19     isSuccessfullyParsed();
    2017    clearTimeout(timeoutID);
    21     if (window.layoutTestController)
    22         layoutTestController.notifyDone();
     18    finishJSTest();
    2319}
    2420
    … …  
    6359var successfullyParsed = true;
    6460</script>
     61<script src="../../../js-test-resources/js-test-post.js"></script>
    6562</body>
    6663</html>

  • trunk/LayoutTests/http/tests/websocket/tests/url-no-trailing-slash.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("URL that doesn't have trailing slash should not emit empty Request-URI.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var url = "ws://127.0.0.1:8880";
    1816var handshake_success = false;
    1917var ws_location;
    20 
    21 function endTest()
    22 {
    23     shouldBeTrue("handshake_success");
    24     shouldBe("ws_location", '"ws://127.0.0.1:8880/"');
    25     isSuccessfullyParsed();
    26     if (window.layoutTestController)
    27         layoutTestController.notifyDone();
    28 }
    29 
    3018
    3119var ws = new WebSocket(url);
    … …  
    4129ws.onclose = function () {
    4230    debug("WebSocket is closed");
    43     endTest();
     31    shouldBeTrue("handshake_success");
     32    shouldBe("ws_location", '"ws://127.0.0.1:8880/"');
     33    finishJSTest();
    4434};
    4535
    4636var successfullyParsed = true;
    4737</script>
     38<script src="../../../js-test-resources/js-test-post.js"></script>
    4839</body>
    4940</html>

  • trunk/LayoutTests/http/tests/websocket/tests/url-parsing.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    3736
    3837var successfullyParsed = true;
    39 isSuccessfullyParsed();
    4038</script>
     39<script src="../../../js-test-resources/js-test-post.js"></script>
    4140</body>
    4241</html>

  • trunk/LayoutTests/http/tests/websocket/tests/url-with-credential.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure handshake with URL with credentail info success.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var url = "ws://user:pass@127.0.0.1:8880/websocket/tests/echo-location";
    … …  
    2422    shouldBeTrue("handshake_success");
    2523    shouldBe("ws_location", '"ws://127.0.0.1:8880/websocket/tests/echo-location"');
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
     24    finishJSTest();
    2925}
    3026
    … …  
    4844var successfullyParsed = true;
    4945</script>
     46<script src="../../../js-test-resources/js-test-post.js"></script>
    5047</body>
    5148</html>

  • trunk/LayoutTests/http/tests/websocket/tests/url-with-empty-query.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure handshake with URL with empty query components success.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var url = "ws://127.0.0.1:8880/websocket/tests/echo-location?";
    … …  
    2422    shouldBeTrue("handshake_success");
    2523    shouldBe("ws_location", "url");
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
     24    finishJSTest();
    2925}
    3026
    … …  
    4844var successfullyParsed = true;
    4945</script>
     46<script src="../../../js-test-resources/js-test-post.js"></script>
    5047</body>
    5148</html>

  • trunk/LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure handshake with URL with query components fails against server that doesn't support query component.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var url = "ws://127.0.0.1:8880/websocket/tests/no-query?";
    … …  
    2422    shouldBeFalse("handshake_success");
    2523    shouldBeUndefined("ws_location");
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
     24    finishJSTest();
    2925}
    3026
    … …  
    4844var successfullyParsed = true;
    4945</script>
     46<script src="../../../js-test-resources/js-test-post.js"></script>
    5047</body>
    5148</html>

  • trunk/LayoutTests/http/tests/websocket/tests/url-with-query.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Make sure handshake with URL with query components success.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var url = "ws://127.0.0.1:8880/websocket/tests/echo-location?q=v";
    … …  
    2422    shouldBeTrue("handshake_success");
    2523    shouldBe("ws_location", "url");
    26     isSuccessfullyParsed();
    27     if (window.layoutTestController)
    28         layoutTestController.notifyDone();
     24    finishJSTest();
    2925}
    3026
    … …  
    4844var successfullyParsed = true;
    4945</script>
     46<script src="../../../js-test-resources/js-test-post.js"></script>
    5047</body>
    5148</html>

  • trunk/LayoutTests/http/tests/websocket/tests/websocket-event-target.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    6564
    6665var successfullyParsed = true;
    67 isSuccessfullyParsed();
    6866</script>
     67<script src="../../../js-test-resources/js-test-post.js"></script>
    6968</body>
    7069</html>

  • trunk/LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored.html

    r90100 r90354  
    44<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
    55<script src="../../../js-test-resources/js-test-pre.js"></script>
    6 <script src="../../../js-test-resources/js-test-post-function.js"></script>
    76</head>
    87<body>
    … …  
    1211description("Test WebSocket handshake success without protocol and ignore WebSocket-Protocol from server.");
    1312
    14 if (window.layoutTestController)
    15     layoutTestController.waitUntilDone();
     13window.jsTestIsAsync = true;
    1614
    1715var protocol;
    … …  
    2119    shouldBe("protocol", '"sub-protocol"');
    2220    clearTimeout(timeoutID);
    23     isSuccessfullyParsed();
    24     if (window.layoutTestController)
    25         layoutTestController.notifyDone();
     21    finishJSTest();
    2622}
    2723
    … …  
    5551var successfullyParsed = true;
    5652</script>
     53<script src="../../../js-test-resources/js-test-post.js"></script>
    5754</body>
    5855</html>
Note: See TracChangeset for help on using the changeset viewer.