more tests

microsoft · Jun 16, 2020 · 89f7eed · 89f7eed
1 parent 3176175
commit 89f7eed
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/test/TranslationLayer.UnitTests/VsTestConsoleWrapperAsyncTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleWrapperAsyncTests.cs
@@ -5,6 +5,8 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
 {
     using System;
     using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.Threading;
     using System.Threading.Tasks;
 
     using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
@@ -302,6 +304,20 @@ await this.consoleWrapper.RunTestsWithCustomTestHostAsync(
             this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHostAsync(this.testCases, "RunSettings", options, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
         }
 
+        [TestMethod]
+        public async Task FinalizeMultiTestRunAsyncShouldSucceed()
+        {
+            var attachments = new Collection<AttachmentSet>();
+            var cancellationToken = new CancellationToken();
+
+            await this.consoleWrapper.FinalizeMultiTestRunAsync(
+                attachments,
+                new Mock<IMultiTestRunFinalizationEventsHandler>().Object,
+                cancellationToken);
+
+            this.mockRequestSender.Verify(rs => rs.FinalizeMultiTestRunAsync(attachments, It.IsAny<IMultiTestRunFinalizationEventsHandler>(), cancellationToken));
+        }
+
         [TestMethod]
         public void EndSessionShouldSucceed()
         {

diff --git a/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs b/test/TranslationLayer.UnitTests/VsTestConsoleWrapperTests.cs
@@ -13,7 +13,10 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests
     using Moq;
     using System;
     using System.Collections.Generic;
+    using System.Collections.ObjectModel;
     using System.Diagnostics;
+    using System.Threading;
+    using System.Threading.Tasks;
 
     [TestClass]
     public class VsTestConsoleWrapperTests
@@ -303,6 +306,20 @@ public void RunTestsWithSelectedTestsAndOptionsUsingACustomHostShouldPassOnOptio
             this.mockRequestSender.Verify(rs => rs.StartTestRunWithCustomHost(this.testCases, "RunSettings", options, It.IsAny<ITestRunEventsHandler>(), It.IsAny<ITestHostLauncher>()), Times.Once);
         }
 
+        [TestMethod]
+        public async Task FinalizeMultiTestRunAsyncShouldSucceed()
+        {
+            var attachments = new Collection<AttachmentSet>();
+            var cancellationToken = new CancellationToken();
+
+            await this.consoleWrapper.FinalizeMultiTestRunAsync(
+                attachments,
+                new Mock<IMultiTestRunFinalizationEventsHandler>().Object,
+                cancellationToken);
+
+            this.mockRequestSender.Verify(rs => rs.FinalizeMultiTestRunAsync(attachments, It.IsAny<IMultiTestRunFinalizationEventsHandler>(), cancellationToken));
+        }
+
         [TestMethod]
         public void EndSessionShouldSucceed()
         {

diff --git a/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs b/test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
@@ -81,6 +81,7 @@ public TestRequestManagerTests()
 
 			this.mockMetricsPublisher = new Mock<IMetricsPublisher>();
 			this.mockMetricsPublisherTask = Task.FromResult(this.mockMetricsPublisher.Object);
+			this.mockFinalizationManager = new Mock<IMultiTestRunFinalizationManager>();
 			this.testRequestManager = new TestRequestManager(
 				this.commandLineOptions,
 				this.mockTestPlatform.Object,
@@ -102,8 +103,7 @@ public TestRequestManagerTests()
 			this.mockAssemblyMetadataProvider.Setup(a => a.GetFrameWork(It.IsAny<string>()))
 				.Returns(new FrameworkName(Constants.DotNetFramework40));
 			this.mockProcessHelper.Setup(x => x.GetCurrentProcessId()).Returns(1234);
-			this.mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny<int>())).Returns("dotnet.exe");
-			this.mockFinalizationManager = new Mock<IMultiTestRunFinalizationManager>();
+			this.mockProcessHelper.Setup(x => x.GetProcessName(It.IsAny<int>())).Returns("dotnet.exe");			
 		}
 
 		[TestCleanup]