diff options
Diffstat (limited to 'cli/js/tests')
-rw-r--r-- | cli/js/tests/dispatch_json_test.ts | 2 | ||||
-rw-r--r-- | cli/js/tests/dispatch_minimal_test.ts | 2 | ||||
-rw-r--r-- | cli/js/tests/event_target_test.ts | 4 | ||||
-rw-r--r-- | cli/js/tests/files_test.ts | 6 | ||||
-rw-r--r-- | cli/js/tests/process_test.ts | 4 | ||||
-rw-r--r-- | cli/js/tests/read_link_test.ts | 4 | ||||
-rw-r--r-- | cli/js/tests/signal_test.ts | 4 | ||||
-rw-r--r-- | cli/js/tests/stat_test.ts | 28 | ||||
-rw-r--r-- | cli/js/tests/test_util.ts | 2 | ||||
-rw-r--r-- | cli/js/tests/timers_test.ts | 6 | ||||
-rw-r--r-- | cli/js/tests/tls_test.ts | 37 |
11 files changed, 40 insertions, 59 deletions
diff --git a/cli/js/tests/dispatch_json_test.ts b/cli/js/tests/dispatch_json_test.ts index a2306dda8..4e95b86a2 100644 --- a/cli/js/tests/dispatch_json_test.ts +++ b/cli/js/tests/dispatch_json_test.ts @@ -19,7 +19,7 @@ unitTest( } ); -unitTest(async function malformedJsonControlBuffer(): Promise<void> { +unitTest(function malformedJsonControlBuffer(): void { // @ts-ignore const opId = Deno.core.ops()["op_open"]; // @ts-ignore diff --git a/cli/js/tests/dispatch_minimal_test.ts b/cli/js/tests/dispatch_minimal_test.ts index 724a41698..60bb620db 100644 --- a/cli/js/tests/dispatch_minimal_test.ts +++ b/cli/js/tests/dispatch_minimal_test.ts @@ -25,7 +25,7 @@ unitTest(async function sendAsyncStackTrace(): Promise<void> { } }); -unitTest(async function malformedMinimalControlBuffer(): Promise<void> { +unitTest(function malformedMinimalControlBuffer(): void { // @ts-ignore const readOpId = Deno.core.ops()["op_read"]; // @ts-ignore diff --git a/cli/js/tests/event_target_test.ts b/cli/js/tests/event_target_test.ts index 09d47f704..020db1acd 100644 --- a/cli/js/tests/event_target_test.ts +++ b/cli/js/tests/event_target_test.ts @@ -185,7 +185,7 @@ unitTest(function eventTargetShouldAcceptAsyncFunction(): void { const event = new Event("foo", { bubbles: true, cancelable: false }); let callCount = 0; - const listener = async (e: Event): Promise<void> => { + const listener = (e: Event): void => { assertEquals(e, event); ++callCount; }; @@ -210,7 +210,7 @@ unitTest( let callCount = 0; const listener = { - async handleEvent(e: Event): Promise<void> { + handleEvent(e: Event): void { assertEquals(e, event); ++callCount; } diff --git a/cli/js/tests/files_test.ts b/cli/js/tests/files_test.ts index b087d7398..39af460b8 100644 --- a/cli/js/tests/files_test.ts +++ b/cli/js/tests/files_test.ts @@ -51,16 +51,16 @@ unitTest(async function readerToAsyncIterator(): Promise<void> { constructor(private readonly s: string) {} - async read(p: Uint8Array): Promise<number | Deno.EOF> { + read(p: Uint8Array): Promise<number | Deno.EOF> { const n = Math.min(p.byteLength, this.buf.byteLength - this.offset); p.set(this.buf.slice(this.offset, this.offset + n)); this.offset += n; if (n === 0) { - return Deno.EOF; + return Promise.resolve(Deno.EOF); } - return n; + return Promise.resolve(n); } } diff --git a/cli/js/tests/process_test.ts b/cli/js/tests/process_test.ts index 77c3065eb..e2da6cab5 100644 --- a/cli/js/tests/process_test.ts +++ b/cli/js/tests/process_test.ts @@ -359,9 +359,7 @@ if (Deno.build.os !== "win") { p.close(); }); - unitTest({ perms: { run: true } }, async function killFailed(): Promise< - void - > { + unitTest({ perms: { run: true } }, function killFailed(): void { const p = run({ args: ["python", "-c", "from time import sleep; sleep(10000)"] }); diff --git a/cli/js/tests/read_link_test.ts b/cli/js/tests/read_link_test.ts index 409f37110..156b31070 100644 --- a/cli/js/tests/read_link_test.ts +++ b/cli/js/tests/read_link_test.ts @@ -18,9 +18,7 @@ unitTest( } ); -unitTest({ perms: { read: false } }, async function readlinkSyncPerm(): Promise< - void -> { +unitTest({ perms: { read: false } }, function readlinkSyncPerm(): void { let caughtError = false; try { Deno.readlinkSync("/symlink"); diff --git a/cli/js/tests/signal_test.ts b/cli/js/tests/signal_test.ts index e4339e290..c966e696b 100644 --- a/cli/js/tests/signal_test.ts +++ b/cli/js/tests/signal_test.ts @@ -15,7 +15,7 @@ function defer(n: number): Promise<void> { unitTest( { ignore: Deno.build.os !== "win" }, - async function signalsNotImplemented(): Promise<void> { + function signalsNotImplemented(): void { assertThrows( () => { Deno.signal(1); @@ -162,7 +162,7 @@ unitTest( unitTest( { ignore: Deno.build.os === "win", perms: { run: true } }, - async function signalShorthandsTest(): Promise<void> { + function signalShorthandsTest(): void { let s: Deno.SignalStream; s = Deno.signals.alarm(); // for SIGALRM assert(s instanceof Deno.SignalStream); diff --git a/cli/js/tests/stat_test.ts b/cli/js/tests/stat_test.ts index e51204b6e..78582900e 100644 --- a/cli/js/tests/stat_test.ts +++ b/cli/js/tests/stat_test.ts @@ -3,9 +3,7 @@ import { unitTest, assert, assertEquals } from "./test_util.ts"; // TODO Add tests for modified, accessed, and created fields once there is a way // to create temp files. -unitTest({ perms: { read: true } }, async function statSyncSuccess(): Promise< - void -> { +unitTest({ perms: { read: true } }, function statSyncSuccess(): void { const packageInfo = Deno.statSync("README.md"); assert(packageInfo.isFile()); assert(!packageInfo.isSymlink()); @@ -19,9 +17,7 @@ unitTest({ perms: { read: true } }, async function statSyncSuccess(): Promise< assert(!testsInfo.isSymlink()); }); -unitTest({ perms: { read: false } }, async function statSyncPerm(): Promise< - void -> { +unitTest({ perms: { read: false } }, function statSyncPerm(): void { let caughtError = false; try { Deno.statSync("README.md"); @@ -32,9 +28,7 @@ unitTest({ perms: { read: false } }, async function statSyncPerm(): Promise< assert(caughtError); }); -unitTest({ perms: { read: true } }, async function statSyncNotFound(): Promise< - void -> { +unitTest({ perms: { read: true } }, function statSyncNotFound(): void { let caughtError = false; let badInfo; @@ -49,9 +43,7 @@ unitTest({ perms: { read: true } }, async function statSyncNotFound(): Promise< assertEquals(badInfo, undefined); }); -unitTest({ perms: { read: true } }, async function lstatSyncSuccess(): Promise< - void -> { +unitTest({ perms: { read: true } }, function lstatSyncSuccess(): void { const packageInfo = Deno.lstatSync("README.md"); assert(packageInfo.isFile()); assert(!packageInfo.isSymlink()); @@ -65,9 +57,7 @@ unitTest({ perms: { read: true } }, async function lstatSyncSuccess(): Promise< assert(!coreInfo.isSymlink()); }); -unitTest({ perms: { read: false } }, async function lstatSyncPerm(): Promise< - void -> { +unitTest({ perms: { read: false } }, function lstatSyncPerm(): void { let caughtError = false; try { Deno.lstatSync("README.md"); @@ -78,9 +68,7 @@ unitTest({ perms: { read: false } }, async function lstatSyncPerm(): Promise< assert(caughtError); }); -unitTest({ perms: { read: true } }, async function lstatSyncNotFound(): Promise< - void -> { +unitTest({ perms: { read: true } }, function lstatSyncNotFound(): void { let caughtError = false; let badInfo; @@ -185,7 +173,7 @@ unitTest({ perms: { read: true } }, async function lstatNotFound(): Promise< unitTest( { ignore: Deno.build.os !== "win", perms: { read: true, write: true } }, - async function statNoUnixFields(): Promise<void> { + function statNoUnixFields(): void { const enc = new TextEncoder(); const data = enc.encode("Hello"); const tempDir = Deno.makeTempDirSync(); @@ -206,7 +194,7 @@ unitTest( unitTest( { ignore: Deno.build.os === "win", perms: { read: true, write: true } }, - async function statUnixFields(): Promise<void> { + function statUnixFields(): void { const enc = new TextEncoder(); const data = enc.encode("Hello"); const tempDir = Deno.makeTempDirSync(); diff --git a/cli/js/tests/test_util.ts b/cli/js/tests/test_util.ts index 42301cf72..980d32bac 100644 --- a/cli/js/tests/test_util.ts +++ b/cli/js/tests/test_util.ts @@ -328,7 +328,7 @@ unitTest(function permissionsMatches(): void { */ unitTest( { perms: { read: true } }, - async function assertAllUnitTestFilesImported(): Promise<void> { + function assertAllUnitTestFilesImported(): void { const directoryTestFiles = Deno.readdirSync("./cli/js/tests/") .map(k => k.name) .filter( diff --git a/cli/js/tests/timers_test.ts b/cli/js/tests/timers_test.ts index 077e27ae6..b7da6a847 100644 --- a/cli/js/tests/timers_test.ts +++ b/cli/js/tests/timers_test.ts @@ -27,7 +27,7 @@ function deferred(): { }; } -async function waitForMs(ms: number): Promise<number> { +function waitForMs(ms: number): Promise<number> { return new Promise((resolve: () => void): number => setTimeout(resolve, ms)); } @@ -158,7 +158,7 @@ unitTest(async function intervalOrdering(): Promise<void> { assertEquals(timeouts, 1); }); -unitTest(async function intervalCancelInvalidSilentFail(): Promise<void> { +unitTest(function intervalCancelInvalidSilentFail(): void { // Should silently fail (no panic) clearInterval(2147483647); }); @@ -234,7 +234,7 @@ unitTest(async function timeoutBindThis(): Promise<void> { } }); -unitTest(async function clearTimeoutShouldConvertToNumber(): Promise<void> { +unitTest(function clearTimeoutShouldConvertToNumber(): void { let called = false; const obj = { valueOf(): number { diff --git a/cli/js/tests/tls_test.ts b/cli/js/tests/tls_test.ts index b405a94dd..20dd62f9b 100644 --- a/cli/js/tests/tls_test.ts +++ b/cli/js/tests/tls_test.ts @@ -39,7 +39,7 @@ unitTest(async function connectTLSCertFileNoReadPerm(): Promise<void> { unitTest( { perms: { read: true, net: true } }, - async function listenTLSNonExistentCertKeyFiles(): Promise<void> { + function listenTLSNonExistentCertKeyFiles(): void { let err; const options = { hostname: "localhost", @@ -70,30 +70,27 @@ unitTest( } ); -unitTest( - { perms: { net: true } }, - async function listenTLSNoReadPerm(): Promise<void> { - let err; - try { - Deno.listenTLS({ - hostname: "localhost", - port: 4500, - certFile: "cli/tests/tls/localhost.crt", - keyFile: "cli/tests/tls/localhost.key" - }); - } catch (e) { - err = e; - } - assert(err instanceof Deno.errors.PermissionDenied); - assertEquals(err.name, "PermissionDenied"); +unitTest({ perms: { net: true } }, function listenTLSNoReadPerm(): void { + let err; + try { + Deno.listenTLS({ + hostname: "localhost", + port: 4500, + certFile: "cli/tests/tls/localhost.crt", + keyFile: "cli/tests/tls/localhost.key" + }); + } catch (e) { + err = e; } -); + assert(err instanceof Deno.errors.PermissionDenied); + assertEquals(err.name, "PermissionDenied"); +}); unitTest( { perms: { read: true, write: true, net: true } }, - async function listenTLSEmptyKeyFile(): Promise<void> { + function listenTLSEmptyKeyFile(): void { let err; const options = { hostname: "localhost", @@ -122,7 +119,7 @@ unitTest( unitTest( { perms: { read: true, write: true, net: true } }, - async function listenTLSEmptyCertFile(): Promise<void> { + function listenTLSEmptyCertFile(): void { let err; const options = { hostname: "localhost", |