From e8fe9d8edef328d159d73d14718f6b8b8d888090 Mon Sep 17 00:00:00 2001 From: Dustin Campbell Date: Thu, 27 Apr 2017 08:26:41 -0700 Subject: [PATCH 1/2] Get NUnit test running/debugging working --- src/OmniSharp.DotNetTest/VSTestManager.cs | 16 +++++++++++----- .../NUnitTestProject/NUnitTestProject.csproj | 2 +- .../test-projects/NUnitTestProject/NuGet.config | 9 +++++++++ tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs | 11 ++++------- 4 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 test-assets/test-projects/NUnitTestProject/NuGet.config diff --git a/src/OmniSharp.DotNetTest/VSTestManager.cs b/src/OmniSharp.DotNetTest/VSTestManager.cs index 9e96ab2b25..5c7fe8113f 100644 --- a/src/OmniSharp.DotNetTest/VSTestManager.cs +++ b/src/OmniSharp.DotNetTest/VSTestManager.cs @@ -20,6 +20,8 @@ namespace OmniSharp.DotNetTest { internal class VSTestManager : TestManager { + private const string DefaultRunSettings = ""; + public VSTestManager(Project project, string workingDirectory, DotNetCliService dotNetCli, IEventEmitter eventEmitter, ILoggerFactory loggerFactory) : base(project, workingDirectory, dotNetCli, eventEmitter, loggerFactory.CreateLogger()) { @@ -27,7 +29,7 @@ public VSTestManager(Project project, string workingDirectory, DotNetCliService protected override string GetCliTestArguments(int port, int parentProcessId) { - return $"vstest --Port:{port} --ParentProcessId:{parentProcessId}"; + return $"vstest --Port:{port} --ParentProcessId:{parentProcessId}"; } protected override void VersionCheck() @@ -86,7 +88,8 @@ public override GetTestStartInfoResponse GetTestStartInfo(string methodName, str new { TestCases = testCases, - DebuggingEnabled = true + DebuggingEnabled = true, + RunSettings = DefaultRunSettings }); var message = ReadMessage(); @@ -110,7 +113,8 @@ public override async Task DebugGetStartInfoAsync new { TestCases = testCases, - DebuggingEnabled = true + DebuggingEnabled = true, + RunSettings = DefaultRunSettings }); var message = await ReadMessageAsync(cancellationToken); @@ -170,7 +174,8 @@ public override RunTestResponse RunTest(string methodName, string testFrameworkN SendMessage(MessageType.TestRunSelectedTestCasesDefaultHost, new { - TestCases = testCases + TestCases = testCases, + RunSettings = DefaultRunSettings }); var done = false; @@ -224,7 +229,8 @@ private async Task DiscoverTestsAsync(string methodName, Cancellatio Sources = new[] { Project.OutputFilePath - } + }, + RunSettings = DefaultRunSettings }); var testCases = new List(); diff --git a/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj b/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj index def8e83369..cf85e2121e 100644 --- a/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj +++ b/test-assets/test-projects/NUnitTestProject/NUnitTestProject.csproj @@ -7,7 +7,7 @@ - + diff --git a/test-assets/test-projects/NUnitTestProject/NuGet.config b/test-assets/test-projects/NUnitTestProject/NuGet.config new file mode 100644 index 0000000000..4da3f8ba7e --- /dev/null +++ b/test-assets/test-projects/NUnitTestProject/NuGet.config @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs index d588e6d0f2..a0753f4c64 100644 --- a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs +++ b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs @@ -65,10 +65,7 @@ public async Task RunXunitTestWithSimilarName() 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. - - //[Fact] + [Fact] public async Task RunNunitTest() { await RunDotNetTestAsync( @@ -78,7 +75,7 @@ await RunDotNetTestAsync( shouldPass: true); } - //[Fact] + [Fact] public async Task RunNunitDataDriveTest1() { await RunDotNetTestAsync( @@ -88,7 +85,7 @@ await RunDotNetTestAsync( shouldPass: false); } - //[Fact] + [Fact] public async Task RunNunitDataDriveTest2() { await RunDotNetTestAsync( @@ -98,7 +95,7 @@ await RunDotNetTestAsync( shouldPass: true); } - //[Fact] + [Fact] public async Task RunNunitSourceDataDrivenTest() { await RunDotNetTestAsync( From 07ab27a4e51260bdeed0c328a8a63d4aa2949f5f Mon Sep 17 00:00:00 2001 From: Dustin Campbell Date: Thu, 27 Apr 2017 09:32:23 -0700 Subject: [PATCH 2/2] Fix project names to account for case-sensitive file systems --- tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs | 2 +- tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs index 1fd0705ea1..fc52e02c59 100644 --- a/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs +++ b/tests/OmniSharp.DotNetTest.Tests/AbstractRunTestFacts.cs @@ -13,7 +13,7 @@ public abstract class AbstractRunTestFacts : AbstractTestFixture protected const string LegacyXunitTestProject = "LegacyXunitTestProject"; protected const string LegacyNunitTestProject = "LegacyNunitTestProject"; protected const string XunitTestProject = "XunitTestProject"; - protected const string NunitTestProject = "NunitTestProject"; + protected const string NUnitTestProject = "NUnitTestProject"; public AbstractRunTestFacts(ITestOutputHelper testOutput) : base(testOutput) diff --git a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs index a0753f4c64..01218d9884 100644 --- a/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs +++ b/tests/OmniSharp.DotNetTest.Tests/RunTestFacts.cs @@ -69,7 +69,7 @@ public async Task RunXunitTestWithSimilarName() public async Task RunNunitTest() { await RunDotNetTestAsync( - NunitTestProject, + NUnitTestProject, methodName: "Main.Test.MainTest.Test", testFramework: "nunit", shouldPass: true); @@ -79,7 +79,7 @@ await RunDotNetTestAsync( public async Task RunNunitDataDriveTest1() { await RunDotNetTestAsync( - NunitTestProject, + NUnitTestProject, methodName: "Main.Test.MainTest.DataDrivenTest1", testFramework: "nunit", shouldPass: false); @@ -89,7 +89,7 @@ await RunDotNetTestAsync( public async Task RunNunitDataDriveTest2() { await RunDotNetTestAsync( - NunitTestProject, + NUnitTestProject, methodName: "Main.Test.MainTest.DataDrivenTest2", testFramework: "nunit", shouldPass: true); @@ -99,7 +99,7 @@ await RunDotNetTestAsync( public async Task RunNunitSourceDataDrivenTest() { await RunDotNetTestAsync( - NunitTestProject, + NUnitTestProject, methodName: "Main.Test.MainTest.SourceDataDrivenTest", testFramework: "nunit", shouldPass: true);