test: bedrock test mock consistency and deprecated event listener

Author: jpr5

src/__tests__/bedrock-stream.test.ts

@@ -187,9 +187,6 @@ function postPartialBinary(
         res.on("error", () => {
           aborted = true;
         });
-        res.on("aborted", () => {
-          aborted = true;
-        });
         res.on("close", () => {
           safeResolve({ body: Buffer.concat(chunks), aborted });
         });
@@ -1747,7 +1744,7 @@ describe("converseToCompletionRequest (edge cases)", () => {
       },
       "model",
     );
-    expect(result.messages[0]).toEqual({ role: "assistant", content: "" });
+    expect(result.messages[0]).toEqual({ role: "assistant", content: null });
   });
 
   it("handles user tool result with missing text in content items (text ?? '' fallback)", () => {
@@ -1859,8 +1856,8 @@ describe("converseToCompletionRequest (edge cases)", () => {
       "model",
     );
     expect(result.messages[0].tool_calls).toHaveLength(1);
-    // Empty text → content is "" (nullish coalescing preserves empty string)
-    expect(result.messages[0].content).toBe("");
+    // Empty text → content is null (|| coerces empty string to null)
+    expect(result.messages[0].content).toBe(null);
   });
 });
 

src/__tests__/bedrock.test.ts

@@ -751,8 +751,8 @@ describe("bedrockToCompletionRequest (edge cases)", () => {
       },
       "model",
     );
-    // Empty array → no tool_use blocks, textContent is "" → preserved as "" (not coerced to null via ??)
-    expect(result.messages[0]).toEqual({ role: "assistant", content: "" });
+    // Empty array → no tool_use blocks, textContent is "" → coerced to null via ||
+    expect(result.messages[0]).toEqual({ role: "assistant", content: null });
   });
 
   it("handles user message with content blocks but no tool_results (text extraction)", () => {
@@ -1650,31 +1650,8 @@ describe("Bedrock webSearches warning", () => {
       response: { content: "Result.", webSearches: ["test"] },
     };
     const journal = new Journal();
-    const req = {
-      method: undefined,
-      url: undefined,
-      headers: {},
-    } as unknown as http.IncomingMessage;
-    const res = {
-      _written: "",
-      writableEnded: false,
-      statusCode: 0,
-      writeHead(s: number) {
-        this.statusCode = s;
-      },
-      setHeader() {},
-      write(d: string) {
-        this._written += d;
-        return true;
-      },
-      end(d?: string) {
-        if (d) this._written += d;
-        this.writableEnded = true;
-      },
-      destroy() {
-        this.writableEnded = true;
-      },
-    } as unknown as http.ServerResponse;
+    const req = createMockReq();
+    const res = createMockRes();
 
     await handleBedrock(
       req,