refactor: don't encode type name into public CMAP event types

Author: mbroadst

lib/cmap/events.js

@@ -7,9 +7,8 @@
  * @property {string} address The address (host/port pair) of the pool
  */
 class ConnectionPoolMonitoringEvent {
-  constructor(type, pool) {
+  constructor(pool) {
     this.time = new Date();
-    this.type = type;
     this.address = pool.address;
   }
 }
@@ -21,7 +20,7 @@ class ConnectionPoolMonitoringEvent {
  */
 class ConnectionPoolCreatedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool) {
-    super('ConnectionPoolCreated', pool);
+    super(pool);
     this.options = pool.options;
   }
 }
@@ -31,7 +30,7 @@ class ConnectionPoolCreatedEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionPoolClosedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool) {
-    super('ConnectionPoolClosed', pool);
+    super(pool);
   }
 }
 
@@ -42,7 +41,7 @@ class ConnectionPoolClosedEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionCreatedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool, connection) {
-    super('ConnectionCreated', pool);
+    super(pool);
     this.connectionId = connection.id;
   }
 }
@@ -54,7 +53,7 @@ class ConnectionCreatedEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionReadyEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool, connection) {
-    super('ConnectionReady', pool);
+    super(pool);
     this.connectionId = connection.id;
   }
 }
@@ -67,7 +66,7 @@ class ConnectionReadyEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionClosedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool, connection, reason) {
-    super('ConnectionClosed', pool);
+    super(pool);
     this.connectionId = connection.id;
     this.reason = reason || 'unknown';
   }
@@ -78,7 +77,7 @@ class ConnectionClosedEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionCheckOutStartedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool) {
-    super('ConnectionCheckOutStarted', pool);
+    super(pool);
   }
 }
 
@@ -89,7 +88,7 @@ class ConnectionCheckOutStartedEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionCheckOutFailedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool, reason) {
-    super('ConnectionCheckOutFailed', pool);
+    super(pool);
     this.reason = reason;
   }
 }
@@ -101,7 +100,7 @@ class ConnectionCheckOutFailedEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionCheckedOutEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool, connection) {
-    super('ConnectionCheckedOut', pool);
+    super(pool);
     this.connectionId = connection.id;
   }
 }
@@ -113,7 +112,7 @@ class ConnectionCheckedOutEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionCheckedInEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool, connection) {
-    super('ConnectionCheckedIn', pool);
+    super(pool);
     this.connectionId = connection.id;
   }
 }
@@ -123,7 +122,7 @@ class ConnectionCheckedInEvent extends ConnectionPoolMonitoringEvent {
  */
 class ConnectionPoolClearedEvent extends ConnectionPoolMonitoringEvent {
   constructor(pool) {
-    super('ConnectionPoolCleared', pool);
+    super(pool);
   }
 }
 

test/unit/cmap/connection_pool.test.js

@@ -438,7 +438,7 @@ describe('Connection Pool', function() {
           .then(() => mainThread.finish())
           .catch(e => (actualError = e))
           .then(() => {
-            const actualEvents = poolEvents.filter(ev => ignoreEvents.indexOf(ev.type) < 0);
+            const actualEvents = poolEvents.filter(ev => ignoreEvents.indexOf(eventType(ev)) < 0);
 
             if (expectedError) {
               expect(actualError).to.exist;
@@ -451,6 +451,11 @@ describe('Connection Pool', function() {
 
             expectedEvents.forEach((expected, index) => {
               const actual = actualEvents[index];
+              if (expected.type) {
+                expect(actual.constructor.name).to.equal(`${expected.type}Event`);
+                delete expected.type;
+              }
+
               expect(actual).to.matchMongoSpec(expected);
             });
           });