Passing APM test suite

Author: christkv

test/functional/apm/insertOne.json

@@ -39,7 +39,7 @@
           "command_succeeded_event": {
             "reply": [
               {
-                "ok": 1
+                "ok": 1, "n": 1
               }
             ],
             "command_name": "insert",

test/functional/apm/updateOne.json

@@ -63,7 +63,7 @@
           "command_succeeded_event": {
             "reply": [
               {
-                "ok": 1
+                "ok": 1, "nModified": 1, "n": 1
               }
             ],
             "command_name": "update",

test/functional/apm_tests.js

@@ -100,8 +100,6 @@ exports['Correctly receive the APM events for an insert using custom operationId
 
 var validateExpecations = function(test, expectation, results) {
   if(expectation.command_started_event) {
-    // console.log("---------------------------- validate command_started_event")
-    // console.dir(expectation)
     // Get the command
     var obj = expectation.command_started_event;
     // Unpack the expectation
@@ -110,50 +108,27 @@ var validateExpecations = function(test, expectation, results) {
     var commandName = obj.command_name;
     // Get the result
     var result = results.starts.shift();
-    // console.dir(results)
-    // console.log("---------------------------- validate command_started_event 1 RESULT")
-    // console.log(JSON.stringify(result, null, 2))
-    // console.log("---------------------------- validate command_started_event 2 EXPECTED")
-    // console.log(JSON.stringify(obj, null, 2))
-    // // Validate the test
+    // Validate the test
     test.equal(commandName, result.commandName)
   } else if(expectation.command_succeeded_event) {
-    // console.log("---------------------------- validate command_succeeded_event")
     var obj = expectation.command_succeeded_event;
     // Unpack the expectation
     var reply = obj.reply;
     var databaseName = obj.database_name;
     var commandName = obj.command_name;
     // Get the result
     var result = results.successes.shift();
-    // console.dir(results)
-    // console.log("---------------------------- validate command_succeeded_event 1 RESULT")
-    // console.log(JSON.stringify(result, null, 2))
-    // console.log("---------------------------- validate command_succeeded_event 2 EXPECTED")
-    // console.log(JSON.stringify(obj, null, 2))
-    
-
     // Validate the test
     test.equal(commandName, result.commandName);
-    // console.dir(result)
-    // console.dir(reply[0])
-    // console.dir(result.reply.result)
     test.deepEqual(reply[0], result.reply.result);
-    // console.dir(obj)
-    // console.dir(result)
   } else if(expectation.command_failed_event) {
-    // console.log("---------------------------- validate command_failed_event")
     var obj = expectation.command_failed_event;
     // Unpack the expectation
     var reply = obj.reply;
     var databaseName = obj.database_name;
     var commandName = obj.command_name;
     // Get the result
     var result = results.failures.shift();
-    // console.log("---------------------------- validate command_failed_event 1")
-    // console.dir(results)
-    // console.dir(expectation)
-
     // Validate the test
     test.equal(commandName, result.commandName);
   }
@@ -164,28 +139,19 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
   var failures = [];
   var starts = [];
 
-  // console.log("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n")
-  // console.log("*****************************************************************************************")
-  // console.log("*****************************************************************************************")
-  // console.log("*****************************************************************************************")
-
   // Get the operation
   var operation = test.operation;
 
   // Set up the listeners
   listener.on('started', function(event) {
-    // console.log("################################################ started")
-    // console.log(JSON.stringify(event, null, 2))
     starts.push(event);
   });
 
   listener.on('succeeded', function(event) {
-    // console.log("################################################ successes")
     successes.push(event);
   });
 
   listener.on('failed', function(event) {
-    // console.log("################################################ failed")
     failures.push(event);
   });
 
@@ -196,29 +162,6 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
     _listener.removeAllListeners('failed');
   }
 
-  // // Set up the test expectations
-  // test.expectations.forEach(function(x) {
-  //   if(x.command_started_event) {
-  //     listener.once('started', function(event) {
-  //       console.log("################################################ started")
-  //       console.log(JSON.stringify(event, null, 2))
-  //       starts.push(event);
-  //     });
-  //   } else if(x.command_succeeded_event) {
-  //     listener.once('succeeded', function(event) {
-  //       // console.log("################################################ successes")
-  //       successes.push(event);
-  //     });
-  //   } else if(x.command_failed_event) {
-  //     listener.once('failed', function(event) {
-  //       // console.log("################################################ failed")
-  //       failures.push(event);
-  //     });
-  //   }
-  // });
-
-  // console.log("------------------------------- operation.name :: " + operation.name)
-
   // Get the command name
   var commandName = operation.name;
   // Get the arguments
@@ -233,8 +176,18 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
   // Unpack the operation
   if(args.filter) {
     params.push(args.filter);
-  } else if(args.deletes) {
+  }
+
+  if(args.deletes) {
     params.push(args.deletes);
+  } 
+
+  if(args.document) {
+    params.push(args.document);
+  } 
+
+  if(args.update) {
+    params.push(args.update);
   }
 
   // Find command is special needs to executed using toArray
@@ -253,9 +206,6 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
       cursor = cursor.limit(args.limit);
     }
 
-    // console.log("----------------------------------------- args")
-    // console.dir(args)
-
     // Execute find
     cursor.toArray(function(err, r) {
       // Validate the expectations
@@ -273,6 +223,7 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
     });
   } else {
     params.push(function(err, result) {
+
       // Validate the expectations
       test.expectations.forEach(function(x, index) {
         validateExpecations(assert, x, {
@@ -290,39 +241,6 @@ var executeOperation = function(assert, client, listener, scenario, test, callba
     // Execute the operation
     collection[commandName].apply(collection, params);
   }
-
-  // // Execute the test
-  // if(operation.name == 'count') {
-  //   var args = operation.arguments || {};
-  //   // Get the database instance
-  //   var db = client.db(scenario.database_name);
-  //   // Get the collection
-  //   var collection = db.collection(scenario.collection_name);
-  //   // Parameters
-  //   var params = [];
-
-  //   // Unpack the operation
-  //   if(args.filter) {
-  //     params.push(args.filter);
-  //   }
-
-  //   params.push(function(err, result) {
-  //     // Validate the expectations
-  //     test.expectations.forEach(function(x, index) {
-  //       validateExpecations(assert, x, {
-  //         successes: successes, failures: failures, starts: starts
-  //       });
-  //     });
-
-  //     // Finish the operation
-  //     callback();
-  //   });
-
-  //   // Execute the operation
-  //   collection.count.apply(collection, params);
-  // } else if(operation.name == 'deleteOne') {
-
-  // }
 }
 
 var executeTests = function(assert, client, listener, scenario, tests, callback) {
@@ -379,10 +297,6 @@ exports['Correctly run all JSON APM Tests'] = {
       return JSON.parse(fs.readFileSync(__dirname + '/apm/' + x));
     });
 
-    // scenarios = scenarios.slice(2, 3)
-    // scenarios = scenarios.slice(0, 3)
-    scenarios = scenarios.slice(3, 4)
-
     // Get the methods
     var MongoClient = require('../..');
     var listener = require('../../').instrument();