1 files changed, 16 insertions, 44 deletions

diff --git a/cli/tests/unit/tls_test.ts b/cli/tests/unit/tls_test.ts
index 3d071441d..5a7391e78 100644
--- a/cli/tests/unit/tls_test.ts
+++ b/cli/tests/unit/tls_test.ts
@@ -2,6 +2,8 @@
 import {
   assert,
   assertEquals,
+  assertThrows,
+  assertThrowsAsync,
   createResolvable,
   unitTest,
 } from "./test_util.ts";
@@ -12,35 +14,24 @@ const encoder = new TextEncoder();
 const decoder = new TextDecoder();
 
 unitTest(async function connectTLSNoPerm(): Promise<void> {
-  let err;
-  try {
+  await assertThrowsAsync(async () => {
     await Deno.connectTls({ hostname: "github.com", port: 443 });
-  } catch (e) {
-    err = e;
-  }
-  assert(err instanceof Deno.errors.PermissionDenied);
-  assertEquals(err.name, "PermissionDenied");
+  }, Deno.errors.PermissionDenied);
 });
 
 unitTest(async function connectTLSCertFileNoReadPerm(): Promise<void> {
-  let err;
-  try {
+  await assertThrowsAsync(async () => {
     await Deno.connectTls({
       hostname: "github.com",
       port: 443,
       certFile: "cli/tests/tls/RootCA.crt",
     });
-  } catch (e) {
-    err = e;
-  }
-  assert(err instanceof Deno.errors.PermissionDenied);
-  assertEquals(err.name, "PermissionDenied");
+  }, Deno.errors.PermissionDenied);
 });
 
 unitTest(
   { perms: { read: true, net: true } },
   function listenTLSNonExistentCertKeyFiles(): void {
-    let err;
     const options = {
       hostname: "localhost",
       port: 3500,
@@ -48,42 +39,31 @@ unitTest(
       keyFile: "cli/tests/tls/localhost.key",
     };
 
-    try {
+    assertThrows(() => {
       Deno.listenTls({
         ...options,
         certFile: "./non/existent/file",
       });
-    } catch (e) {
-      err = e;
-    }
-    assert(err instanceof Deno.errors.NotFound);
+    }, Deno.errors.NotFound);
 
-    try {
+    assertThrows(() => {
       Deno.listenTls({
         ...options,
         keyFile: "./non/existent/file",
       });
-    } catch (e) {
-      err = e;
-    }
-    assert(err instanceof Deno.errors.NotFound);
+    }, Deno.errors.NotFound);
   }
 );
 
 unitTest({ perms: { net: true } }, function listenTLSNoReadPerm(): void {
-  let err;
-  try {
+  assertThrows(() => {
     Deno.listenTls({
       hostname: "localhost",
       port: 3500,
       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");
+  }, Deno.errors.PermissionDenied);
 });
 
 unitTest(
@@ -91,7 +71,6 @@ unitTest(
     perms: { read: true, write: true, net: true },
   },
   function listenTLSEmptyKeyFile(): void {
-    let err;
     const options = {
       hostname: "localhost",
       port: 3500,
@@ -105,22 +84,18 @@ unitTest(
       mode: 0o666,
     });
 
-    try {
+    assertThrows(() => {
       Deno.listenTls({
         ...options,
         keyFile: keyFilename,
       });
-    } catch (e) {
-      err = e;
-    }
-    assert(err instanceof Error);
+    }, Error);
   }
 );
 
 unitTest(
   { perms: { read: true, write: true, net: true } },
   function listenTLSEmptyCertFile(): void {
-    let err;
     const options = {
       hostname: "localhost",
       port: 3500,
@@ -134,15 +109,12 @@ unitTest(
       mode: 0o666,
     });
 
-    try {
+    assertThrows(() => {
       Deno.listenTls({
         ...options,
         certFile: certFilename,
       });
-    } catch (e) {
-      err = e;
-    }
-    assert(err instanceof Error);
+    }, Error);
   }
 );