Clean typed test boundary assertions

Rhys Sullivan committed 6 months ago

Commit 9352af41 parent b039b6e3 files · +37 −28Browse files

Unified · Split

3 files

packages/core/sdk/src/promise.test.ts +9 −12
packages/core/sdk/src/scoped-adapter.test.ts +10 −2
tests/daemon-bootstrap.test.ts +18 −14

packages/core/sdk/src/promise.test.ts+9−12

@@ -102,24 +102,21 @@ describe("promise/createExecutor", () => { · 101 unmodified lines
102	const ran = await executor.tools.invoke("ap.ctl.go", {});	102	const ran = await executor.tools.invoke("ap.ctl.go", {});
103	expect(ran).toBe("ran");	103	expect(ran).toBe("ran");
104		104
105	// Override with a declining handler → rejects with ElicitationDeclinedError.	105	// Override with a declining handler -> rejects with ElicitationDeclinedError.
106	// Effect.runPromise rejects with a FiberFailure that wraps the typed	106	// Effect.runPromise rejects with a FiberFailure that carries the tag in
107	// error; both `name` and `message` carry the tag.	107	// the error name.
108	let caught: unknown;	108	await expect(
109	try {	109	executor.tools.invoke(
110	await executor.tools.invoke(
111	"ap.ctl.go",	110	"ap.ctl.go",
112	{},	111	{},
113	{	112	{
114	onElicitation: () =>	113	onElicitation: () =>
115	Effect.succeed({ action: "decline" as const }) as any,	114	Effect.succeed({ action: "decline" as const }) as any,
116	},	115	},
117	);	116	),
118	} catch (e) {	117	).rejects.toMatchObject({
119	caught = e;	118	name: expect.stringMatching(/ElicitationDeclinedError/),
120	}	119	});
121	expect(caught).toBeDefined();
122	expect((caught as Error).name).toMatch(/ElicitationDeclinedError/);
123		120
124	await executor.close();	121	await executor.close();
125	});	122	});

packages/core/sdk/src/scoped-adapter.test.ts+10−2

       const reason = result.cause.reasons.find(Cause.isFailReason);
       const err = reason?.error ?? null;
       expect(err).toBeInstanceOf(StorageError);
-      expect((err as StorageError).message).toContain("not in the executor");
+      expect(err).toEqual(
+        expect.objectContaining({
+          message: expect.stringContaining("not in the executor"),
+        }),
+      );
     }),
   );
       const reason = result.cause.reasons.find(Cause.isFailReason);
       const err = reason?.error ?? null;
       expect(err).toBeInstanceOf(StorageError);
-      expect((err as StorageError).message).toContain("missing required");
+      expect(err).toEqual(
+        expect.objectContaining({
+          message: expect.stringContaining("missing required"),
+        }),
+      );
     }),
   );

tests/daemon-bootstrap.test.ts+18−14

   it("falls back when preferred daemon port is occupied", async () => {
     const blocker = createServer();
-    await new Promise<void>((resolve, reject) => {
+    await Effect.runPromise(Effect.scoped(Effect.gen(function*() {
-      blocker.once("error", reject);
+      yield* Effect.acquireRelease(
-      blocker.listen({ port: 0, host: "127.0.0.1" }, () => resolve());
+        Effect.callback<void, Error>((resume) => {
-    });
+          blocker.once("error", (error) => resume(Effect.fail(error)));
+          blocker.listen({ port: 0, host: "127.0.0.1" }, () =>
+            resume(Effect.succeed(undefined)));
+        }),
+        () => Effect.promise(() => new Promise<void>((resolve) => {
+          blocker.close(() => resolve());
+        })),
+      );
-    const occupied = (() => {
+      const occupied = (() => {
-      const address = blocker.address();
+        const address = blocker.address();
-      return typeof address === "object" && address !== null ? address.port : 0;
+        return typeof address === "object" && address !== null ? address.port : 0;
-    })();
+      })();
-    try {
+      const picked = yield* (
-      const picked = await Effect.runPromise(
         chooseDaemonPort({
           preferredPort: occupied,
           hostname: "127.0.0.1",
-        }),
+        })
       );
       expect(picked).not.toBe(occupied);
-    } finally {
+    })));
-      await new Promise<void>((resolve) => blocker.close(() => resolve()));
-    }
   });
 });