test: clean up unified sdam implementation

Author: dariakp

test/tools/unified-spec-runner/entities.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { expect } from 'chai';
-import { EventEmitter } from 'stream';
+import { EventEmitter } from 'events';
 
 import { ChangeStream } from '../../../src/change_stream';
 import {
@@ -184,7 +184,7 @@ export class UnifiedMongoClient extends MongoClient {
   getCapturedEvents(
     eventType: 'command' | 'cmap' | 'sdam'
   ): CommandEvent[] | CmapEvent[] | SdamEvent[];
-  getCapturedEvents(eventType: 'all'): (CommandEvent | CmapEvent)[];
+  getCapturedEvents(eventType: 'all'): (CommandEvent | CmapEvent | SdamEvent)[];
   getCapturedEvents(
     eventType: 'command' | 'cmap' | 'sdam' | 'all'
   ): (CommandEvent | CmapEvent | SdamEvent)[] {

test/tools/unified-spec-runner/match.ts

@@ -480,7 +480,7 @@ function compareEvents(
       for (const descriptionKey of expectedServerDescriptionKeys) {
         expect(actualEvent).to.have.property(descriptionKey);
         const expectedDescription =
-          expectedEvent.serverDescriptionChangedEvent[descriptionKey] || {};
+          expectedEvent.serverDescriptionChangedEvent[descriptionKey] ?? {};
         for (const nestedKey of Object.keys(expectedDescription)) {
           expect(actualEvent[descriptionKey]).to.have.property(
             nestedKey,

test/tools/unified-spec-runner/operations.ts

@@ -21,10 +21,10 @@ import { ReadPreference } from '../../../src/read_preference';
 import { WriteConcern } from '../../../src/write_concern';
 import { getSymbolFrom, sleep } from '../../tools/utils';
 import { TestConfiguration } from '../runner/config';
-import { CmapEvent, CommandEvent, EntitiesMap, UnifiedChangeStream } from './entities';
-import { expectErrorCheck, matchesEvents, resultCheck } from './match';
-import type { ExpectedEvent, ExpectedEventsForClient, OperationDescription } from './schema';
-import { translateOptions } from './unified-utils';
+import { EntitiesMap, UnifiedChangeStream } from './entities';
+import { expectErrorCheck, resultCheck } from './match';
+import type { ExpectedEvent, OperationDescription } from './schema';
+import { getMatchingEventCount, translateOptions } from './unified-utils';
 
 interface OperationFunctionParams {
   client: MongoClient;
@@ -42,7 +42,7 @@ operations.set('createEntities', async ({ entities, operation, testConfig }) =>
   if (!operation.arguments?.entities) {
     throw new Error('encountered createEntities operation without entities argument');
   }
-  await EntitiesMap.createEntities(testConfig, operation.arguments.entities, entities);
+  await EntitiesMap.createEntities(testConfig, operation.arguments.entities!, entities);
 });
 
 operations.set('abortTransaction', async ({ entities, operation }) => {
@@ -427,21 +427,6 @@ operations.set('wait', async ({ operation }) => {
   await sleep(operation.arguments!.ms);
 });
 
-function getMatchingEventCount(event, client, entities): number {
-  return client.getCapturedEvents('all').filter(capturedEvent => {
-    try {
-      matchesEvents(
-        { events: [event] } as ExpectedEventsForClient,
-        [capturedEvent] as CommandEvent[] | CmapEvent[],
-        entities
-      );
-      return true;
-    } catch (e) {
-      return false;
-    }
-  }).length;
-}
-
 operations.set('waitForEvent', async ({ entities, operation }) => {
   expect(operation, 'Error in waitForEvent operation').to.have.property('arguments');
   const {

test/tools/unified-spec-runner/unified-utils.ts

@@ -14,11 +14,13 @@ import {
 } from '../../../src';
 import { getMongoDBClientEncryption } from '../../../src/utils';
 import { shouldRunServerlessTest } from '../../tools/utils';
-import { EntitiesMap } from './entities';
+import { CmapEvent, CommandEvent, EntitiesMap } from './entities';
+import { matchesEvents } from './match';
 import type {
   ClientEncryption,
   ClientEncryptionEntity,
   CollectionOrDatabaseOptions,
+  ExpectedEventsForClient,
   KMSProvidersEntity,
   RunOnRequirement,
   StringOrPlaceholder
@@ -202,6 +204,21 @@ export function makeConnectionString(
   return connectionString.toString();
 }
 
+export function getMatchingEventCount(event, client, entities): number {
+  return client.getCapturedEvents('all').filter(capturedEvent => {
+    try {
+      matchesEvents(
+        { events: [event] } as ExpectedEventsForClient,
+        [capturedEvent] as CommandEvent[] | CmapEvent[],
+        entities
+      );
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }).length;
+}
+
 /**
  * attempts to import mongodb-client-encryption and extract the client encryption class for
  * use in the csfle unified tests

test/unit/assorted/server_discovery_and_monitoring.spec.test.ts

@@ -58,7 +58,7 @@ function collectTests(): Record<string, SDAMTest[]> {
   const testTypes = fs
     .readdirSync(specDir)
     .filter(d => fs.statSync(path.resolve(specDir, d)).isDirectory())
-    .filter(d => d !== 'integration');
+    .filter(d => d !== 'unified');
 
   const tests = {};
   for (const testType of testTypes) {