Close discovery manager on request complete. (#72)

microsoft · Sep 23, 2016 · d9dbd28 · d9dbd28
1 parent 2bbf394
commit d9dbd28
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs b/src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs
@@ -244,6 +244,9 @@ public void HandleDiscoveryComplete(long totalTests, IEnumerable<TestCase> lastC
                     }
 
                     this.discoveryInProgress = false;
+
+                    // Close the discovery session
+                    this.DiscoveryManager?.Close();
                 }
             }
 

diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs b/test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs
@@ -3,13 +3,15 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests.Discovery
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
 
     using Client.Discovery;
 
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 
     using Moq;
 
+    using ObjectModel;
     using ObjectModel.Client;
     using ObjectModel.Engine;
 
@@ -99,5 +101,15 @@ public void WaitForCompletionIfDiscoveryRequestDisposedShouldThrowObjectDisposed
             this.discoveryRequest.Dispose();
             Assert.ThrowsException<ObjectDisposedException>(() => this.discoveryRequest.WaitForCompletion());
         }
+
+        [TestMethod]
+        public void HandleDiscoveryCompleteShouldCloseDiscoveryManager()
+        {
+            var eventsHandler = this.discoveryRequest as ITestDiscoveryEventsHandler;
+
+            eventsHandler.HandleDiscoveryComplete(1, Enumerable.Empty<TestCase>(), false);
+
+            this.discoveryManager.Verify(dm => dm.Close(), Times.Once);
+        }
     }
 }