test(NODE-7179): migrate tests to import directly from src folder

test/csfle-kms-providers.ts

@@ -1,4 +1,4 @@
-import { type KMSProviders } from './mongodb';
+import { type KMSProviders } from './../src';
 
 const csfleKMSProviders = {
   aws: {

test/integration/auth/auth.prose.test.ts

@@ -1,7 +1,10 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { Connection, LEGACY_HELLO_COMMAND, type MongoClient, ScramSHA256 } from '../../mongodb';
+import { type MongoClient } from '../../../src';
+import { ScramSHA256 } from '../../../src/cmap/auth/scram';
+import { Connection } from '../../../src/cmap/connection';
+import { LEGACY_HELLO_COMMAND } from '../../../src/constants';
 import { type TestConfiguration } from '../../tools/runner/config';
 
 function makeConnectionString(config, username, password) {

test/integration/auth/mongodb_aws.prose.test.ts

@@ -2,7 +2,8 @@ import * as process from 'node:process';
 
 import { expect } from 'chai';
 
-import { AWSSDKCredentialProvider, type MongoClient, MongoServerError } from '../../mongodb';
+import { type MongoClient, MongoServerError } from '../../../src';
+import { AWSSDKCredentialProvider } from '../../../src/cmap/auth/aws_temporary_credentials';
 
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 

test/integration/auth/mongodb_aws.test.ts

@@ -5,22 +5,22 @@ import * as http from 'http';
 import { performance } from 'perf_hooks';
 import * as sinon from 'sinon';
 
-import { refreshKMSCredentials } from '../../../src/client-side-encryption/providers';
 import {
-  AWSSDKCredentialProvider,
   type CommandOptions,
-  Connection,
   type Document,
   MongoAWSError,
   type MongoClient,
-  MongoDBAWS,
   type MongoDBNamespace,
   type MongoDBResponseConstructor,
   MongoMissingCredentialsError,
   MongoMissingDependencyError,
-  MongoServerError,
-  setDifference
-} from '../../mongodb';
+  MongoServerError
+} from '../../../src';
+import { refreshKMSCredentials } from '../../../src/client-side-encryption/providers';
+import { AWSSDKCredentialProvider } from '../../../src/cmap/auth/aws_temporary_credentials';
+import { MongoDBAWS } from '../../../src/cmap/auth/mongodb_aws';
+import { Connection } from '../../../src/cmap/connection';
+import { setDifference } from '../../../src/utils';
 
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 

test/integration/auth/mongodb_oidc.prose.test.ts

@@ -8,10 +8,10 @@ import {
   type ClientSession,
   type Collection,
   MongoClient,
-  type MongoDBOIDC,
   type OIDCCallbackParams,
   type OIDCResponse
-} from '../../mongodb';
+} from '../../../src';
+import { type MongoDBOIDC } from '../../../src/cmap/auth/mongodb_oidc';
 
 const createCallback = (tokenFile = 'test_user1', expiresInSeconds?: number, extraFields?: any) => {
   return async (params: OIDCCallbackParams) => {

test/integration/auth/mongodb_oidc_azure.prose.05.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, MongoClient, type MongoClientOptions } from '../../mongodb';
+import { type Collection, MongoClient, type MongoClientOptions } from '../../../src';
 
 const DEFAULT_URI = 'mongodb://127.0.0.1:27017';
 

test/integration/auth/mongodb_oidc_gcp.prose.06.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, MongoClient, type MongoClientOptions } from '../../mongodb';
+import { type Collection, MongoClient, type MongoClientOptions } from '../../../src';
 
 const DEFAULT_URI = 'mongodb://127.0.0.1:27017';
 

test/integration/auth/mongodb_oidc_k8s.prose.07.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type Collection, MongoClient } from '../../mongodb';
+import { type Collection, MongoClient } from '../../../src';
 
 const DEFAULT_URI = 'mongodb://127.0.0.1:27017';
 

test/integration/causal-consistency/causal_consistency.prose.test.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { LEGACY_HELLO_COMMAND } = require('../../mongodb');
+const { LEGACY_HELLO_COMMAND } = require('../../../src/constants');
 
 const { setupDatabase } = require('../shared');
 const { expect } = require('chai');

test/integration/change-streams/change_streams.prose.test.ts

@@ -10,13 +10,13 @@ import {
   type CommandStartedEvent,
   type CommandSucceededEvent,
   type Document,
-  LEGACY_HELLO_COMMAND,
   Long,
   type MongoClient,
   MongoNetworkError,
   ObjectId,
   Timestamp
-} from '../../mongodb';
+} from '../../../src';
+import { LEGACY_HELLO_COMMAND } from '../../../src/constants';
 import * as mock from '../../tools/mongodb-mock/index';
 import { setupDatabase } from '../shared';
 
@@ -31,7 +31,7 @@ function triggerResumableError(changeStream: ChangeStream, delay: number, onClos
 function triggerResumableError(
   changeStream: ChangeStream,
   delay: number | (() => void),
-  onClose?: () => void
+  onClose?: (err?: Error) => void
 ) {
   if (typeof delay === 'function') {
     onClose = delay;
@@ -53,7 +53,7 @@ function triggerResumableError(
     }
 
     const nextStub = sinon.stub(changeStream.cursor, 'next').callsFake(async function () {
-      callback(new MongoNetworkError('error triggered from test'));
+      onClose(new MongoNetworkError('error triggered from test'));
       nextStub.restore();
     });
 

test/integration/client-side-encryption/client_side_encryption.prose.06.corpus.test.ts

@@ -5,9 +5,9 @@ import { expect } from 'chai';
 import * as fs from 'fs';
 import * as path from 'path';
 
+import { type MongoClient, WriteConcern } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { type MongoClient, WriteConcern } from '../../mongodb';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
 describe('Client Side Encryption Prose Corpus Test', function () {

test/integration/client-side-encryption/client_side_encryption.prose.10.kms_tls.test.ts

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { satisfies } from 'semver';
 
+import { ClientEncryption, type MongoClient } from '../../../src';
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { ClientEncryption, type MongoClient } from '../../mongodb';
 
 const metadata: MongoDBMetadataUI = {
   requires: {

test/integration/client-side-encryption/client_side_encryption.prose.12.deadlock.test.ts

@@ -3,8 +3,8 @@ import { expect } from 'chai';
 import { readFileSync } from 'fs';
 import * as path from 'path';
 
+import { type CommandStartedEvent, type MongoClient, type MongoClientOptions } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
-import { type CommandStartedEvent, type MongoClient, type MongoClientOptions } from '../../mongodb';
 import { type TestConfiguration } from '../../tools/runner/config';
 import { getEncryptExtraOptions } from '../../tools/utils';
 import { dropCollection } from '../shared';

test/integration/client-side-encryption/client_side_encryption.prose.14.decryption_events.test.ts

@@ -1,14 +1,14 @@
 import { expect } from 'chai';
 
-import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import {
   Binary,
   BSON,
   type CommandFailedEvent,
   type CommandSucceededEvent,
   type MongoClient,
   MongoNetworkError
-} from '../../mongodb';
+} from '../../../src';
+import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
 const metadata: MongoDBMetadataUI = {

test/integration/client-side-encryption/client_side_encryption.prose.17.on_demand_gcp.test.ts

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 import { env } from 'process';
 
+import { Binary } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
-import { Binary } from '../../mongodb';
 
 const dataKeyOptions = {
   masterKey: {

test/integration/client-side-encryption/client_side_encryption.prose.18.azure_kms_mock_server.test.ts

@@ -1,11 +1,11 @@
 import { expect } from 'chai';
 
+import { type Document } from '../../../src';
 import { MongoCryptAzureKMSRequestError } from '../../../src/client-side-encryption/errors';
 import {
   type AzureKMSRequestOptions,
   fetchAzureKMSToken
 } from '../../../src/client-side-encryption/providers/azure';
-import { type Document } from '../../mongodb';
 
 const BASE_URL = new URL(`http://127.0.0.1:8080/metadata/identity/oauth2/token`);
 class KMSRequestOptions implements AzureKMSRequestOptions {

test/integration/client-side-encryption/client_side_encryption.prose.19.on_demand_azure.test.ts

@@ -1,9 +1,9 @@
 import { expect } from 'chai';
 import { env } from 'process';
 
+import { Binary } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import { MongoCryptAzureKMSRequestError } from '../../../src/client-side-encryption/errors';
-import { Binary } from '../../mongodb';
 
 const dataKeyOptions = {
   masterKey: {

test/integration/client-side-encryption/client_side_encryption.prose.20.mongocryptd_client.test.ts

@@ -2,8 +2,8 @@ import { expect } from 'chai';
 import { once } from 'events';
 import { createServer, type Server } from 'net';
 
+import { type MongoClient } from '../../../src';
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { type MongoClient } from '../../mongodb';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
 describe('20. Bypass creating mongocryptd client when shared library is loaded', function () {

test/integration/client-side-encryption/client_side_encryption.prose.21.automatic_data_encryption_keys.test.ts

@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 
+import { Collection, type Db, MongoServerError } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import { MongoCryptCreateEncryptedCollectionError } from '../../../src/client-side-encryption/errors';
 import {
   getCSFLEKMSProviders,
   kmsCredentialsPresent,
   missingKeys
 } from '../../csfle-kms-providers';
-import { Collection, type Db, MongoServerError } from '../../mongodb';
 
 const metadata: MongoDBMetadataUI = {
   requires: {

test/integration/client-side-encryption/client_side_encryption.prose.23.range_encryption_defaults.test.ts

@@ -1,8 +1,8 @@
 import { expect } from 'chai';
 
+import { type Binary, Int32, Long } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { type Binary, Int32, Long } from '../../mongodb';
 
 const metaData: MongoDBMetadataUI = {
   requires: {

test/integration/client-side-encryption/client_side_encryption.prose.25.lookup.test.ts

@@ -3,8 +3,8 @@ import * as path from 'node:path';
 
 import { expect } from 'chai';
 
+import { BSON, type Document, type MongoClient } from '../../../src';
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { BSON, type Document, type MongoClient } from '../../mongodb';
 import { type TestConfiguration } from '../../tools/runner/config';
 import { getEncryptExtraOptions } from '../../tools/utils';
 

test/integration/client-side-encryption/client_side_encryption.prose.26.custom_aws_credential_providers.test.ts

@@ -1,7 +1,8 @@
 import { expect } from 'chai';
 
+import { Binary, MongoClient } from '../../../src';
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
-import { AWSSDKCredentialProvider, Binary, MongoClient } from '../../mongodb';
+import { AWSSDKCredentialProvider } from '../../../src/cmap/auth/aws_temporary_credentials';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
 const metadata: MongoDBMetadataUI = {

test/integration/client-side-encryption/client_side_encryption.prose.27.text_queries.test.ts

@@ -4,8 +4,9 @@ import { join } from 'node:path';
 import { type Binary, type Document, EJSON } from 'bson';
 import { expect } from 'chai';
 
+import { ClientEncryption, type MongoClient } from '../../../src';
+import { MongoDBCollectionNamespace } from '../../../src/utils';
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { ClientEncryption, type MongoClient, MongoDBCollectionNamespace } from '../../mongodb';
 
 const metadata: MongoDBMetadataUI = {
   requires: {

test/integration/client-side-encryption/client_side_encryption.prose.test.ts

@@ -4,16 +4,16 @@ import * as fs from 'fs/promises';
 import * as path from 'path';
 import { satisfies } from 'semver';
 
-import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
-import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import {
-  LEGACY_HELLO_COMMAND,
   MongoClient,
   MongoCryptError,
   MongoRuntimeError,
   MongoServerError,
   MongoServerSelectionError
-} from '../../mongodb';
+} from '../../../src';
+import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
+import { LEGACY_HELLO_COMMAND } from '../../../src/constants';
+import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import { AlpineTestConfiguration } from '../../tools/runner/config';
 import { getEncryptExtraOptions } from '../../tools/utils';
 import { APMEventCollector, dropCollection } from '../shared';

test/integration/client-side-encryption/driver.test.ts

@@ -6,22 +6,21 @@ import * as sinon from 'sinon';
 import { setTimeout } from 'timers/promises';
 import * as tls from 'tls';
 
-import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
-import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import {
   BSON,
   type Collection,
   type CommandStartedEvent,
-  Connection,
-  CSOTTimeoutContext,
   type MongoClient,
   MongoCryptCreateDataKeyError,
   MongoCryptCreateEncryptedCollectionError,
-  MongoOperationTimeoutError,
-  resolveTimeoutOptions,
-  StateMachine,
-  TimeoutContext
-} from '../../mongodb';
+  MongoOperationTimeoutError
+} from '../../../src';
+import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
+import { StateMachine } from '../../../src/client-side-encryption/state_machine';
+import { Connection } from '../../../src/cmap/connection';
+import { CSOTTimeoutContext, TimeoutContext } from '../../../src/timeout';
+import { resolveTimeoutOptions } from '../../../src/utils';
+import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
 import {
   clearFailPoint,
   configureFailPoint,

test/integration/client-side-operations-timeout/client_side_operations_timeout.prose.test.ts

@@ -7,20 +7,19 @@ import * as semver from 'semver';
 import * as sinon from 'sinon';
 import { pipeline } from 'stream/promises';
 
-import { type CommandStartedEvent } from '../../../mongodb';
 import {
   Binary,
   ClientEncryption,
+  type CommandStartedEvent,
   type CommandSucceededEvent,
   GridFSBucket,
   MongoBulkWriteError,
   MongoClient,
   MongoOperationTimeoutError,
   MongoServerSelectionError,
-  now,
-  ObjectId,
-  squashError
-} from '../../mongodb';
+  ObjectId
+} from '../../../src';
+import { now, squashError } from '../../../src/utils';
 import {
   clearFailPoint,
   configureFailPoint,

test/integration/client-side-operations-timeout/client_side_operations_timeout.unit.test.ts

@@ -10,18 +10,12 @@ import { setTimeout } from 'timers';
 import { TLSSocket } from 'tls';
 import { promisify } from 'util';
 
+import { type MongoClient, MongoOperationTimeoutError, ObjectId } from '../../../src';
 import { StateMachine } from '../../../src/client-side-encryption/state_machine';
-import {
-  Connection,
-  ConnectionPool,
-  CSOTTimeoutContext,
-  type MongoClient,
-  MongoOperationTimeoutError,
-  ObjectId,
-  Timeout,
-  TimeoutContext,
-  Topology
-} from '../../mongodb';
+import { Connection } from '../../../src/cmap/connection';
+import { ConnectionPool } from '../../../src/cmap/connection_pool';
+import { Topology } from '../../../src/sdam/topology';
+import { CSOTTimeoutContext, Timeout, TimeoutContext } from '../../../src/timeout';
 import { measureDuration, sleep } from '../../tools/utils';
 import { createTimerSandbox } from '../../unit/timer_sandbox';