test(NODE-7179): migrate test/integration/node-specific/*

tadjik1 · tadjik1 · commit 4e917f1c418d · 2025-10-17T10:25:23.000+02:00
diff --git a/test/integration/node-specific/abort_signal.test.ts b/test/integration/node-specific/abort_signal.test.ts
@@ -10,19 +10,18 @@ import {
   AggregationCursor,
   Code,
   type Collection,
-  Connection,
-  ConnectionPool,
   type Db,
   FindCursor,
   ListCollectionsCursor,
   type Log,
   type MongoClient,
   MongoServerError,
-  promiseWithResolvers,
-  ReadPreference,
-  setDifference,
-  StateMachine
-} from '../../mongodb';
+  ReadPreference
+} from '../../../src';
+import { StateMachine } from '../../../src/client-side-encryption/state_machine';
+import { Connection } from '../../../src/cmap/connection';
+import { ConnectionPool } from '../../../src/cmap/connection_pool';
+import { promiseWithResolvers, setDifference } from '../../../src/utils';
 import {
   clearFailPoint,
   configureFailPoint,
diff --git a/test/integration/node-specific/abstract_cursor.test.ts b/test/integration/node-specific/abstract_cursor.test.ts
@@ -7,16 +7,15 @@ import {
   AbstractCursor,
   type Collection,
   type CommandStartedEvent,
-  CSOTTimeoutContext,
-  CursorTimeoutContext,
   CursorTimeoutMode,
   type FindCursor,
   MongoAPIError,
   type MongoClient,
   MongoCursorExhaustedError,
-  MongoOperationTimeoutError,
-  TimeoutContext
-} from '../../mongodb';
+  MongoOperationTimeoutError
+} from '../../../src';
+import { CursorTimeoutContext } from '../../../src/cursor/abstract_cursor';
+import { CSOTTimeoutContext, TimeoutContext } from '../../../src/timeout';
 import { clearFailPoint, configureFailPoint } from '../../tools/utils';
 import { filterForCommands } from '../shared';
 
diff --git a/test/integration/node-specific/auto_connect.test.ts b/test/integration/node-specific/auto_connect.test.ts
@@ -10,9 +10,9 @@ import {
   MongoClient,
   MongoNotConnectedError,
   ProfilingLevel,
-  Topology,
   TopologyType
-} from '../../mongodb';
+} from '../../../src';
+import { Topology } from '../../../src/sdam/topology';
 import { sleep } from '../../tools/utils';
 
 describe('When executing an operation for the first time', () => {
diff --git a/test/integration/node-specific/auto_encrypter.test.ts b/test/integration/node-specific/auto_encrypter.test.ts
@@ -7,9 +7,9 @@ import {
   type MongoClient,
   MongoNetworkTimeoutError,
   MongoRuntimeError,
-  StateMachine,
   type UUID
-} from '../../mongodb';
+} from '../../../src';
+import { StateMachine } from '../../../src/client-side-encryption/state_machine';
 
 describe('mongocryptd auto spawn', function () {
   let client: MongoClient;
diff --git a/test/integration/node-specific/bson-options/raw.test.ts b/test/integration/node-specific/bson-options/raw.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, type MongoClient, ObjectId } from '../../../mongodb';
+import { type Collection, type MongoClient, ObjectId } from '../../../../src';
 
 describe('raw bson support', () => {
   describe('raw', () => {
diff --git a/test/integration/node-specific/bson-options/use_bigint_64.test.ts b/test/integration/node-specific/bson-options/use_bigint_64.test.ts
@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 
 import {
-  BSON,
   type Collection,
   type Db,
   MongoAPIError,
   type MongoClient,
   type WithId
-} from '../../../mongodb';
+} from '../../../../src';
+import { BSONError, type Document, Long } from '../../../../src/bson';
 
 describe('useBigInt64 option', function () {
   let client: MongoClient;
@@ -93,7 +93,7 @@ describe('useBigInt64 option', function () {
   });
 
   describe('when set to true at collection level', function () {
-    let res: WithId<BSON.Document> | null;
+    let res: WithId<Document> | null;
 
     beforeEach(async function () {
       client = await this.configuration.newClient().connect();
@@ -112,7 +112,7 @@ describe('useBigInt64 option', function () {
   });
 
   describe('when set to false at collection level', function () {
-    let res: WithId<BSON.Document> | null;
+    let res: WithId<Document> | null;
 
     beforeEach(async function () {
       client = await this.configuration.newClient().connect();
@@ -131,7 +131,7 @@ describe('useBigInt64 option', function () {
   });
 
   describe('when set to true', function () {
-    let res: WithId<BSON.Document> | null;
+    let res: WithId<Document> | null;
 
     beforeEach(async function () {
       client = await this.configuration.newClient({}, { useBigInt64: true }).connect();
@@ -140,7 +140,7 @@ describe('useBigInt64 option', function () {
       await db.dropCollection('useBigInt64Test').catch(() => null);
 
       coll = await db.createCollection('useBigInt64Test');
-      await coll.insertOne({ a: new BSON.Long(1) });
+      await coll.insertOne({ a: new Long(1) });
 
       res = await coll.findOne({ a: 1n });
     });
@@ -185,7 +185,7 @@ describe('useBigInt64 option', function () {
           .listCollections()
           .toArray()
           .catch(e => e);
-        expect(e).to.be.instanceOf(BSON.BSONError);
+        expect(e).to.be.instanceOf(BSONError);
       });
     });
 
@@ -202,7 +202,7 @@ describe('useBigInt64 option', function () {
           .insertOne({ name: 'bailey ' })
           .then(() => null)
           .catch(e => e);
-        expect(e).to.be.instanceOf(BSON.BSONError);
+        expect(e).to.be.instanceOf(BSONError);
       });
     });
 
@@ -219,7 +219,7 @@ describe('useBigInt64 option', function () {
           .insertOne({ a: 10n }, { promoteLongs: false, useBigInt64: true })
           .catch(e => e);
 
-        expect(e).to.be.instanceOf(BSON.BSONError);
+        expect(e).to.be.instanceOf(BSONError);
       });
     });
   });
@@ -257,7 +257,7 @@ describe('useBigInt64 option', function () {
           .listCollections()
           .toArray()
           .catch(e => e);
-        expect(e).to.be.instanceOf(BSON.BSONError);
+        expect(e).to.be.instanceOf(BSONError);
       });
     });
 
@@ -274,7 +274,7 @@ describe('useBigInt64 option', function () {
           .insertOne({ name: 'bailey ' })
           .then(() => null)
           .catch(e => e);
-        expect(e).to.be.instanceOf(BSON.BSONError);
+        expect(e).to.be.instanceOf(BSONError);
       });
     });
 
@@ -290,7 +290,7 @@ describe('useBigInt64 option', function () {
           .insertOne({ a: 10n }, { promoteValues: false, useBigInt64: true })
           .catch(e => e);
 
-        expect(e).to.be.instanceOf(BSON.BSONError);
+        expect(e).to.be.instanceOf(BSONError);
       });
     });
   });
diff --git a/test/integration/node-specific/bson-options/utf8_validation.test.ts b/test/integration/node-specific/bson-options/utf8_validation.test.ts
@@ -2,14 +2,9 @@ import { expect } from 'chai';
 import * as net from 'net';
 import * as sinon from 'sinon';
 
-import {
-  BSON,
-  BSONError,
-  type Collection,
-  type MongoClient,
-  MongoServerError,
-  OpMsgResponse
-} from '../../../mongodb';
+import { type Collection, type MongoClient, MongoServerError } from '../../../../src';
+import { BSONError, deserialize } from '../../../../src/bson';
+import { OpMsgResponse } from '../../../../src/cmap/commands';
 
 describe('class MongoDBResponse', () => {
   let client;
@@ -46,12 +41,8 @@ describe('class MongoDBResponse', () => {
 
               // Check that the server sent us broken BSON (bad UTF)
               expect(() => {
-                BSON.deserialize(spy.returnValues[0], { validation: { utf8: true } });
-              }).to.throw(
-                BSON.BSONError,
-                /Invalid UTF/i,
-                'did not generate error with invalid utf8'
-              );
+                deserialize(spy.returnValues[0], { validation: { utf8: true } });
+              }).to.throw(BSONError, /Invalid UTF/i, 'did not generate error with invalid utf8');
             }
 
             await generateWriteErrorWithInvalidUtf8();
diff --git a/test/integration/node-specific/client_close.test.ts b/test/integration/node-specific/client_close.test.ts
@@ -2,13 +2,13 @@ import * as events from 'node:events';
 
 import { expect } from 'chai';
 
-import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import {
   type Collection,
   type CommandStartedEvent,
   type FindCursor,
   type MongoClient
-} from '../../mongodb';
+} from '../../../src';
+import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import { configureMongocryptdSpawnHooks } from '../../tools/utils';
 import { filterForCommands } from '../shared';
 import { runScriptAndGetProcessInfo } from './resource_tracking_script_builder';
diff --git a/test/integration/node-specific/client_encryption.test.ts b/test/integration/node-specific/client_encryption.test.ts
@@ -3,13 +3,13 @@ import { readFileSync } from 'fs';
 import * as sinon from 'sinon';
 
 import { MongoCryptError } from '../../../src';
+import { Binary, type Collection, Int32, Long, type MongoClient, UUID } from '../../../src';
 import {
   ClientEncryption,
   type DataKey
 } from '../../../src/client-side-encryption/client_encryption';
 import { MongoCryptInvalidArgumentError } from '../../../src/client-side-encryption/errors';
 import { StateMachine } from '../../../src/client-side-encryption/state_machine';
-import { Binary, type Collection, Int32, Long, type MongoClient, UUID } from '../../mongodb';
 
 function readHttpResponse(path) {
   let data = readFileSync(path, 'utf8').toString();
diff --git a/test/integration/node-specific/comment_with_falsy_values.test.ts b/test/integration/node-specific/comment_with_falsy_values.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, type CommandStartedEvent, Long, type MongoClient } from '../../mongodb';
+import { type Collection, type CommandStartedEvent, Long, type MongoClient } from '../../../src';
 import { TestBuilder, UnifiedTestSuiteBuilder } from '../../tools/unified_suite_builder';
 
 const falsyValues = [0, false, '', Long.ZERO, null, NaN] as const;
diff --git a/test/integration/node-specific/convert_socket_errors.test.ts b/test/integration/node-specific/convert_socket_errors.test.ts
@@ -3,7 +3,8 @@ import { Duplex } from 'node:stream';
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { Connection, type MongoClient, MongoNetworkError, ns } from '../../mongodb';
+import { Connection, type MongoClient, MongoNetworkError } from '../../../src';
+import { ns } from '../../../src/utils';
 import { clearFailPoint, configureFailPoint } from '../../tools/utils';
 
 describe('Socket Errors', () => {
diff --git a/test/integration/node-specific/crypt_shared_lib.test.ts b/test/integration/node-specific/crypt_shared_lib.test.ts
@@ -2,11 +2,9 @@ import { expect } from 'chai';
 import { spawnSync } from 'child_process';
 import { dirname } from 'path';
 
-import { BSON } from '../../mongodb';
+import { EJSON } from '../../../src/bson';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
-const { EJSON } = BSON;
-
 describe('crypt shared library', () => {
   it('should fail if no library can be found in the search path and cryptSharedLibRequired is set', async function () {
     const env = {
diff --git a/test/integration/node-specific/errors.test.ts b/test/integration/node-specific/errors.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { MongoClient, MongoServerSelectionError, ReadPreference } from '../../mongodb';
+import { MongoClient, MongoServerSelectionError, ReadPreference } from '../../../src';
 
 describe('Error (Integration)', function () {
   it('NODE-5296: handles aggregate errors from dns lookup', async function () {
diff --git a/test/integration/node-specific/ipv6.test.ts b/test/integration/node-specific/ipv6.test.ts
@@ -8,7 +8,7 @@ import {
   type MongoClient,
   ReadPreference,
   TopologyType
-} from '../../mongodb';
+} from '../../../src';
 
 describe('IPv6 Addresses', () => {
   let client: MongoClient;
diff --git a/test/integration/node-specific/operation_examples.test.ts b/test/integration/node-specific/operation_examples.test.ts
@@ -1,12 +1,7 @@
 import { expect } from 'chai';
 
-import {
-  Code,
-  enumToString,
-  type MongoClient,
-  ProfilingLevel,
-  ReturnDocument
-} from '../../mongodb';
+import { Code, type MongoClient, ProfilingLevel, ReturnDocument } from '../../../src';
+import { enumToString } from '../../../src/utils';
 import { sleep as delay } from '../../tools/utils';
 import { setupDatabase } from '../shared';
 
diff --git a/test/integration/node-specific/topology.test.ts b/test/integration/node-specific/topology.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { MongoClient, type MongoClientOptions, type Topology } from '../../mongodb';
+import { MongoClient, type MongoClientOptions, type Topology } from '../../../src';
 
 describe('Topology', function () {
   it('should correctly track states of a topology', {
diff --git a/test/integration/node-specific/validate_collection.test.ts b/test/integration/node-specific/validate_collection.test.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { ValidateCollectionOperation } from '../../mongodb';
+import { ValidateCollectionOperation } from '../../../src/operations/validate_collection';
 
 describe('ValidateCollectionOperation', function () {
   let client;
