diff options
Diffstat (limited to 'cli/tests/testdata/run')
5 files changed, 53 insertions, 59 deletions
diff --git a/cli/tests/testdata/run/tls_connecttls.js b/cli/tests/testdata/run/tls_connecttls.js index 7c03856cb..bd1d41096 100644 --- a/cli/tests/testdata/run/tls_connecttls.js +++ b/cli/tests/testdata/run/tls_connecttls.js @@ -1,4 +1,3 @@ -import { deferred } from "../../../../test_util/std/async/deferred.ts"; import { assert, assertEquals, @@ -9,7 +8,7 @@ import { TextProtoReader } from "./textproto.ts"; const encoder = new TextEncoder(); const decoder = new TextDecoder(); -const resolvable = deferred(); +const { promise, resolve } = Promise.withResolvers(); const hostname = "localhost"; const port = 3505; @@ -32,7 +31,7 @@ listener.accept().then( // TODO(bartlomieju): this might be a bug setTimeout(() => { conn.close(); - resolvable.resolve(); + resolve(); }, 0); }, ); @@ -65,6 +64,6 @@ await r.readFull(bodyBuf); assertEquals(decoder.decode(bodyBuf), "Hello World\n"); conn.close(); listener.close(); -await resolvable; +await promise; console.log("DONE"); diff --git a/cli/tests/testdata/run/tls_starttls.js b/cli/tests/testdata/run/tls_starttls.js index ecf344211..4acc21461 100644 --- a/cli/tests/testdata/run/tls_starttls.js +++ b/cli/tests/testdata/run/tls_starttls.js @@ -1,4 +1,3 @@ -import { deferred } from "../../../../test_util/std/async/deferred.ts"; import { assert, assertEquals, @@ -10,7 +9,7 @@ import { TextProtoReader } from "./textproto.ts"; const encoder = new TextEncoder(); const decoder = new TextDecoder(); -const resolvable = deferred(); +const { promise, resolve } = Promise.withResolvers(); const hostname = "localhost"; const port = 3504; @@ -33,7 +32,7 @@ listener.accept().then( // TODO(bartlomieju): this might be a bug setTimeout(() => { conn.close(); - resolvable.resolve(); + resolve(); }, 0); }, ); @@ -64,6 +63,6 @@ await r.readFull(bodyBuf); assertEquals(decoder.decode(bodyBuf), "Hello World\n"); conn.close(); listener.close(); -await resolvable; +await promise; console.log("DONE"); diff --git a/cli/tests/testdata/run/websocket_server_idletimeout.ts b/cli/tests/testdata/run/websocket_server_idletimeout.ts index 211b5f6ea..b99c1a61f 100644 --- a/cli/tests/testdata/run/websocket_server_idletimeout.ts +++ b/cli/tests/testdata/run/websocket_server_idletimeout.ts @@ -1,8 +1,7 @@ import { assertEquals } from "../../../../test_util/std/testing/asserts.ts"; -import { deferred } from "../../../../test_util/std/async/deferred.ts"; -const errorDeferred = deferred(); -const closeDeferred = deferred(); +const errorDeferred = Promise.withResolvers<void>(); +const closeDeferred = Promise.withResolvers<void>(); const listener = Deno.listen({ port: 4509 }); console.log("READY"); @@ -21,6 +20,6 @@ socket.onclose = (e) => { }; await respondWith(response); -await errorDeferred; -await closeDeferred; +await errorDeferred.promise; +await closeDeferred.promise; listener.close(); diff --git a/cli/tests/testdata/run/websocket_server_multi_field_connection_header_test.ts b/cli/tests/testdata/run/websocket_server_multi_field_connection_header_test.ts index 709419a6a..d94709767 100644 --- a/cli/tests/testdata/run/websocket_server_multi_field_connection_header_test.ts +++ b/cli/tests/testdata/run/websocket_server_multi_field_connection_header_test.ts @@ -1,6 +1,4 @@ -import { deferred } from "../../unit/test_util.ts"; - -const promise = deferred(); +const { promise, resolve } = Promise.withResolvers<void>(); const listener = Deno.listen({ port: 4319 }); console.log("READY"); const conn = await listener.accept(); @@ -12,6 +10,6 @@ const { } = Deno.upgradeWebSocket(request); socket.onerror = () => Deno.exit(1); socket.onopen = () => socket.close(); -socket.onclose = () => promise.resolve(); +socket.onclose = () => resolve(); await respondWith(response); await promise; diff --git a/cli/tests/testdata/run/websocket_test.ts b/cli/tests/testdata/run/websocket_test.ts index 74a369d55..c534db99f 100644 --- a/cli/tests/testdata/run/websocket_test.ts +++ b/cli/tests/testdata/run/websocket_test.ts @@ -5,7 +5,6 @@ import { assertThrows, fail, } from "../../../../test_util/std/testing/asserts.ts"; -import { deferred } from "../../../../test_util/std/async/deferred.ts"; Deno.test("invalid scheme", () => { assertThrows(() => new WebSocket("foo://localhost:4242")); @@ -21,7 +20,7 @@ Deno.test("duplicate protocols", () => { }); Deno.test("invalid server", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:2121"); let err = false; ws.onerror = () => { @@ -29,7 +28,7 @@ Deno.test("invalid server", async () => { }; ws.onclose = () => { if (err) { - promise.resolve(); + resolve(); } else { fail(); } @@ -39,20 +38,20 @@ Deno.test("invalid server", async () => { }); Deno.test("connect & close", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.onerror = () => fail(); ws.onopen = () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("connect & abort", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.close(); let err = false; @@ -61,7 +60,7 @@ Deno.test("connect & abort", async () => { }; ws.onclose = () => { if (err) { - promise.resolve(); + resolve(); } else { fail(); } @@ -71,18 +70,18 @@ Deno.test("connect & abort", async () => { }); Deno.test("connect & close custom valid code", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.onerror = () => fail(); ws.onopen = () => ws.close(1000); ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("connect & close custom invalid code", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.onerror = () => fail(); ws.onopen = () => { @@ -90,24 +89,24 @@ Deno.test("connect & close custom invalid code", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("connect & close custom valid reason", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.onerror = () => fail(); ws.onopen = () => ws.close(1000, "foo"); ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("connect & close custom invalid reason", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.onerror = () => fail(); ws.onopen = () => { @@ -115,13 +114,13 @@ Deno.test("connect & close custom invalid reason", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo string", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.onerror = () => fail(); ws.onopen = () => ws.send("foo"); @@ -130,31 +129,31 @@ Deno.test("echo string", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo string tls", async () => { - const promise1 = deferred(); - const promise2 = deferred(); + const deferred1 = Promise.withResolvers<void>(); + const deferred2 = Promise.withResolvers<void>(); const ws = new WebSocket("wss://localhost:4243"); ws.onerror = () => fail(); ws.onopen = () => ws.send("foo"); ws.onmessage = (e) => { assertEquals(e.data, "foo"); ws.close(); - promise1.resolve(); + deferred1.resolve(); }; ws.onclose = () => { - promise2.resolve(); + deferred2.resolve(); }; - await promise1; - await promise2; + await deferred1.promise; + await deferred2.promise; }); Deno.test("websocket error", async () => { - const promise1 = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("wss://localhost:4242"); ws.onopen = () => fail(); ws.onerror = (err) => { @@ -163,13 +162,13 @@ Deno.test("websocket error", async () => { err.message, "NetworkError: failed to connect to WebSocket: received corrupt message of type InvalidContentType", ); - promise1.resolve(); + resolve(); }; - await promise1; + await promise; }); Deno.test("echo blob with binaryType blob", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); const blob = new Blob(["foo"]); ws.onerror = () => fail(); @@ -183,13 +182,13 @@ Deno.test("echo blob with binaryType blob", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo blob with binaryType arraybuffer", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.binaryType = "arraybuffer"; const blob = new Blob(["foo"]); @@ -202,13 +201,13 @@ Deno.test("echo blob with binaryType arraybuffer", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo uint8array with binaryType blob", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); const uint = new Uint8Array([102, 111, 111]); ws.onerror = () => fail(); @@ -220,13 +219,13 @@ Deno.test("echo uint8array with binaryType blob", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo uint8array with binaryType arraybuffer", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.binaryType = "arraybuffer"; const uint = new Uint8Array([102, 111, 111]); @@ -237,13 +236,13 @@ Deno.test("echo uint8array with binaryType arraybuffer", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo arraybuffer with binaryType blob", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); const buffer = new ArrayBuffer(3); ws.onerror = () => fail(); @@ -255,13 +254,13 @@ Deno.test("echo arraybuffer with binaryType blob", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("echo arraybuffer with binaryType arraybuffer", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); ws.binaryType = "arraybuffer"; const buffer = new ArrayBuffer(3); @@ -272,13 +271,13 @@ Deno.test("echo arraybuffer with binaryType arraybuffer", async () => { ws.close(); }; ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("Event Handlers order", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4242"); const arr: number[] = []; ws.onerror = () => fail(); @@ -292,18 +291,18 @@ Deno.test("Event Handlers order", async () => { ws.onmessage = () => arr.push(2); ws.onopen = () => ws.send("Echo"); ws.onclose = () => { - promise.resolve(); + resolve(); }; await promise; }); Deno.test("Close without frame", async () => { - const promise = deferred(); + const { promise, resolve } = Promise.withResolvers<void>(); const ws = new WebSocket("ws://localhost:4244"); ws.onerror = () => fail(); ws.onclose = (e) => { assertEquals(e.code, 1005); - promise.resolve(); + resolve(); }; await promise; }); |