diff options
Diffstat (limited to 'js/net_test.ts')
| -rw-r--r-- | js/net_test.ts | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/js/net_test.ts b/js/net_test.ts index 23387001f..33f4f7d07 100644 --- a/js/net_test.ts +++ b/js/net_test.ts @@ -2,15 +2,17 @@ import { testPerm, assert, assertEquals } from "./test_util.ts"; testPerm({ net: true }, function netListenClose(): void { - const listener = Deno.listen("tcp", "127.0.0.1:4500"); + const listener = Deno.listen({ hostname: "127.0.0.1", port: 4500 }); const addr = listener.addr(); - assertEquals(addr.network, "tcp"); + assertEquals(addr.transport, "tcp"); + // TODO(ry) Replace 'address' with 'hostname' and 'port', similar to + // DialOptions and ListenOptions. assertEquals(addr.address, "127.0.0.1:4500"); listener.close(); }); testPerm({ net: true }, async function netCloseWhileAccept(): Promise<void> { - const listener = Deno.listen("tcp", ":4501"); + const listener = Deno.listen({ port: 4501 }); const p = listener.accept(); listener.close(); let err; @@ -25,7 +27,7 @@ testPerm({ net: true }, async function netCloseWhileAccept(): Promise<void> { }); testPerm({ net: true }, async function netConcurrentAccept(): Promise<void> { - const listener = Deno.listen("tcp", ":4502"); + const listener = Deno.listen({ port: 4502 }); let acceptErrCount = 0; const checkErr = (e): void => { assertEquals(e.kind, Deno.ErrorKind.Other); @@ -46,7 +48,7 @@ testPerm({ net: true }, async function netConcurrentAccept(): Promise<void> { }); testPerm({ net: true }, async function netDialListen(): Promise<void> { - const listener = Deno.listen("tcp", ":4500"); + const listener = Deno.listen({ port: 4500 }); listener.accept().then( async (conn): Promise<void> => { assert(conn.remoteAddr != null); @@ -55,7 +57,7 @@ testPerm({ net: true }, async function netDialListen(): Promise<void> { conn.close(); } ); - const conn = await Deno.dial("tcp", "127.0.0.1:4500"); + const conn = await Deno.dial({ hostname: "127.0.0.1", port: 4500 }); assertEquals(conn.remoteAddr, "127.0.0.1:4500"); assert(conn.localAddr != null); const buf = new Uint8Array(1024); @@ -77,7 +79,7 @@ testPerm({ net: true }, async function netDialListen(): Promise<void> { /* TODO(ry) Re-enable this test. testPerm({ net: true }, async function netListenAsyncIterator(): Promise<void> { - const listener = Deno.listen("tcp", ":4500"); + const listener = Deno.listen(":4500"); const runAsyncIterator = async (): Promise<void> => { for await (let conn of listener) { await conn.write(new Uint8Array([1, 2, 3])); @@ -85,7 +87,7 @@ testPerm({ net: true }, async function netListenAsyncIterator(): Promise<void> { } }; runAsyncIterator(); - const conn = await Deno.dial("tcp", "127.0.0.1:4500"); + const conn = await Deno.dial("127.0.0.1:4500"); const buf = new Uint8Array(1024); const readResult = await conn.read(buf); assertEquals(3, readResult); @@ -107,7 +109,7 @@ testPerm({ net: true }, async function netListenAsyncIterator(): Promise<void> { /* TODO Fix broken test. testPerm({ net: true }, async function netCloseReadSuccess() { const addr = "127.0.0.1:4500"; - const listener = Deno.listen("tcp", addr); + const listener = Deno.listen(addr); const closeDeferred = deferred(); const closeReadDeferred = deferred(); listener.accept().then(async conn => { @@ -122,7 +124,7 @@ testPerm({ net: true }, async function netCloseReadSuccess() { conn.close(); closeDeferred.resolve(); }); - const conn = await Deno.dial("tcp", addr); + const conn = await Deno.dial(addr); conn.closeRead(); // closing read closeReadDeferred.resolve(); const buf = new Uint8Array(1024); @@ -139,14 +141,14 @@ testPerm({ net: true }, async function netCloseReadSuccess() { /* TODO Fix broken test. testPerm({ net: true }, async function netDoubleCloseRead() { const addr = "127.0.0.1:4500"; - const listener = Deno.listen("tcp", addr); + const listener = Deno.listen(addr); const closeDeferred = deferred(); listener.accept().then(async conn => { await conn.write(new Uint8Array([1, 2, 3])); await closeDeferred.promise; conn.close(); }); - const conn = await Deno.dial("tcp", addr); + const conn = await Deno.dial(addr); conn.closeRead(); // closing read let err; try { @@ -167,14 +169,14 @@ testPerm({ net: true }, async function netDoubleCloseRead() { /* TODO Fix broken test. testPerm({ net: true }, async function netCloseWriteSuccess() { const addr = "127.0.0.1:4500"; - const listener = Deno.listen("tcp", addr); + const listener = Deno.listen(addr); const closeDeferred = deferred(); listener.accept().then(async conn => { await conn.write(new Uint8Array([1, 2, 3])); await closeDeferred.promise; conn.close(); }); - const conn = await Deno.dial("tcp", addr); + const conn = await Deno.dial(addr); conn.closeWrite(); // closing write const buf = new Uint8Array(1024); // Check read not impacted @@ -202,13 +204,13 @@ testPerm({ net: true }, async function netCloseWriteSuccess() { /* TODO Fix broken test. testPerm({ net: true }, async function netDoubleCloseWrite() { const addr = "127.0.0.1:4500"; - const listener = Deno.listen("tcp", addr); + const listener = Deno.listen(addr); const closeDeferred = deferred(); listener.accept().then(async conn => { await closeDeferred.promise; conn.close(); }); - const conn = await Deno.dial("tcp", addr); + const conn = await Deno.dial(addr); conn.closeWrite(); // closing write let err; try { |