Convert WebSocket tests to .any.js format

Fixes #2557.
web-platform-tests · Mar 15, 2017 · e3f3b63 · e3f3b63
1 parent e48dd15
commit e3f3b63
Show file tree

Hide file tree

Showing 92 changed files with 191 additions and 1,196 deletions.
diff --git a/websockets/Close-1000-reason.htm → websockets/Close-1000-reason.any.js b/websockets/Close-1000-reason.htm → websockets/Close-1000-reason.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Close WebSocket - Code is 1000 and reason</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - Connection should be opened");
         var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
@@ -28,8 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be TRUE");
             testClose.done();
         }), true);
-
-    </script>
-
-</body>
-</html>
diff --git a/websockets/Close-1000.htm → websockets/Close-1000.any.js b/websockets/Close-1000.htm → websockets/Close-1000.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Close WebSocket - Code is 1000</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create WebSocket - Connection should be opened");
         var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
@@ -28,8 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be TRUE");
             testClose.done();
         }), true);
-
-    </script>
-
-</body>
-</html>
diff --git a/websockets/Close-Reason-124Bytes.htm → websockets/Close-Reason-124Bytes.any.js b/websockets/Close-Reason-124Bytes.htm → websockets/Close-Reason-124Bytes.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Close WebSocket - Reason is more than 123 bytes long</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown");
 
@@ -21,7 +11,3 @@
             assert_throws("SYNTAX_ERR", function () { wsocket.close(1000, reason) });
             test.done();
         }), true);
-    </script>
-
-</body>
-</html>
diff --git a/...kets/Close-reason-unpaired-surrogates.htm → ...s/Close-reason-unpaired-surrogates.any.js b/...kets/Close-reason-unpaired-surrogates.htm → ...s/Close-reason-unpaired-surrogates.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Close WebSocket - Reason with unpaired surrogates</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened");
         var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed");
@@ -29,8 +19,3 @@
             assert_equals(evt.reason, replacementChar, "reason replaced with replacement character");
             testClose.done();
         }), true);
-
-    </script>
-
-</body>
-</html>
diff --git a/websockets/Close-undefined.any.js b/websockets/Close-undefined.any.js
@@ -0,0 +1,11 @@
+// META: script=websocket.sub.js
+
+        var test = async_test();
+
+        var wsocket = CreateWebSocket(false, false, false);
+        var isOpenCalled = false;
+
+        wsocket.addEventListener('open', test.step_func(function (evt) {
+            wsocket.close(undefined);
+            test.done();
+        }), true);
diff --git a/websockets/Close-undefined.htm b/websockets/Close-undefined.htm
diff --git a/websockets/Create-Secure-blocked-port.htm → websockets/Create-Secure-blocked-port.any.js b/websockets/Create-Secure-blocked-port.htm → websockets/Create-Secure-blocked-port.any.js
@@ -1,14 +1,5 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket - blocked port</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script>
+// META: script=websocket.sub.js
+
         test(function () {
             // list of bad ports according to
             // https://fetch.spec.whatwg.org/#port-blocking
@@ -83,6 +74,3 @@
                 assert_throws("SECURITY_ERR", function () { CreateWebSocketWithBlockedPort(blockedPort) });
             }
         }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a blocked port - SECURITY_ERR should be thrown")
-    </script>
-</body>
-</html>
diff --git a/...ockets/Create-Secure-extensions-empty.htm → ...ets/Create-Secure-extensions-empty.any.js b/...ockets/Create-Secure-extensions-empty.htm → ...ets/Create-Secure-extensions-empty.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened");
         var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed");
@@ -28,6 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be true");
             testClose.done();
         }), true);
-    </script>
-</body>
-</html>
diff --git a/websockets/Create-Secure-url-with-space.any.js b/websockets/Create-Secure-url-with-space.any.js
@@ -0,0 +1,7 @@
+// META: script=websocket.sub.js
+
+        test(function () {
+            var wsocket;
+            var spaceUrl = "web platform.test";
+            assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithSpaceInUrl(spaceUrl) });
+        }, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a space - SYNTAX_ERR should be thrown")
diff --git a/websockets/Create-Secure-url-with-space.htm b/websockets/Create-Secure-url-with-space.htm
diff --git a/...eate-Secure-valid-url-array-protocols.htm → ...e-Secure-valid-url-array-protocols.any.js b/...eate-Secure-valid-url-array-protocols.htm → ...e-Secure-valid-url-array-protocols.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket with valid url and array of protocols</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened");
         var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed");
@@ -28,7 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be true");
             testClose.done();
         }), true);
-
-    </script>
-</body>
-</html>
diff --git a/...eate-Secure-valid-url-binaryType-blob.htm → ...e-Secure-valid-url-binaryType-blob.any.js b/...eate-Secure-valid-url-binaryType-blob.htm → ...e-Secure-valid-url-binaryType-blob.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket - binaryType set correctly</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened");
         var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed");
@@ -28,7 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be true");
             testClose.done();
         }), true);
-
-    </script>
-</body>
-</html>
diff --git a/...ecure-valid-url-protocol-setCorrectly.htm → ...re-valid-url-protocol-setCorrectly.any.js b/...ecure-valid-url-protocol-setCorrectly.htm → ...re-valid-url-protocol-setCorrectly.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket and verify if protocol is set correctly after connection</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
             var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened");
             var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed");
@@ -28,6 +18,3 @@
                 assert_equals(evt.wasClean, true, "wasClean should be true");
                     testClose.done();
             }), true);
-    </script>
-</body>
-</html>
diff --git a/...eate-Secure-valid-url-protocol-string.htm → ...e-Secure-valid-url-protocol-string.any.js b/...eate-Secure-valid-url-protocol-string.htm → ...e-Secure-valid-url-protocol-string.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket with valid url and protocol string</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Check readyState is 1");
         var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed");
@@ -28,7 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be true");
             testClose.done();
         }), true);
-
-    </script>
-</body>
-</html>
diff --git a/websockets/Create-Secure-valid-url.htm → websockets/Create-Secure-valid-url.any.js b/websockets/Create-Secure-valid-url.htm → websockets/Create-Secure-valid-url.any.js
@@ -1,14 +1,4 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>W3C WebSocket API - Create Secure WebSocket with valid url</title>
-    <script type="text/javascript" src="/resources/testharness.js"></script>
-    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
-    <script type="text/javascript" src="websocket.sub.js"></script>
-</head>
-<body>
-    <div id="log"></div>
-    <script type="text/javascript">
+// META: script=websocket.sub.js
 
         var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL  - Connection should be opened");
         var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed");
@@ -28,7 +18,3 @@
             assert_equals(evt.wasClean, true, "wasClean should be true");
             testClose.done();
         }), true);
-
-    </script>
-</body>
-</html>
diff --git a/websockets/Create-Secure-verify-url-set-non-default-port.any.js b/websockets/Create-Secure-verify-url-set-non-default-port.any.js
@@ -0,0 +1,7 @@
+// META: script=websocket.sub.js
+
+        test(function () {
+            var urlNonDefaultPort = "wss://" + __SERVER__NAME + ":" + __NEW__SECURE__PORT + "/" + __PATH;
+            var wsocket = new WebSocket(urlNonDefaultPort);
+            assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly");
+        }, "W3C WebSocket API - Create Secure WebSocket - wsocket.url should be set correctly")
diff --git a/websockets/Create-Secure-verify-url-set-non-default-port.htm b/websockets/Create-Secure-verify-url-set-non-default-port.htm
diff --git a/websockets/Create-asciiSep-protocol-string.any.js b/websockets/Create-asciiSep-protocol-string.any.js
@@ -0,0 +1,9 @@
+// META: script=websocket.sub.js
+
+        if(window.WebSocket) {
+            test(function () {
+                var asciiWithSep = "/echo";
+                var wsocket;
+                assert_throws("SYNTAX_ERR", function () { wsocket = CreateWebSocketWithAsciiSep(asciiWithSep) });
+            }, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with an ascii separator character - SYNTAX_ERR is thrown")
+        }
diff --git a/websockets/Create-asciiSep-protocol-string.htm b/websockets/Create-asciiSep-protocol-string.htm