consolidate imports & minor unit test fixes

Author: baileympearson

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

@@ -2,8 +2,7 @@ import { expect } from 'chai';
 import * as process from 'process';
 import * as sinon from 'sinon';
 
-import { type MongoClient } from '../../mongodb';
-import { Connection, LEGACY_HELLO_COMMAND, ScramSHA256 } from '../../mongodb';
+import { Connection, LEGACY_HELLO_COMMAND, type MongoClient, ScramSHA256 } from '../../mongodb';
 import { type TestConfiguration } from '../../tools/runner/config';
 
 function makeConnectionString(config, username, password) {

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

@@ -1,9 +1,7 @@
 import { expect } from 'chai';
 import * as process from 'process';
 
-import { type MongoClient, MongoServerError } from '../../mongodb';
-import { AWSSDKCredentialProvider } from '../../mongodb';
-
+import { AWSSDKCredentialProvider, type MongoClient, MongoServerError } from '../../mongodb';
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 
 describe('MONGODB-AWS Prose Tests', function () {

test/integration/auth/mongodb_aws.test.ts

@@ -5,26 +5,23 @@ import * as process from 'process';
 import * as sinon from 'sinon';
 
 import {
+  aws4Sign,
   type AWSCredentials,
+  AWSSDKCredentialProvider,
   type CommandOptions,
+  Connection,
   type Document,
   MongoAWSError,
   type MongoClient,
+  MongoDBAWS,
   type MongoDBNamespace,
   type MongoDBResponseConstructor,
   MongoMissingCredentialsError,
   MongoMissingDependencyError,
-  MongoServerError
-} from '../../mongodb';
-import {
-  aws4Sign,
-  AWSSDKCredentialProvider,
-  Connection,
-  MongoDBAWS,
+  MongoServerError,
   refreshKMSCredentials,
   setDifference
 } from '../../mongodb';
-
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 
 describe('MONGODB-AWS', function () {

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

@@ -10,11 +10,11 @@ import {
   type Collection,
   MongoClient,
   type MongoClientOptions,
+  type MongoDBOIDC,
+  type OIDCCallbackFunction,
   type OIDCCallbackParams,
   type OIDCResponse
 } from '../../mongodb';
-import { type MongoDBOIDC, type OIDCCallbackFunction } from '../../mongodb';
-
 const createCallback = (tokenFile = 'test_user1', expiresInSeconds?: number, extraFields?: any) => {
   return async (params: OIDCCallbackParams) => {
     const token = await readFile(path.join(process.env.OIDC_TOKEN_DIR, tokenFile), {

test/integration/change-streams/change_stream.test.ts

@@ -11,9 +11,6 @@ import {
   type ChangeStream,
   type ChangeStreamDocument,
   type ChangeStreamOptions,
-  type ResumeToken
-} from '../../mongodb';
-import {
   type Collection,
   type CommandStartedEvent,
   type Db,
@@ -23,7 +20,8 @@ import {
   MongoChangeStreamError,
   type MongoClient,
   MongoServerError,
-  ReadPreference
+  ReadPreference,
+  type ResumeToken
 } from '../../mongodb';
 import * as mock from '../../tools/mongodb-mock/index';
 import { TestBuilder, UnifiedTestSuiteBuilder } from '../../tools/unified_suite_builder';

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';
-import { LEGACY_HELLO_COMMAND } from '../../mongodb';
 import * as mock from '../../tools/mongodb-mock/index';
 import { setupDatabase } from '../shared';
 

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

@@ -7,8 +7,7 @@ import * as path from 'path';
 import * as process from 'process';
 
 import { getCSFLEKMSProviders } from '../../csfle-kms-providers';
-import { type MongoClient, WriteConcern } from '../../mongodb';
-import { ClientEncryption } from '../../mongodb';
+import { ClientEncryption, 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.12.deadlock.test.ts

@@ -4,8 +4,12 @@ import { readFileSync } from 'fs';
 import * as path from 'path';
 import * as process from 'process';
 
-import { type CommandStartedEvent, type MongoClient, type MongoClientOptions } from '../../mongodb';
-import { ClientEncryption } from '../../mongodb';
+import {
+  ClientEncryption,
+  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

@@ -3,12 +3,12 @@ import { expect } from 'chai';
 import {
   Binary,
   BSON,
+  ClientEncryption,
   type CommandFailedEvent,
   type CommandSucceededEvent,
   type MongoClient,
   MongoNetworkError
 } from '../../mongodb';
-import { ClientEncryption } from '../../mongodb';
 import { getEncryptExtraOptions } from '../../tools/utils';
 
 const metadata: MongoDBMetadataUI = {

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

@@ -1,9 +1,7 @@
 import { expect } from 'chai';
 import { env } from 'process';
 
-import { Binary } from '../../mongodb';
-import { ClientEncryption } from '../../mongodb';
-
+import { Binary, ClientEncryption } from '../../mongodb';
 const dataKeyOptions = {
   masterKey: {
     projectId: 'devprod-drivers',