Fix tests

mongodb · Aug 15, 2024 · 5d01f60 · 5d01f60
1 parent e3bf7de
commit 5d01f60
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/test/node/bson_test.js b/test/node/bson_test.js
@@ -20,7 +20,11 @@ const MaxKey = BSON.MaxKey;
 const BSONError = BSON.BSONError;
 const { BinaryParser } = require('./tools/binary_parser');
 const vm = require('vm');
-const { assertBuffersEqual, isBufferOrUint8Array } = require('./tools/utils');
+const {
+  assertBuffersEqual,
+  isBufferOrUint8Array,
+  assertDeepEqualsWithObjectId
+} = require('./tools/utils');
 const { inspect } = require('util');
 
 /**
@@ -707,7 +711,7 @@ describe('BSON', function () {
     expect(serialized_data).to.deep.equal(serialized_data2);
 
     var doc2 = b.deserialize(serialized_data);
-    expect(doc).to.deep.equal(doc2);
+    assertDeepEqualsWithObjectId(doc, doc2);
     expect(doc2.dbref.oid.toHexString()).to.deep.equal(oid.toHexString());
     done();
   });
@@ -1001,7 +1005,7 @@ describe('BSON', function () {
 
     var deserialized_data = BSON.deserialize(serialized_data);
     expect(doc.b).to.deep.equal(deserialized_data.b);
-    expect(doc).to.deep.equal(deserialized_data);
+    assertDeepEqualsWithObjectId(doc, deserialized_data);
     done();
   });
 
@@ -1213,7 +1217,7 @@ describe('BSON', function () {
 
     var doc2 = BSON.deserialize(serialized_data);
 
-    expect(doc).to.deep.equal(doc2);
+    assertDeepEqualsWithObjectId(doc, doc2);
     done();
   });
 

diff --git a/test/node/bson_type_classes.test.ts b/test/node/bson_type_classes.test.ts
@@ -18,6 +18,7 @@ import {
   UUID,
   BSONValue
 } from '../register-bson';
+import { assertDeepEqualsWithObjectId } from './tools/utils';
 import * as vm from 'node:vm';
 
 const BSONTypeClasses = [
@@ -128,7 +129,13 @@ describe('BSON Type classes common interfaces', () => {
           ctx.ObjectId = ObjectId;
         }
         vm.runInNewContext(`module.exports.result = ${bsonValue.inspect()}`, ctx);
-        expect(ctx.module.exports.result).to.deep.equal(bsonValue);
+
+        if (ctx.ObjectId) {
+          // Since ObjectId uses a pool we expect offset to be different
+          assertDeepEqualsWithObjectId(ctx.module.exports.result, bsonValue);
+        } else {
+          expect(ctx.module.exports.result).to.deep.equal(bsonValue);
+        }
       });
     }
   });

diff --git a/test/node/extended_json.test.ts b/test/node/extended_json.test.ts
@@ -4,6 +4,7 @@ import * as vm from 'node:vm';
 import { expect } from 'chai';
 import { BSONVersionError, BSONRuntimeError } from '../../src';
 import { BSONError } from '../register-bson';
+import { assertDeepEqualsWithObjectId } from './tools/utils';
 
 // BSON types
 const Binary = BSON.Binary;
@@ -144,9 +145,10 @@ describe('Extended JSON', function () {
     const input = '{"result":[{"_id":{"$oid":"591801a468f9e7024b623939"},"emptyField":null}]}';
     const parsed = EJSON.parse(input);
 
-    expect(parsed).to.deep.equal({
+    const expected = {
       result: [{ _id: new ObjectId('591801a468f9e7024b623939'), emptyField: null }]
-    });
+    };
+    assertDeepEqualsWithObjectId(parsed, expected);
   });
 
   it('should correctly throw when passed a non-string to parse', function () {

diff --git a/test/node/object_id.test.ts b/test/node/object_id.test.ts
@@ -5,8 +5,6 @@ import { expect } from 'chai';
 import { bufferFromHexArray } from './tools/utils';
 import { isBufferOrUint8Array } from './tools/utils';
 
-ObjectId.poolSize = 100;
-
 declare module '../register-bson' {
   interface ObjectId {
     pool: Uint8Array;

diff --git a/test/node/tools/utils.js b/test/node/tools/utils.js
@@ -218,3 +218,25 @@ module.exports.sorted = (iterable, how) => {
   items.sort(how);
   return items;
 };
+
+/** Deeply converts all ObjectIds into their hex value representation */
+const deepOidValue = obj => {
+  if (obj?._bsontype === 'ObjectId') {
+    return obj.toHexString();
+  }
+  if (Array.isArray(obj)) {
+    return obj.map(item => deepOidValue(item));
+  } else if (obj !== null && typeof obj === 'object' && !Buffer.isBuffer(obj)) {
+    return Object.entries(obj).reduce((acc, [key, value]) => {
+      acc[key] = deepOidValue(value);
+      return acc;
+    }, {});
+  }
+  return obj;
+};
+
+module.exports.assertDeepEqualsWithObjectId = (actual, expected) => {
+  const a = deepOidValue(actual);
+  const b = deepOidValue(expected);
+  expect(a).to.deep.equal(b);
+};