Merge pull request #833 from DustinCampbell/fix-dotnet-test-bugs

Fix dotnet test bugs
OmniSharp · Apr 27, 2017 · 67c3406 · 67c3406
2 parents 3075973 + ad6632a
commit 67c3406
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 37 deletions.
diff --git a/src/OmniSharp.DotNetTest/Legacy/LegacyTestManager.cs b/src/OmniSharp.DotNetTest/Legacy/LegacyTestManager.cs
@@ -8,6 +8,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using OmniSharp.DotNetTest.Models;
 using OmniSharp.DotNetTest.Models.Events;
 using OmniSharp.DotNetTest.TestFrameworks;
@@ -84,17 +85,15 @@ public override RunTestResponse RunTest(string methodName, string testFrameworkN
 
             testProcess.OutputDataReceived += (_, e) =>
             {
-                EventEmitter.Emit(TestMessageEvent.Id,
-                    new TestMessageEvent
-                    {
-                        MessageLevel = "info",
-                        Message = e.Data ?? string.Empty
-                    });
-
+                EmitTestMessage(TestMessageLevel.Informational, e.Data ?? string.Empty);
                 output.AppendLine(e.Data);
             };
 
-            testProcess.ErrorDataReceived += (_, e) => error.AppendLine(e.Data);
+            testProcess.ErrorDataReceived += (_, e) =>
+            {
+                EmitTestMessage(TestMessageLevel.Error, e.Data ?? string.Empty);
+                error.AppendLine(e.Data);
+            };
 
             testProcess.BeginOutputReadLine();
             testProcess.BeginErrorReadLine();

diff --git a/src/OmniSharp.DotNetTest/TestManager.cs b/src/OmniSharp.DotNetTest/TestManager.cs
@@ -10,8 +10,10 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using OmniSharp.DotNetTest.Legacy;
 using OmniSharp.DotNetTest.Models;
+using OmniSharp.DotNetTest.Models.Events;
 using OmniSharp.Eventing;
 using OmniSharp.Services;
 using OmniSharp.Utilities;
@@ -179,6 +181,21 @@ private static int FindFreePort()
             }
         }
 
+        protected void EmitTestMessage(TestMessageLevel messageLevel, string message)
+        {
+            EventEmitter.Emit(TestMessageEvent.Id,
+                new TestMessageEvent
+                {
+                    MessageLevel = messageLevel.ToString().ToLowerInvariant(),
+                    Message = message
+                });
+        }
+
+        protected void EmitTestMessage(TestMessagePayload testMessage)
+        {
+            EmitTestMessage(testMessage.MessageLevel, testMessage.Message);
+        }
+
         protected Message ReadMessage()
         {
             var rawMessage = _reader.ReadString();

diff --git a/src/OmniSharp.DotNetTest/VSTestManager.cs b/src/OmniSharp.DotNetTest/VSTestManager.cs
@@ -10,8 +10,8 @@
 using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
+using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using OmniSharp.DotNetTest.Models;
-using OmniSharp.DotNetTest.Models.Events;
 using OmniSharp.DotNetTest.TestFrameworks;
 using OmniSharp.Eventing;
 using OmniSharp.Services;
@@ -47,9 +47,24 @@ protected override bool PrepareToConnect()
         {
             // The project must be built before we can test.
             var process = DotNetCli.Start("build", WorkingDirectory);
+
+            process.OutputDataReceived += (_, e) =>
+            {
+                EmitTestMessage(TestMessageLevel.Informational, e.Data ?? string.Empty);
+            };
+
+            process.ErrorDataReceived += (_, e) =>
+            {
+                EmitTestMessage(TestMessageLevel.Error, e.Data ?? string.Empty);
+            };
+
+            process.BeginOutputReadLine();
+            process.BeginErrorReadLine();
+
             process.WaitForExit();
 
-            return File.Exists(Project.OutputFilePath);
+            return process.ExitCode == 0
+                && File.Exists(Project.OutputFilePath);
         }
 
         private static void VerifyTestFramework(string testFrameworkName)
@@ -131,14 +146,7 @@ public override async Task DebugLaunchAsync(CancellationToken cancellationToken)
                 switch (message.MessageType)
                 {
                     case MessageType.TestMessage:
-                        var testMessage = message.DeserializePayload<TestMessagePayload>();
-                        EventEmitter.Emit(TestMessageEvent.Id,
-                            new TestMessageEvent
-                            {
-                                MessageLevel = testMessage.MessageLevel.ToString().ToLowerInvariant(),
-                                Message = testMessage.Message
-                            });
-
+                        EmitTestMessage(message.DeserializePayload<TestMessagePayload>());
                         break;
 
                     case MessageType.ExecutionComplete:
@@ -174,14 +182,7 @@ public override RunTestResponse RunTest(string methodName, string testFrameworkN
                     switch (message.MessageType)
                     {
                         case MessageType.TestMessage:
-                            var testMessage = message.DeserializePayload<TestMessagePayload>();
-                            EventEmitter.Emit(TestMessageEvent.Id,
-                                new TestMessageEvent
-                                {
-                                    MessageLevel = testMessage.MessageLevel.ToString().ToLowerInvariant(),
-                                    Message = testMessage.Message
-                                });
-
+                            EmitTestMessage(message.DeserializePayload<TestMessagePayload>());
                             break;
 
                         case MessageType.TestRunStatsChange:
@@ -240,12 +241,23 @@ private async Task<TestCase[]> DiscoverTestsAsync(string methodName, Cancellatio
                 switch (message.MessageType)
                 {
                     case MessageType.TestMessage:
+                        EmitTestMessage(message.DeserializePayload<TestMessagePayload>());
                         break;
 
                     case MessageType.TestCasesFound:
                         foreach (var testCase in message.DeserializePayload<TestCase[]>())
                         {
-                            if (testCase.DisplayName.StartsWith(methodName))
+                            var testName = testCase.FullyQualifiedName;
+
+                            var testNameEnd = testName.IndexOf('(');
+                            if (testNameEnd >= 0)
+                            {
+                                testName = testName.Substring(0, testNameEnd);
+                            }
+
+                            testName = testName.Trim();
+
+                            if (testName.Equals(methodName, StringComparison.Ordinal))
                             {
                                 testCases.Add(testCase);
                             }

diff --git a/test-assets/test-projects/XunitTestProject/TestProgram.cs b/test-assets/test-projects/XunitTestProject/TestProgram.cs
@@ -30,5 +30,23 @@ private void UtilityFunction()
         {
 
         }
+
+        [Fact(DisplayName = "My Test Name")]
+        public void UsesDisplayName()
+        {
+            Assert.True(true);
+        }
+
+        [Fact]
+        public void TestWithSimilarName()
+        {
+            Assert.True(true);
+        }
+
+        [Fact]
+        public void TestWithSimilarNameFooBar()
+        {
+            Assert.True(true);
+        }
     }
 }
diff --git a/tests/OmniSharp.DotNetTest.Tests/AbstractGetTestStartInfoFacts.cs b/tests/OmniSharp.DotNetTest.Tests/AbstractGetTestStartInfoFacts.cs
@@ -9,7 +9,7 @@
 
 namespace OmniSharp.DotNetTest.Tests
 {
-    internal abstract class AbstractGetTestStartInfoFacts : AbstractSingleRequestHandlerTestFixture<GetTestStartInfoService>
+    public abstract class AbstractGetTestStartInfoFacts : AbstractTestFixture
     {
         protected const string LegacyXunitTestProject = "LegacyXunitTestProject";
         protected const string LegacyNunitTestProject = "LegacyNunitTestProject";
@@ -21,7 +21,11 @@ protected AbstractGetTestStartInfoFacts(ITestOutputHelper output)
         {
         }
 
-        protected override string EndpointName { get; } = OmniSharpEndpoints.V2.GetTestStartInfo;
+        internal GetTestStartInfoService GetRequestHandler(OmniSharpTestHost host)
+        {
+            return host.GetRequestHandler<GetTestStartInfoService>(OmniSharpEndpoints.V2.GetTestStartInfo);
+        }
+
 
         public abstract bool UseLegacyDotNetCli { get; }
 
@@ -46,6 +50,5 @@ protected async Task GetDotNetTestStartInfoAsync(string projectName, string meth
                 Assert.Equal(dotNetCli.DotNetPath, response.Executable);
             }
         }
-
     }
 }
diff --git a/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs
@@ -8,7 +8,7 @@
 
 namespace OmniSharp.DotNetTest.Tests
 {
-    internal abstract class AbstractRunTestFacts : AbstractSingleRequestHandlerTestFixture<RunTestService>
+    public abstract class AbstractRunTestFacts : AbstractTestFixture
     {
         protected const string LegacyXunitTestProject = "LegacyXunitTestProject";
         protected const string LegacyNunitTestProject = "LegacyNunitTestProject";
@@ -20,11 +20,14 @@ public AbstractRunTestFacts(ITestOutputHelper testOutput)
         {
         }
 
-        protected override string EndpointName { get; } = OmniSharpEndpoints.V2.RunTest;
+        internal RunTestService GetRequestHandler(OmniSharpTestHost host)
+        {
+            return host.GetRequestHandler<RunTestService>(OmniSharpEndpoints.V2.RunTest);
+        }
 
         public abstract bool UseLegacyDotNetCli { get; }
 
-        protected async Task RunDotNetTestAsync(string projectName, string methodName, string testFramework, bool shouldPass)
+        protected async Task<RunTestResponse> RunDotNetTestAsync(string projectName, string methodName, string testFramework, bool shouldPass, bool expectResults = true)
         {
             using (var testProject = await TestAssets.Instance.GetTestProjectAsync(projectName))
             using (var host = CreateOmniSharpHost(testProject.Directory, useLegacyDotNetCli: UseLegacyDotNetCli))
@@ -40,6 +43,11 @@ protected async Task RunDotNetTestAsync(string projectName, string methodName, s
 
                 var response = await service.Handle(request);
 
+                if (expectResults)
+                {
+                    Assert.True(response.Results?.Length > 0, "Expected test to return results.");
+                }
+
                 if (shouldPass)
                 {
                     Assert.True(response.Pass, "Expected test to pass but it failed");
@@ -48,6 +56,8 @@ protected async Task RunDotNetTestAsync(string projectName, string methodName, s
                 {
                     Assert.False(response.Pass, "Expected test to fail but it passed");
                 }
+
+                return response;
             }
         }
     }

diff --git a/tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs b/tests/OmniSharp.DotNetTest.Tests/GetTestStartInfoFacts.cs
@@ -4,7 +4,7 @@
 
 namespace OmniSharp.DotNetTest.Tests
 {
-    internal class GetTestStartInfoFacts : AbstractGetTestStartInfoFacts
+    public class GetTestStartInfoFacts : AbstractGetTestStartInfoFacts
     {
         public GetTestStartInfoFacts(ITestOutputHelper output) : base(output)
         {

diff --git a/tests/OmniSharp.DotNetTest.Tests/LegacyGetTestStartInfoFacts.cs b/tests/OmniSharp.DotNetTest.Tests/LegacyGetTestStartInfoFacts.cs
@@ -4,7 +4,7 @@
 
 namespace OmniSharp.DotNetTest.Tests
 {
-    internal class LegacyGetTestStartInfoFacts : AbstractGetTestStartInfoFacts
+    public class LegacyGetTestStartInfoFacts : AbstractGetTestStartInfoFacts
     {
         public LegacyGetTestStartInfoFacts(ITestOutputHelper testOutput) : base(testOutput)
         {

diff --git a/tests/OmniSharp.DotNetTest.Tests/LegacyRunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/LegacyRunTestFacts.cs
@@ -7,7 +7,7 @@ namespace OmniSharp.DotNetTest.Tests
     /// <summary>
     /// Tests for legacy 'dotnet test' support for project.json support.
     /// </summary>
-    internal class LegacyRunTestFacts : AbstractRunTestFacts
+    public class LegacyRunTestFacts : AbstractRunTestFacts
     {
         public LegacyRunTestFacts(ITestOutputHelper output)
             : base(output)

diff --git a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs
@@ -4,7 +4,7 @@
 
 namespace OmniSharp.DotNetTest.Tests
 {
-    internal class RunTestFacts : AbstractRunTestFacts
+    public class RunTestFacts : AbstractRunTestFacts
     {
         public RunTestFacts(ITestOutputHelper testOutput)
             : base(testOutput)
@@ -43,6 +43,28 @@ await RunDotNetTestAsync(
                 shouldPass: true);
         }
 
+        [Fact]
+        public async Task RunXunitTestWithDisplayName()
+        {
+            await RunDotNetTestAsync(
+                XunitTestProject,
+                methodName: "Main.Test.MainTest.UsesDisplayName",
+                testFramework: "xunit",
+                shouldPass: true);
+        }
+
+        [Fact]
+        public async Task RunXunitTestWithSimilarName()
+        {
+            var response = await RunDotNetTestAsync(
+                XunitTestProject,
+                methodName: "Main.Test.MainTest.TestWithSimilarName",
+                testFramework: "xunit",
+                shouldPass: true);
+
+            Assert.Equal(1, response.Results.Length);
+        }
+
         // NUnit does not work with .NET CLI RTM yet. https://github.com/nunit/dotnet-test-nunit/issues/108
         // When it does, the NUnitTestProject should be updated and the tests below re-enabled.