From 29d618d802ee72933dbcf3931916db15f3d3c947 Mon Sep 17 00:00:00 2001
From: Jakub Chocholowicz <jakub.chocholowicz@gmail.com>
Date: Wed, 10 Jun 2020 17:25:21 +0200
Subject: [PATCH] More changes

---
 .../DesignMode/DesignModeClient.cs                |  6 ++++++
 .../Interfaces/ITestRequestHandler.cs             |  6 ------
 .../EventHandlers/TestRequestHandler.cs           | 15 ---------------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
index 9fd465c7a0..64e03580af 100644
--- a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
+++ b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
@@ -227,6 +227,12 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
                                 break;
                             }
 
+                        case MessageType.MultiTestRunsFinalizationCancel:
+                            {
+                                testRequestManager.CancelMultiTestRunsFinalization();
+                                break;
+                            }
+
                         case MessageType.CustomTestHostLaunchCallback:
                             {
                                 this.onCustomTestHostLaunchAckReceived?.Invoke(message);
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs
index a83897979d..8908a72fc7 100644
--- a/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestHandler.cs
@@ -79,12 +79,6 @@ public interface ITestRequestHandler : IDisposable
         /// <param name="lastChunk"> The last Chunk. </param>
         void DiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventArgs, IEnumerable<TestCase> lastChunk);
 
-        /// <summary>
-        /// The multi test runs finalization complete handler
-        /// </summary>
-        /// <param name="attachments">Attachments</param>
-        void MultiTestRunsFinalizationComplete(ICollection<AttachmentSet> attachments);
-
         /// <summary>
         /// Launches a process with a given process info under debugger
         /// Adapter get to call into this to launch any additional processes under debugger
diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
index cb0b7b30a7..2436f0a9f5 100644
--- a/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
+++ b/src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
@@ -11,9 +11,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.EventHandlers;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
     using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.EventHandlers;
-    using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.MultiTestRunsFinalization;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine;
@@ -196,19 +194,6 @@ public void DiscoveryComplete(DiscoveryCompleteEventArgs discoveryCompleteEventA
             this.SendData(data);
         }
 
-        /// <inheritdoc />
-        public void MultiTestRunsFinalizationComplete(ICollection<AttachmentSet> attachments)
-        {
-            var data = this.dataSerializer.SerializePayload(
-                    MessageType.MultiTestRunsFinalizationComplete,
-                    new MultiTestRunsFinalizationCompletePayload
-                    {
-                        Attachments = attachments
-                    },
-                    this.protocolVersion);
-            this.SendData(data);
-        }
-
         /// <inheritdoc />
         public int LaunchProcessWithDebuggerAttached(TestProcessStartInfo testProcessStartInfo)
         {