refactor(cli/tests/unit) to use assertThrows (#6459)

1 files changed, 20 insertions, 32 deletions

diff --git a/cli/tests/unit/net_test.ts b/cli/tests/unit/net_test.ts
index bd0e489b5..e970f0360 100644
--- a/cli/tests/unit/net_test.ts
+++ b/cli/tests/unit/net_test.ts
@@ -3,6 +3,8 @@ import {
   unitTest,
   assert,
   assertEquals,
+  assertThrows,
+  assertThrowsAsync,
   createResolvable,
   assertNotEquals,
 } from "./test_util.ts";
@@ -71,15 +73,13 @@ unitTest(
     const listener = Deno.listen({ port: 4501 });
     const p = listener.accept();
     listener.close();
-    let err;
-    try {
-      await p;
-    } catch (e) {
-      err = e;
-    }
-    assert(!!err);
-    assert(err instanceof Error);
-    assertEquals(err.message, "Listener has been closed");
+    await assertThrowsAsync(
+      async (): Promise<void> => {
+        await p;
+      },
+      Deno.errors.BadResource,
+      "Listener has been closed"
+    );
   }
 );
 
@@ -93,15 +93,13 @@ unitTest(
     });
     const p = listener.accept();
     listener.close();
-    let err;
-    try {
-      await p;
-    } catch (e) {
-      err = e;
-    }
-    assert(!!err);
-    assert(err instanceof Error);
-    assertEquals(err.message, "Listener has been closed");
+    await assertThrowsAsync(
+      async (): Promise<void> => {
+        await p;
+      },
+      Deno.errors.BadResource,
+      "Listener has been closed"
+    );
   }
 );
 
@@ -458,14 +456,9 @@ unitTest(
     assertEquals(2, buf[1]);
     assertEquals(3, buf[2]);
     // Check write should be closed
-    let err;
-    try {
+    await assertThrowsAsync(async () => {
       await conn.write(new Uint8Array([1, 2, 3]));
-    } catch (e) {
-      err = e;
-    }
-    assert(!!err);
-    assert(err instanceof Deno.errors.BrokenPipe);
+    }, Deno.errors.BrokenPipe);
     closeDeferred.resolve();
     listener.close();
     conn.close();
@@ -488,15 +481,10 @@ unitTest(
     });
     const conn = await Deno.connect(addr);
     conn.closeWrite(); // closing write
-    let err;
-    try {
+    assertThrows(() => {
       // Duplicated close should throw error
       conn.closeWrite();
-    } catch (e) {
-      err = e;
-    }
-    assert(!!err);
-    assert(err instanceof Deno.errors.NotConnected);
+    }, Deno.errors.NotConnected);
     closeDeferred.resolve();
     listener.close();
     conn.close();