Restore some stuff in interfaces

jakubch1 · jakubch1 · commit 5e51a03360a4 · 2020-07-01T09:57:39.000+02:00
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper.cs
@@ -39,12 +39,12 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
         /// <param name="discoverySettings">Settings XML for test discovery</param>
         /// <param name="options">Options to be passed into the platform.</param>
         /// <param name="discoveryEventsHandler">EventHandler to receive discovery events</param>
-        void DiscoverTests(IEnumerable<string> sources, string discoverySettings, TestPlatformOptions options, ITestDiscoveryEventsHandler2 discoveryEventsHandler);
+        void DiscoverTests(IEnumerable<string> sources, string discoverySettings, TestPlatformOptions options, ITestDiscoveryEventsHandler2 discoveryEventsHandler);        
 
         /// <summary>
         /// Cancels the last discovery request.
         /// </summary>
-        void CancelDiscovery();
+        new void CancelDiscovery();
 
         /// <summary>
         /// Starts a test run given a list of sources.
@@ -121,16 +121,16 @@ public interface IVsTestConsoleWrapper : IVsTestConsoleWrapperAsync
         /// <summary>
         /// Cancel the last test run.
         /// </summary>
-        void CancelTestRun();
+        new void CancelTestRun();
 
         /// <summary>
         /// Abort the last test run.
         /// </summary>
-        void AbortTestRun();
+        new void AbortTestRun();
 
         /// <summary>
         /// Ends the test session and stops processing requests.
         /// </summary>
-        void EndSession();
+        new void EndSession();
     }
 }
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapperAsync.cs
@@ -37,6 +37,11 @@ public interface IVsTestConsoleWrapperAsync
         /// </summary>
         Task DiscoverTestsAsync(IEnumerable<string> sources, string discoverySettings, TestPlatformOptions options, ITestDiscoveryEventsHandler2 discoveryEventsHandler);
 
+        /// <summary>
+        /// See <see cref="IVsTestConsoleWrapper.CancelDiscovery"/>.
+        /// </summary>
+        void CancelDiscovery();
+
         /// <summary>
         /// Asynchronous equivalent of <see cref="IVsTestConsoleWrapper.RunTests(IEnumerable{string}, string, ITestRunEventsHandler)"/>.
         /// </summary>
@@ -77,6 +82,16 @@ public interface IVsTestConsoleWrapperAsync
         /// </summary>
         Task RunTestsWithCustomTestHostAsync(IEnumerable<TestCase> testCases, string runSettings, TestPlatformOptions options, ITestRunEventsHandler testRunEventsHandler, ITestHostLauncher customTestHostLauncher);
 
+        /// <summary>
+        /// See <see cref="IVsTestConsoleWrapper.CancelTestRun"/>.
+        /// </summary>
+        void CancelTestRun();
+
+        /// <summary>
+        /// See <see cref="IVsTestConsoleWrapper.AbortTestRun"/>.
+        /// </summary>
+        void AbortTestRun();
+
         /// <summary>
         /// Provides back all attachments to TestPlatform for additional processing (for example merging)
         /// </summary>
@@ -86,5 +101,10 @@ public interface IVsTestConsoleWrapperAsync
         /// <param name="eventsHandler">EventHandler to receive session complete event</param>
         /// <param name="cancellationToken">Cancellation token</param>        
         Task FinalizeMultiTestRunAsync(IEnumerable<AttachmentSet> attachments, bool multiTestRunCompleted, bool collectMetrics, IMultiTestRunFinalizationEventsHandler eventsHandler, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// See <see cref="IVsTestConsoleWrapper.EndSession"/>.
+        /// </summary>
+        void EndSession();
     }
 }
