chore: comments

Author: durran

test/integration/mongodb-handshake/mongodb-handshake.prose.test.ts

@@ -264,21 +264,11 @@ describe('Client Metadata Update Prose Tests', function () {
           client.appendMetadata({ name, version, platform });
           await client.db('test').command({ ping: 1 });
 
-          expect(updatedClientMetadata.driver.name).to.equal(
-            name
-              ? `${initialClientMetadata.driver.name}|${name}`
-              : initialClientMetadata.driver.name
-          );
-          expect(updatedClientMetadata.driver.version).to.equal(
-            version
-              ? `${initialClientMetadata.driver.version}|${version}`
-              : initialClientMetadata.driver.version
-          );
-          expect(updatedClientMetadata.platform).to.equal(
-            platform
-              ? `${initialClientMetadata.platform}|${platform}`
-              : initialClientMetadata.platform
-          );
+          // Since we have our own driver metadata getting added, we really want to just
+          // assert that the last driver info values are appended at the end.
+          expect(updatedClientMetadata.driver.name.endsWith('library')).to.be.true;
+          expect(updatedClientMetadata.driver.version.endsWith('1.2')).to.be.true;
+          expect(updatedClientMetadata.platform.endsWith('Library Platform')).to.be.true;
           // - All other subfields in the client document remain unchanged from initialClientMetadata.
           // (Note os is the only one getting set in these tests)
           expect(updatedClientMetadata.os).to.deep.equal(initialClientMetadata.os);
@@ -342,21 +332,11 @@ describe('Client Metadata Update Prose Tests', function () {
           client.appendMetadata({ name, version, platform });
           await client.db('test').command({ ping: 1 });
 
-          expect(updatedClientMetadata.driver.name).to.equal(
-            name
-              ? `${initialClientMetadata.driver.name}|${name}`
-              : initialClientMetadata.driver.name
-          );
-          expect(updatedClientMetadata.driver.version).to.equal(
-            version
-              ? `${initialClientMetadata.driver.version}|${version}`
-              : initialClientMetadata.driver.version
-          );
-          expect(updatedClientMetadata.platform).to.equal(
-            platform
-              ? `${initialClientMetadata.platform}|${platform}`
-              : initialClientMetadata.platform
-          );
+          // Since we have our own driver metadata getting added, we really want to just
+          // assert that the last driver info values are appended at the end.
+          expect(updatedClientMetadata.driver.name.endsWith('library')).to.be.true;
+          expect(updatedClientMetadata.driver.version.endsWith('1.2')).to.be.true;
+          expect(updatedClientMetadata.platform.endsWith('Library Platform')).to.be.true;
           // - All other subfields in the client document remain unchanged from initialClientMetadata.
           // (Note os is the only one getting set in these tests)
           expect(updatedClientMetadata.os).to.deep.equal(initialClientMetadata.os);

test/tools/cmap_spec_runner.ts

@@ -323,8 +323,7 @@ export class ThreadContext {
       serverApi: process.env.MONGODB_API_VERSION
         ? { version: process.env.MONGODB_API_VERSION }
         : undefined,
-
-      extendedMetadata: this.#server.topology.client.options?.extendedMetadata
+      extendedMetadata: this.#server.topology.client.options.extendedMetadata
     });
     this.#originalServerPool = this.#server.pool;
     this.#server.pool = this.pool;