fix(test): update test imports

denodrivers · Feb 2, 2024 · 04e1872 · 04e1872
1 parent 954de25
commit 04e1872
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/tests/connection_test.ts b/tests/connection_test.ts
@@ -2,7 +2,6 @@ import {
   assertEquals,
   assertRejects,
   copyStream,
-  deferred,
   joinPath,
 } from "./test_deps.ts";
 import {
@@ -374,15 +373,15 @@ Deno.test("Closes connection on bad TLS availability verification", async functi
   );
 
   // Await for server initialization
-  const initialized = deferred();
+  const initialized = Promise.withResolvers();
   server.onmessage = ({ data }) => {
     if (data !== "initialized") {
       initialized.reject(`Unexpected message "${data}" received from worker`);
     }
-    initialized.resolve();
+    initialized.resolve(null);
   };
   server.postMessage("initialize");
-  await initialized;
+  await initialized.promise;
 
   const client = new Client({
     database: "none",
@@ -413,17 +412,17 @@ Deno.test("Closes connection on bad TLS availability verification", async functi
     await client.end();
   }
 
-  const closed = deferred();
+  const closed = Promise.withResolvers();
   server.onmessage = ({ data }) => {
     if (data !== "closed") {
       closed.reject(
         `Unexpected message "${data}" received from worker`,
       );
     }
-    closed.resolve();
+    closed.resolve(null);
   };
   server.postMessage("close");
-  await closed;
+  await closed.promise;
   server.terminate();
 
   assertEquals(bad_tls_availability_message, true);
@@ -438,15 +437,15 @@ async function mockReconnection(attempts: number) {
   );
 
   // Await for server initialization
-  const initialized = deferred();
+  const initialized = Promise.withResolvers();
   server.onmessage = ({ data }) => {
     if (data !== "initialized") {
       initialized.reject(`Unexpected message "${data}" received from worker`);
     }
-    initialized.resolve();
+    initialized.resolve(null);
   };
   server.postMessage("initialize");
-  await initialized;
+  await initialized.promise;
 
   const client = new Client({
     connection: {
@@ -483,17 +482,17 @@ async function mockReconnection(attempts: number) {
     await client.end();
   }
 
-  const closed = deferred();
+  const closed = Promise.withResolvers();
   server.onmessage = ({ data }) => {
     if (data !== "closed") {
       closed.reject(
         `Unexpected message "${data}" received from worker`,
       );
     }
-    closed.resolve();
+    closed.resolve(null);
   };
   server.postMessage("close");
-  await closed;
+  await closed.promise;
   server.terminate();
 
   // If reconnections are set to zero, it will attempt to connect at least once, but won't

diff --git a/tests/data_types_test.ts b/tests/data_types_test.ts
@@ -34,7 +34,7 @@ function generateRandomPoint(max_value = 100): Point {
 
 const CHARS = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 function randomBase64(): string {
-  return base64.encode(
+  return base64.encodeBase64(
     Array.from(
       { length: Math.ceil(Math.random() * 256) },
       () => CHARS[Math.floor(Math.random() * CHARS.length)],
@@ -671,7 +671,7 @@ Deno.test(
       `SELECT decode('${base64_string}','base64')`,
     );
 
-    assertEquals(result.rows[0][0], base64.decode(base64_string));
+    assertEquals(result.rows[0][0], base64.decodeBase64(base64_string));
   }),
 );
 
@@ -691,7 +691,7 @@ Deno.test(
 
     assertEquals(
       result.rows[0][0],
-      strings.map(base64.decode),
+      strings.map(base64.decodeBase64),
     );
   }),
 );