1187 add support for xplat vstest console in translationlayer

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

@@ -11,7 +11,7 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
     using System.Globalization;
 
     /// <summary>
-    /// Vstest.console.exe process manager
+    /// Vstest.console process manager
     /// </summary>
     internal class VsTestConsoleProcessManager : IProcessManager
     {
@@ -34,10 +34,16 @@ internal class VsTestConsoleProcessManager : IProcessManager
         /// </summary>
         private const string DIAG_ARGUMENT = "/diag:{0};tracelevel={1}";
 
+        /// <summary>
+        /// Name of the xplat dotnet cli tool
+        /// </summary>
+        private const string DOTNET_EXECUTABLE = "dotnet";
+
         private string vstestConsolePath;
         private object syncObject = new object();
         private bool vstestConsoleStarted = false;
         private bool vstestConsoleExited = false;
+        private readonly bool isNetCoreRunner;
         private Process process;
 
         #endregion
@@ -50,10 +56,11 @@ internal class VsTestConsoleProcessManager : IProcessManager
         /// <summary>
         /// Creates an instance of VsTestConsoleProcessManager class.
         /// </summary>
-        /// <param name="vstestConsolePath">The fullpath to vstest.console.exe</param>
+        /// <param name="vstestConsolePath">The fullpath to vstest.console</param>
         public VsTestConsoleProcessManager(string vstestConsolePath)
         {
             this.vstestConsolePath = vstestConsolePath;
+            isNetCoreRunner = vstestConsolePath.EndsWith(".dll");
         }
 
         #endregion Constructor
@@ -72,33 +79,35 @@ public bool IsProcessInitialized()
         }
 
         /// <summary>
-        /// Call xUnit.console.exe with the parameters previously specified
+        /// Call vstest.console with the parameters previously specified
         /// </summary>
         public void StartProcess(ConsoleParameters consoleParameters)
         {
-            this.process = new Process();
-            process.StartInfo.FileName = vstestConsolePath;
-            process.StartInfo.Arguments = string.Join(" ", BuildArguments(consoleParameters));
-
-            //process.StartInfo.WorkingDirectory = WorkingDirectory;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.CreateNoWindow = true;
-
-            //process.StartInfo.RedirectStandardOutput = true;
-            //process.StartInfo.RedirectStandardError = true;
+            var info = new ProcessStartInfo(GetConsoleRunner(), string.Join(" ", BuildArguments(consoleParameters)))
+            {
+                UseShellExecute = false,
+                CreateNoWindow = true,
+                RedirectStandardOutput = true,
+                RedirectStandardError = true
+            };
 
-            EqtTrace.Verbose("VsTestCommandLineWrapper: {0} {1}", process.StartInfo.FileName,
-                process.StartInfo.Arguments);
+            EqtTrace.Verbose("VsTestCommandLineWrapper: {0} {1}", info.FileName, info.Arguments);
 
-            process.Start();
-            process.EnableRaisingEvents = true;
-            process.Exited += Process_Exited;
+            process = Process.Start(info);
 
             lock (syncObject)
             {
                 vstestConsoleExited = false;
                 vstestConsoleStarted = true;
             }
+
+            process.EnableRaisingEvents = true;
+            process.Exited += Process_Exited;
+
+            process.OutputDataReceived += Process_OutputDataReceived;
+            process.ErrorDataReceived += Process_ErrorDataReceived;
+            process.BeginOutputReadLine();
+            process.BeginErrorReadLine();
         }
 
         /// <summary>
@@ -109,8 +118,10 @@ public void ShutdownProcess()
             // Ideally process should die by itself
             if (IsProcessInitialized())
             {
-                this.process.Kill();
-                this.process.Dispose();
+                vstestConsoleExited = true;
+                process.OutputDataReceived -= Process_OutputDataReceived;
+                process.ErrorDataReceived -= Process_ErrorDataReceived;
+                process.Dispose();
                 this.process = null;
             }
         }
@@ -119,26 +130,54 @@ private void Process_Exited(object sender, EventArgs e)
         {
             lock (syncObject)
             {
-                vstestConsoleExited = true;
+                ShutdownProcess();
+
                 this.ProcessExited?.Invoke(sender, e);
             }
         }
 
-        private string[] BuildArguments(ConsoleParameters parameters)
+        private void Process_ErrorDataReceived(object sender, DataReceivedEventArgs e)
         {
-            var args = new List<string>();
+            if (e.Data != null)
+            {
+                EqtTrace.Error(e.Data);
+            }
+        }
+
+        private void Process_OutputDataReceived(object sender, DataReceivedEventArgs e)
+        {
+            if (e.Data != null)
+            {
+                EqtTrace.Verbose(e.Data);
+            }
+        }
 
-            // Start Vstest.console.exe with args: --parentProcessId|/parentprocessid:<ppid> --port|/port:<port>
-            args.Add(string.Format(CultureInfo.InvariantCulture, PARENT_PROCESSID_ARGUMENT, parameters.ParentProcessId));
-            args.Add(string.Format(CultureInfo.InvariantCulture, PORT_ARGUMENT, parameters.PortNumber));
+        private string[] BuildArguments(ConsoleParameters parameters)
+        {
+            var args = new List<string>
+            {
+                // Start Vstest.console with args: --parentProcessId|/parentprocessid:<ppid> --port|/port:<port>
+                string.Format(CultureInfo.InvariantCulture, PARENT_PROCESSID_ARGUMENT, parameters.ParentProcessId),
+                string.Format(CultureInfo.InvariantCulture, PORT_ARGUMENT, parameters.PortNumber)
+            };
 
-            if(!string.IsNullOrEmpty(parameters.LogFilePath))
+            if (!string.IsNullOrEmpty(parameters.LogFilePath))
             {
                 // Extra args: --diag|/diag:<PathToLogFile>;tracelevel=<tracelevel>
                 args.Add(string.Format(CultureInfo.InvariantCulture, DIAG_ARGUMENT, parameters.LogFilePath, parameters.TraceLevel));
             }
 
+            if (isNetCoreRunner)
+            {
+                args.Insert(0, vstestConsolePath);
+            }
+
             return args.ToArray();
         }
+
+        private string GetConsoleRunner()
+        {
+            return isNetCoreRunner ? DOTNET_EXECUTABLE : vstestConsolePath;
+        }
     }
 }

test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/CustomTestHostTests.cs

@@ -3,22 +3,18 @@
 
 namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
 {
-    using System.Collections.Generic;
-    using System.Linq;
-
     using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System.Collections.Generic;
+    using System.Linq;
 
     /// <summary>
     /// The Run Tests using VsTestConsoleWrapper API's
     /// </summary>
     [TestClass]
     public class CustomTestHostTests : AcceptanceTestBase
     {
-        private const string Netcoreapp = "netcoreapp";
-        private const string Message = "VsTestConsoleWrapper donot support .Net Core Runner";
-
         private IVsTestConsoleWrapper vstestConsoleWrapper;
         private RunEventHandler runEventHandler;
 
@@ -41,7 +37,6 @@ public void Cleanup()
         public void RunTestsWithCustomTestHostLaunch(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             var customTestHostLauncher = new CustomTestHostLauncher();

test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DifferentTestFrameworkSimpleTests.cs

@@ -3,25 +3,21 @@
 
 namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.IO;
-    using System.Linq;
-
     using Microsoft.TestPlatform.TestUtilities;
     using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
 
     /// <summary>
     /// The Run Tests using VsTestConsoleWrapper API's
     /// </summary>
     [TestClass]
     public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase
     {
-        private const string Netcoreapp = "netcoreapp";
-        private const string Message = "VsTestConsoleWrapper donot support .Net Core Runner";
-
         private IVsTestConsoleWrapper vstestConsoleWrapper;
         private RunEventHandler runEventHandler;
 
@@ -44,7 +40,6 @@ public void Cleanup()
         public void RunTestsWithNunitAdapter(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             var sources = new List<string>
@@ -82,7 +77,6 @@ public void RunTestsWithNunitAdapter(RunnerInfo runnerInfo)
         public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             // Xunit >= 2.2 won't support net451, Minimum target framework it supports is net452.
@@ -129,7 +123,6 @@ public void RunTestsWithXunitAdapter(RunnerInfo runnerInfo)
         public void RunTestsWithChutzpahAdapter(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             var sources = new List<string>

test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DiscoverTests.cs

@@ -3,23 +3,19 @@
 
 namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
     using Microsoft.TestPlatform.TestUtilities;
     using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.Common.Telemetry;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
     using VisualStudio.TestPlatform.ObjectModel.Logging;
 
     [TestClass]
     public class DiscoverTests : AcceptanceTestBase
     {
-        private const string Netcoreapp = "netcoreapp";
-        private const string Message = "VsTestConsoleWrapper donot support .Net Core Runner";
-
         private IVsTestConsoleWrapper vstestConsoleWrapper;
         private DiscoveryEventHandler discoveryEventHandler;
         private DiscoveryEventHandler2 discoveryEventHandler2;
@@ -44,7 +40,6 @@ public void DiscoverTestsUsingDiscoveryEventHandler1(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
 
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             this.vstestConsoleWrapper.DiscoverTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.discoveryEventHandler);
@@ -59,7 +54,6 @@ public void DiscoverTestsUsingDiscoveryEventHandler1(RunnerInfo runnerInfo)
         public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedOut(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             this.vstestConsoleWrapper.DiscoverTests(
@@ -78,7 +72,6 @@ public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedOut(RunnerI
         public void DiscoverTestsShouldFailForFramework35(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
@@ -106,7 +99,6 @@ public void DiscoverTestsShouldFailForFramework35(RunnerInfo runnerInfo)
         public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedIn(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             this.vstestConsoleWrapper.DiscoverTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), new TestPlatformOptions() { CollectMetrics = true }, this.discoveryEventHandler2);
@@ -126,7 +118,6 @@ public void DiscoverTestsUsingDiscoveryEventHandler2AndTelemetryOptedIn(RunnerIn
         public void DiscoverTestsUsingEventHandler2AndBatchSize(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             var discoveryEventHandlerForBatchSize = new DiscoveryEventHandlerForBatchSize();
@@ -155,7 +146,6 @@ public void DiscoverTestsUsingEventHandler2AndBatchSize(RunnerInfo runnerInfo)
         public void DiscoverTestsUsingEventHandler1AndBatchSize(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             var discoveryEventHandlerForBatchSize = new DiscoveryEventHandlerForBatchSize();
@@ -183,7 +173,6 @@ public void DiscoverTestsUsingEventHandler1AndBatchSize(RunnerInfo runnerInfo)
         public void DiscoverTestsUsingSourceNavigation(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             this.vstestConsoleWrapper.DiscoverTests(

test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/LiveUnitTestingTests.cs

@@ -3,20 +3,15 @@
 
 namespace Microsoft.TestPlatform.AcceptanceTests.TranslationLayerTests
 {
-    using System;
-    using System.Collections.Generic;
-    using System.Linq;
-
     using Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
+    using System.Collections.Generic;
+    using System.Linq;
 
     [TestClass]
     public class LiveUnitTestingTests : AcceptanceTestBase
     {
-        private const string Netcoreapp = "netcoreapp";
-        private const string Message = "VsTestConsoleWrapper donot support .Net Core Runner";
-
         private IVsTestConsoleWrapper vstestConsoleWrapper;
         private DiscoveryEventHandler discoveryEventHandler;
         private DiscoveryEventHandler2 discoveryEventHandler2;
@@ -43,7 +38,6 @@ public void Cleanup()
         public void DiscoverTestsUsingLiveUnitTesting(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>
@@ -69,7 +63,6 @@ public void DiscoverTestsUsingLiveUnitTesting(RunnerInfo runnerInfo)
         public void RunTestsWithLiveUnitTesting(RunnerInfo runnerInfo)
         {
             AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
-            this.ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, Netcoreapp, Message);
             this.Setup();
 
             string runSettingsXml = @"<?xml version=""1.0"" encoding=""utf-8""?>