New version

src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IMultiTestRunsFinalizationManager.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine.TesthostProtocol
+{
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+    using System.Collections.Generic;
+
+    namespace Microsoft.VisualStudio.TestPlatform.Common.Interfaces.Engine.TesthostProtocol
+    {
+        /// <summary>
+        /// Orchestrates multi test runs finalization operations for the engine communicating with the test host process.
+        /// </summary>
+        public interface IMultiTestRunsFinalizationManager
+        {
+            /// <summary>
+            /// Discovers tests
+            /// </summary>
+            /// <param name="discoveryCriteria">Settings, parameters for the discovery request</param>
+            /// <param name="eventHandler">EventHandler for handling discovery events from Engine</param>
+            void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler eventHandler);
+        }
+    }
+}

src/Microsoft.TestPlatform.CrossPlatEngine/MultiTestRunsFinalization/MultiTestRunsFinalizationManager.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.MultiTestRunsFinalization
+{
+    class MultiTestRunsFinalizationManager
+    {
+    }
+}

src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMultiTestRunsFinalizationCompleteEventsHandler.cs → src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IMultiTestRunsFinalizationEventsHandler.cs

@@ -8,7 +8,7 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Client
     /// <summary>
     /// Interface contract for handling multi test runs finalization complete events
     /// </summary>
-    public interface IMultiTestRunsFinalizationCompleteEventsHandler : ITestMessageEventHandler
+    public interface IMultiTestRunsFinalizationEventsHandler : ITestMessageEventHandler
     {
         /// <summary>
         /// Dispatch SessionComplete event to listeners.

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs

@@ -116,6 +116,6 @@ internal interface ITranslationLayerRequestSender : IDisposable
         /// </summary>
         /// <param name="attachments">List of attachements</param>
         /// <param name="multiTestRunsFinalizationCompleteEventsHandler"></param>
-        void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationCompleteEventsHandler multiTestRunsFinalizationCompleteEventsHandler);
+        void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler multiTestRunsFinalizationCompleteEventsHandler);
     }
 }

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper2.cs

@@ -18,6 +18,6 @@ public interface IVsTestConsoleWrapper2 : IVsTestConsoleWrapper
         /// </summary>
         /// <param name="attachments">List of attachements</param>
         /// <param name="multiTestRunsFinalizationCompleteEventsHandler">EventHandler to receive session complete event</param>
-        void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationCompleteEventsHandler multiTestRunsFinalizationCompleteEventsHandler);
+        void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler multiTestRunsFinalizationCompleteEventsHandler);
     }
 }

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs

@@ -385,7 +385,7 @@ public void EndSession()
         }
 
         /// <inheritdoc/>
-        public void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationCompleteEventsHandler testSessionEventsHandler)
+        public void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler testSessionEventsHandler)
         {
             this.SendMessageAndListenAndReportAttachements(attachments, testSessionEventsHandler);
         }
@@ -732,7 +732,7 @@ private async Task SendMessageAndListenAndReportTestResultsAsync(string messageT
             this.testPlatformEventSource.TranslationLayerExecutionStop();
         }
 
-        private void SendMessageAndListenAndReportAttachements(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationCompleteEventsHandler eventHandler)
+        private void SendMessageAndListenAndReportAttachements(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler eventHandler)
         {
             try
             {

src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs

@@ -278,10 +278,11 @@ public void EndSession()
         #region IVsTestConsoleWrapper2
 
         /// <inheritdoc/>
-        public void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationCompleteEventsHandler testSessionEventsHandler)
+        public void FinalizeMultiTestRuns(IEnumerable<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler testSessionEventsHandler)
         {
-            this.EnsureInitialized();
+            this.testPlatformEventSource.TranslationLayerMultiTestRunsFinalizationStart();
 
+            this.EnsureInitialized();
             this.requestSender.FinalizeMultiTestRuns(attachments, testSessionEventsHandler);
         }