fix tests

Author: nirinchev

tests/integration/resources/exportedData.test.ts

@@ -1,7 +1,6 @@
 import path from "path";
 import fs from "fs/promises";
-import type { ObjectId } from "bson";
-import { EJSON, Long } from "bson";
+import { EJSON, Long, ObjectId } from "bson";
 import { describe, expect, it, beforeEach, afterAll } from "vitest";
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { defaultTestConfig, getDataFromUntrustedContent, resourceChangedNotification, timeout } from "../helpers.js";
@@ -16,17 +15,20 @@ const userConfig: UserConfig = {
     exportCleanupIntervalMs: 300,
 };
 
-const docs = [
-    { name: "foo", longNumber: new Long(1234) },
-    { name: "bar", bigInt: new Long(123412341234) },
-];
-
 describeWithMongoDB(
     "exported-data resource",
     (integration) => {
+        let docs: { _id: ObjectId; name: string; longNumber?: Long; bigInt?: Long }[];
+        let collection: string;
+
         beforeEach(async () => {
             const mongoClient = integration.mongoClient();
-            await mongoClient.db("db").collection("coll").insertMany(docs);
+            collection = new ObjectId().toString();
+            docs = [
+                { name: "foo", longNumber: new Long(1234), _id: new ObjectId() },
+                { name: "bar", bigInt: new Long(123412341234), _id: new ObjectId() },
+            ];
+            await mongoClient.db("db").collection(collection).insertMany(docs);
         });
 
         afterAll(async () => {
@@ -67,7 +69,7 @@ describeWithMongoDB(
                     name: "export",
                     arguments: {
                         database: "db",
-                        collection: "coll",
+                        collection,
                         exportTitle: "Export for db.coll",
                         exportTarget: [{ name: "find", arguments: {} }],
                     },
@@ -106,7 +108,7 @@ describeWithMongoDB(
                     name: "export",
                     arguments: {
                         database: "db",
-                        collection: "coll",
+                        collection,
                         exportTitle: "Export for db.coll",
                         exportTarget: [{ name: "find", arguments: {} }],
                     },
@@ -143,7 +145,7 @@ describeWithMongoDB(
                     name: "export",
                     arguments: {
                         database: "big",
-                        collection: "coll",
+                        collection,
                         exportTitle: "Export for big.coll",
                         exportTarget: [{ name: "find", arguments: {} }],
                     },

tests/unit/common/exportsManager.test.ts

@@ -235,7 +235,9 @@ describe("ExportsManager unit test", () => {
                 jsonExportFormat: "relaxed",
             });
             await exportAvailableNotifier;
-            expect(await manager.readExport(exportName)).toEqual("[]");
+            const { content, docsTransformed } = await manager.readExport(exportName);
+            expect(content).toEqual("[]");
+            expect(docsTransformed).toEqual(0);
         });
 
         it("should handle encoded name", async () => {
@@ -249,7 +251,9 @@ describe("ExportsManager unit test", () => {
                 jsonExportFormat: "relaxed",
             });
             await exportAvailableNotifier;
-            expect(await manager.readExport(encodeURIComponent(exportName))).toEqual("[]");
+            const { content, docsTransformed } = await manager.readExport(encodeURIComponent(exportName));
+            expect(content).toEqual("[]");
+            expect(docsTransformed).toEqual(0);
         });
     });
 
@@ -332,7 +336,7 @@ describe("ExportsManager unit test", () => {
                 expect(emitSpy).toHaveBeenCalledWith("export-available", exportURI);
 
                 // Exports relaxed json
-                const jsonData = JSON.parse(await manager.readExport(exportName)) as unknown[];
+                const jsonData = JSON.parse((await manager.readExport(exportName)).content) as unknown[];
                 expect(jsonData).toEqual([]);
             });
         });
@@ -366,7 +370,7 @@ describe("ExportsManager unit test", () => {
                 expect(emitSpy).toHaveBeenCalledWith("export-available", `exported-data://${expectedExportName}`);
 
                 // Exports relaxed json
-                const jsonData = JSON.parse(await manager.readExport(expectedExportName)) as unknown[];
+                const jsonData = JSON.parse((await manager.readExport(expectedExportName)).content) as unknown[];
                 expect(jsonData).toContainEqual(expect.objectContaining({ name: "foo", longNumber: 12 }));
                 expect(jsonData).toContainEqual(expect.objectContaining({ name: "bar", longNumber: 123456 }));
             });
@@ -401,7 +405,7 @@ describe("ExportsManager unit test", () => {
                 expect(emitSpy).toHaveBeenCalledWith("export-available", `exported-data://${expectedExportName}`);
 
                 // Exports relaxed json
-                const jsonData = JSON.parse(await manager.readExport(expectedExportName)) as unknown[];
+                const jsonData = JSON.parse((await manager.readExport(expectedExportName)).content) as unknown[];
                 expect(jsonData).toContainEqual(
                     expect.objectContaining({ name: "foo", longNumber: { $numberLong: "12" } })
                 );