fixed command monitoring tests to only monitor for events they expect.

Author: craiggwilson

src/MongoDB.Driver.Core.TestHelpers/EventCapturer.cs

@@ -24,18 +24,22 @@ public class EventCapturer : IEventSubscriber
     {
         private readonly Queue<object> _capturedEvents;
         private readonly IEventSubscriber _subscriber;
-        private readonly List<Type> _eventsToCapture;
+        private readonly Dictionary<Type, Func<object, bool>> _eventsToCapture;
 
         public EventCapturer()
         {
             _capturedEvents = new Queue<object>();
             _subscriber = new ReflectionEventSubscriber(new CommandCapturer(this));
-            _eventsToCapture = new List<Type>();
+            _eventsToCapture = new Dictionary<Type, Func<object, bool>>();
         }
 
-        public EventCapturer Capture<TEvent>()
+        public EventCapturer Capture<TEvent>(Func<TEvent, bool> predicate = null)
         {
-            _eventsToCapture.Add(typeof(TEvent));
+            if (predicate == null)
+            {
+                predicate = o => true;
+            }
+            _eventsToCapture.Add(typeof(TEvent), o => predicate((TEvent)o));
             return this;
         }
 
@@ -61,22 +65,28 @@ public bool Any()
 
         public bool TryGetEventHandler<TEvent>(out Action<TEvent> handler)
         {
-            if (_eventsToCapture.Count > 0 && !_eventsToCapture.Contains(typeof(TEvent)))
+            if (_eventsToCapture.Count > 0 && !_eventsToCapture.ContainsKey(typeof(TEvent)))
             {
                 handler = null;
                 return false;
             }
 
-            if (!_subscriber.TryGetEventHandler<TEvent>(out handler))
+            if (!_subscriber.TryGetEventHandler(out handler))
             {
                 handler = e => Capture(e);
             }
 
             return true;
         }
 
-        private void Capture(object @event)
+        private void Capture<TEvent>(TEvent @event)
         {
+            Func<object, bool> predicate;
+            if (_eventsToCapture.TryGetValue(typeof(TEvent), out predicate) && !predicate(@event))
+            {
+                return;
+            }
+
             _capturedEvents.Enqueue(@event);
         }
 

src/MongoDB.Driver.Tests/Specifications/command-monitoring/TestRunner.cs

@@ -36,9 +36,22 @@ public class TestRunner
         private static EventCapturer __capturedEvents;
         private static Dictionary<string, Func<ICrudOperationTest>> __tests;
 
+        private static string[] __commandsToCapture;
+
         [TestFixtureSetUp]
         public void TestFixtureSetup()
         {
+            __commandsToCapture = new string[]
+            {
+                "delete",
+                "insert",
+                "update",
+                "find",
+                "count",
+                "killCursors",
+                "getMore"
+            };
+
             __tests = new Dictionary<string, Func<ICrudOperationTest>>
             {
                 { "bulkWrite", () => new BulkWriteTest() },
@@ -57,9 +70,9 @@ public void TestFixtureSetup()
         public void TestFixtureSetUp()
         {
             __capturedEvents = new EventCapturer()
-                .Capture<CommandStartedEvent>()
-                .Capture<CommandSucceededEvent>()
-                .Capture<CommandFailedEvent>();
+                .Capture<CommandStartedEvent>(e => __commandsToCapture.Contains(e.CommandName))
+                .Capture<CommandSucceededEvent>(e => __commandsToCapture.Contains(e.CommandName))
+                .Capture<CommandFailedEvent>(e => __commandsToCapture.Contains(e.CommandName));
 
             var settings = new MongoClientSettings
             {