Add support for running xUnit tests in VS Test Explorer (#642)

Fix issue with running xUnit tests over and over.  Have a better
way to detect when the session details file has been written.

Fix issue with ServiceReturnsPowerShellVersionDetails test,
where it only worked when you ran the tests using x86 arch.
It now runs correctly using x64.

Author: rkeithhill

test/PowerShellEditorServices.Test.Host/LanguageServerTests.cs

@@ -825,7 +825,9 @@ await this.SendRequest(
             Assert.StartsWith("5.", versionDetails.Version);
             Assert.StartsWith("5.", versionDetails.DisplayVersion);
             Assert.Equal("Desktop", versionDetails.Edition);
-            Assert.Equal("x86", versionDetails.Architecture);
+
+            string expectedArchitecture = (IntPtr.Size == 8) ? "x64" : "x86";
+            Assert.Equal(expectedArchitecture, versionDetails.Architecture);
         }
 
         private async Task SendOpenFileEvent(string filePath, bool waitForDiagnostics = true)

test/PowerShellEditorServices.Test.Host/PowerShellEditorServices.Test.Host.csproj

@@ -22,6 +22,7 @@
     <PackageReference Include="Microsoft.PowerShell.SDK">
       <Version>6.0.0-alpha13</Version>
     </PackageReference>
+    <PackageReference Include="more.xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta4-build3742" />
   </ItemGroup>

test/PowerShellEditorServices.Test.Host/ServerTestsBase.cs

@@ -51,6 +51,11 @@ protected async Task<Tuple<int, int>> LaunchService(
                 Path.Combine(
                     Path.GetDirectoryName(assemblyPath), $"session-{++sessionCounter}.json");
 
+            if (File.Exists(sessionPath))
+            {
+                File.Delete(sessionPath);
+            }
+
             string editorServicesModuleVersion =
                 string.Format(
                     "{0}.{1}.{2}",
@@ -106,20 +111,42 @@ protected async Task<Tuple<int, int>> LaunchService(
             // Start the process
             this.serviceProcess.Start();
 
-            // Wait for the server to finish initializing
-            while (!File.Exists(sessionPath) || (new FileInfo(sessionPath).Length == 0))
+            string sessionDetailsText = string.Empty;
+
+            // Wait up to ~5 seconds for the server to finish initializing
+            var maxRetryAttempts = 10;
+            while (maxRetryAttempts-- > 0)
             {
-                Thread.Sleep(100);
+                try
+                {
+                    using (var stream = new FileStream(sessionPath, FileMode.Open, FileAccess.Read, FileShare.None))
+                    using (var reader = new StreamReader(stream))
+                    {
+                        sessionDetailsText = reader.ReadToEnd();
+                        break;
+                    }
+                }
+                catch (FileNotFoundException)
+                {
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"Session details at '{sessionPath}' not available: {ex.Message}");
+                }
+
+                Thread.Sleep(500);
             }
 
-            JObject result = JObject.Parse(File.ReadAllText(sessionPath));
+            JObject result = JObject.Parse(sessionDetailsText);
             if (result["status"].Value<string>() == "started")
             {
                 return new Tuple<int, int>(
                     result["languageServicePort"].Value<int>(),
                     result["debugServicePort"].Value<int>());
             }
 
+            Debug.WriteLine($"Failed to read session details from '{sessionPath}'");
+
             return null;
         }
 

test/PowerShellEditorServices.Test.Protocol/PowerShellEditorServices.Test.Protocol.csproj

@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="more.xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Newtonsoft.Json">
       <Version>9.0.1</Version>
     </PackageReference>

test/PowerShellEditorServices.Test/PowerShellEditorServices.Test.csproj

@@ -15,6 +15,7 @@
     <PackageReference Include="Microsoft.PowerShell.SDK">
       <Version>6.0.0-alpha13</Version>
     </PackageReference>
+    <PackageReference Include="more.xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta4-build3742" />
   </ItemGroup>