From 198ce57c22948e0f090e3955852a642f3c898901 Mon Sep 17 00:00:00 2001 From: jnyrup Date: Tue, 24 Apr 2018 13:59:19 +0200 Subject: [PATCH 1/4] Port MSpec to NetCore --- FluentAssertions.sln | 2 +- .../FrameworkSpecs.cs | 0 .../MSpec.Specs.csproj} | 4 +++- .../MSpec.Specs.v2.ncrunchproject | Bin .../MSpec.Specs.v3.ncrunchproject} | 0 build.cake | 3 +-- 6 files changed, 5 insertions(+), 4 deletions(-) rename Tests/TestFrameworks/{MSpec.Net45.Specs => MSpec.Specs}/FrameworkSpecs.cs (100%) rename Tests/TestFrameworks/{MSpec.Net45.Specs/MSpec.Net45.Specs.csproj => MSpec.Specs/MSpec.Specs.csproj} (62%) rename Tests/TestFrameworks/{MSpec.Net45.Specs => MSpec.Specs}/MSpec.Specs.v2.ncrunchproject (100%) rename Tests/TestFrameworks/{MSpec.Net45.Specs/MSpec.Net45.Specs.v3.ncrunchproject => MSpec.Specs/MSpec.Specs.v3.ncrunchproject} (100%) diff --git a/FluentAssertions.sln b/FluentAssertions.sln index fea8e735a7..a18bc97ebe 100644 --- a/FluentAssertions.sln +++ b/FluentAssertions.sln @@ -49,7 +49,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSpec.Net45.Specs", "Tests\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSpec2.Net45.Specs", "Tests\TestFrameworks\NSpec2.Net45.Specs\NSpec2.Net45.Specs.csproj", "{CCC49B53-FD9A-4C36-8BFF-2407A0555A50}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSpec.Net45.Specs", "Tests\TestFrameworks\MSpec.Net45.Specs\MSpec.Net45.Specs.csproj", "{4F210C41-7E8E-424A-B956-FC1AA47663C9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSpec.Specs", "Tests\TestFrameworks\MSpec.Specs\MSpec.Specs.csproj", "{4F210C41-7E8E-424A-B956-FC1AA47663C9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net47.Specs", "Tests\Net47.Specs\Net47.Specs.csproj", "{1E4EFB8D-FB8B-4EF2-83FC-B42D28CD99A3}" EndProject diff --git a/Tests/TestFrameworks/MSpec.Net45.Specs/FrameworkSpecs.cs b/Tests/TestFrameworks/MSpec.Specs/FrameworkSpecs.cs similarity index 100% rename from Tests/TestFrameworks/MSpec.Net45.Specs/FrameworkSpecs.cs rename to Tests/TestFrameworks/MSpec.Specs/FrameworkSpecs.cs diff --git a/Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Net45.Specs.csproj b/Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj similarity index 62% rename from Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Net45.Specs.csproj rename to Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj index 76e6a3bc79..720aae5a4f 100644 --- a/Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Net45.Specs.csproj +++ b/Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj @@ -1,6 +1,6 @@  - net451 + netcoreapp1.1 MSpec.Specs MSpec.Specs @@ -8,6 +8,8 @@ + + \ No newline at end of file diff --git a/Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Specs.v2.ncrunchproject b/Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.v2.ncrunchproject similarity index 100% rename from Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Specs.v2.ncrunchproject rename to Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.v2.ncrunchproject diff --git a/Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Net45.Specs.v3.ncrunchproject b/Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.v3.ncrunchproject similarity index 100% rename from Tests/TestFrameworks/MSpec.Net45.Specs/MSpec.Net45.Specs.v3.ncrunchproject rename to Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.v3.ncrunchproject diff --git a/build.cake b/build.cake index 40b204a4af..c11f4ac697 100644 --- a/build.cake +++ b/build.cake @@ -4,7 +4,6 @@ #tool "nuget:?package=nspec&version=1.0.13" #tool "nuget:?package=nspec&version=2.0.1" #tool "nuget:?package=nspec&version=3.1.0" -#tool "nuget:?package=Machine.Specifications.Runner.Console&version=0.9.3" #tool "nuget:?package=GitVersion.CommandLine" ////////////////////////////////////////////////////////////////////// @@ -91,6 +90,7 @@ Task("Run-Unit-Tests") DotNetCoreTool("./Tests/NetCore13.Specs/NetCore13.Specs.csproj", "xunit", "-configuration debug"); DotNetCoreTool("./Tests/NetCore20.Specs/NetCore.Specs20.csproj", "xunit", "-configuration debug"); + DotNetCoreTest("./Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); DotNetCoreTest("./Tests/TestFrameworks/MSTestV2.Specs/MSTestV2.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); XUnit2("./Tests/TestFrameworks/XUnit.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { }); XUnit2("./Tests/TestFrameworks/XUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { }); @@ -100,7 +100,6 @@ Task("Run-Unit-Tests") StartProcess(Context.Tools.Resolve("nspec.1.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec.Net45.Specs/bin/Debug/net451/NSpec.Specs.dll"); StartProcess(Context.Tools.Resolve("nspec.2.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec2.Net45.Specs/bin/Debug/net451/NSpec2.Specs.dll"); StartProcess(Context.Tools.Resolve("nspec.3.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec3.Net45.Specs/bin/Debug/net451/NSpec3.Specs.dll"); - StartProcess(Context.Tools.Resolve("mspec-clr4.exe"), "./Tests/TestFrameworks/MSpec.Net45.Specs/bin/Debug/net451/MSpec.Specs.dll"); }); Task("Pack") From 92cf35ba6f113f1fa809560e09482f91d5d11d2f Mon Sep 17 00:00:00 2001 From: jnyrup Date: Tue, 24 Apr 2018 14:01:56 +0200 Subject: [PATCH 2/4] Port NUnit3 to NetCore --- FluentAssertions.sln | 2 +- .../FrameworkSpecs.cs | 0 .../NUnit3.Specs.csproj} | 4 +++- .../NUnit3.Specs.v2.ncrunchproject | Bin .../NUnit3.Specs.v3.ncrunchproject} | 0 build.cake | 3 +-- 6 files changed, 5 insertions(+), 4 deletions(-) rename Tests/TestFrameworks/{NUnit3.Net45.Specs => NUnit3.Specs}/FrameworkSpecs.cs (100%) rename Tests/TestFrameworks/{NUnit3.Net45.Specs/NUnit3.Net45.Specs.csproj => NUnit3.Specs/NUnit3.Specs.csproj} (64%) rename Tests/TestFrameworks/{NUnit3.Net45.Specs => NUnit3.Specs}/NUnit3.Specs.v2.ncrunchproject (100%) rename Tests/TestFrameworks/{NUnit3.Net45.Specs/NUnit3.Net45.Specs.v3.ncrunchproject => NUnit3.Specs/NUnit3.Specs.v3.ncrunchproject} (100%) diff --git a/FluentAssertions.sln b/FluentAssertions.sln index a18bc97ebe..385f85ca4e 100644 --- a/FluentAssertions.sln +++ b/FluentAssertions.sln @@ -37,7 +37,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Specs", "Tests\NetC EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore20.Specs", "Tests\NetCore20.Specs\NetCore20.Specs.csproj", "{1C7CF1BF-534B-4CF7-A3B2-5910B091460A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.Net45.Specs", "Tests\TestFrameworks\NUnit3.Net45.Specs\NUnit3.Net45.Specs.csproj", "{C8335EA3-C6CE-47C9-AB4F-CE37157E1EB2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.Specs", "Tests\TestFrameworks\NUnit3.Specs\NUnit3.Specs.csproj", "{C8335EA3-C6CE-47C9-AB4F-CE37157E1EB2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit2.Net45.Specs", "Tests\TestFrameworks\NUnit2.Net45.Specs\NUnit2.Net45.Specs.csproj", "{53DAC943-ED58-4746-AAD7-D3E13CDA6099}" EndProject diff --git a/Tests/TestFrameworks/NUnit3.Net45.Specs/FrameworkSpecs.cs b/Tests/TestFrameworks/NUnit3.Specs/FrameworkSpecs.cs similarity index 100% rename from Tests/TestFrameworks/NUnit3.Net45.Specs/FrameworkSpecs.cs rename to Tests/TestFrameworks/NUnit3.Specs/FrameworkSpecs.cs diff --git a/Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Net45.Specs.csproj b/Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj similarity index 64% rename from Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Net45.Specs.csproj rename to Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj index 3d18ff287b..3848a214d6 100644 --- a/Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Net45.Specs.csproj +++ b/Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj @@ -1,6 +1,6 @@  - net451 + netcoreapp1.1 NUnit3.Specs NUnit3.Specs @@ -8,6 +8,8 @@ + + \ No newline at end of file diff --git a/Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Specs.v2.ncrunchproject b/Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.v2.ncrunchproject similarity index 100% rename from Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Specs.v2.ncrunchproject rename to Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.v2.ncrunchproject diff --git a/Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Net45.Specs.v3.ncrunchproject b/Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.v3.ncrunchproject similarity index 100% rename from Tests/TestFrameworks/NUnit3.Net45.Specs/NUnit3.Net45.Specs.v3.ncrunchproject rename to Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.v3.ncrunchproject diff --git a/build.cake b/build.cake index c11f4ac697..bf240e1b55 100644 --- a/build.cake +++ b/build.cake @@ -1,6 +1,5 @@ #tool "nuget:?package=xunit.runner.console&version=2.3.0-beta5-build3769" #tool "nuget:?package=nunit.runners&version=2.6.4" -#tool "nuget:?package=nunit.consolerunner&version=3.7.0" #tool "nuget:?package=nspec&version=1.0.13" #tool "nuget:?package=nspec&version=2.0.1" #tool "nuget:?package=nspec&version=3.1.0" @@ -92,10 +91,10 @@ Task("Run-Unit-Tests") DotNetCoreTest("./Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); DotNetCoreTest("./Tests/TestFrameworks/MSTestV2.Specs/MSTestV2.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); + DotNetCoreTest("./Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); XUnit2("./Tests/TestFrameworks/XUnit.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { }); XUnit2("./Tests/TestFrameworks/XUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { }); NUnit("./Tests/TestFrameworks/NUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new NUnitSettings { NoResults = true }); - NUnit3("./Tests/TestFrameworks/NUnit3.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new NUnit3Settings { NoResults = true }); StartProcess(Context.Tools.Resolve("nspec.1.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec.Net45.Specs/bin/Debug/net451/NSpec.Specs.dll"); StartProcess(Context.Tools.Resolve("nspec.2.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec2.Net45.Specs/bin/Debug/net451/NSpec2.Specs.dll"); From 881839eed4f28ce8fced7cab0f4242357ab06802 Mon Sep 17 00:00:00 2001 From: jnyrup Date: Tue, 24 Apr 2018 14:04:06 +0200 Subject: [PATCH 3/4] Port XUnit2 to NetCore --- FluentAssertions.sln | 2 +- .../FrameworkSpecs.cs | 0 .../XUnit2.Specs.csproj} | 5 ++++- .../XUnit2.Specs.v2.ncrunchproject | Bin .../XUnit2.Specs.v3.ncrunchproject} | 0 build.cake | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) rename Tests/TestFrameworks/{XUnit2.Net45.Specs => XUnit2.Specs}/FrameworkSpecs.cs (100%) rename Tests/TestFrameworks/{XUnit2.Net45.Specs/XUnit2.Net45.Specs.csproj => XUnit2.Specs/XUnit2.Specs.csproj} (55%) rename Tests/TestFrameworks/{XUnit2.Net45.Specs => XUnit2.Specs}/XUnit2.Specs.v2.ncrunchproject (100%) rename Tests/TestFrameworks/{XUnit2.Net45.Specs/XUnit2.Net45.Specs.v3.ncrunchproject => XUnit2.Specs/XUnit2.Specs.v3.ncrunchproject} (100%) diff --git a/FluentAssertions.sln b/FluentAssertions.sln index 385f85ca4e..1673057683 100644 --- a/FluentAssertions.sln +++ b/FluentAssertions.sln @@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyB", "Tests\Assembly EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFrameworks", "TestFrameworks", "{4D8FA213-8724-4C43-B68A-F018148D238C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit2.Net45.Specs", "Tests\TestFrameworks\XUnit2.Net45.Specs\XUnit2.Net45.Specs.csproj", "{F50C8F77-3778-4432-84EC-B9B2B502E708}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit2.Specs", "Tests\TestFrameworks\XUnit2.Specs\XUnit2.Specs.csproj", "{F50C8F77-3778-4432-84EC-B9B2B502E708}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{31891850-3EDC-480A-9B6C-F60540E9C90F}" EndProject diff --git a/Tests/TestFrameworks/XUnit2.Net45.Specs/FrameworkSpecs.cs b/Tests/TestFrameworks/XUnit2.Specs/FrameworkSpecs.cs similarity index 100% rename from Tests/TestFrameworks/XUnit2.Net45.Specs/FrameworkSpecs.cs rename to Tests/TestFrameworks/XUnit2.Specs/FrameworkSpecs.cs diff --git a/Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Net45.Specs.csproj b/Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.csproj similarity index 55% rename from Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Net45.Specs.csproj rename to Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.csproj index c2c8fb8e99..72c02cd105 100644 --- a/Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Net45.Specs.csproj +++ b/Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.csproj @@ -1,6 +1,6 @@  - net451 + netcoreapp1.1 XUnit2.Specs XUnit2.Specs @@ -8,6 +8,9 @@ + + + \ No newline at end of file diff --git a/Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Specs.v2.ncrunchproject b/Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.v2.ncrunchproject similarity index 100% rename from Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Specs.v2.ncrunchproject rename to Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.v2.ncrunchproject diff --git a/Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Net45.Specs.v3.ncrunchproject b/Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.v3.ncrunchproject similarity index 100% rename from Tests/TestFrameworks/XUnit2.Net45.Specs/XUnit2.Net45.Specs.v3.ncrunchproject rename to Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.v3.ncrunchproject diff --git a/build.cake b/build.cake index bf240e1b55..7071147464 100644 --- a/build.cake +++ b/build.cake @@ -92,8 +92,8 @@ Task("Run-Unit-Tests") DotNetCoreTest("./Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); DotNetCoreTest("./Tests/TestFrameworks/MSTestV2.Specs/MSTestV2.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); DotNetCoreTest("./Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" }); + DotNetCoreTool("./Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.csproj", "xunit", "-configuration debug"); XUnit2("./Tests/TestFrameworks/XUnit.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { }); - XUnit2("./Tests/TestFrameworks/XUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { }); NUnit("./Tests/TestFrameworks/NUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new NUnitSettings { NoResults = true }); StartProcess(Context.Tools.Resolve("nspec.1.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec.Net45.Specs/bin/Debug/net451/NSpec.Specs.dll"); From fbf4b17718be39bf71c575ec0fe0a1dc82bcf1c7 Mon Sep 17 00:00:00 2001 From: jnyrup Date: Tue, 24 Apr 2018 14:09:46 +0200 Subject: [PATCH 4/4] Use testAdapter NUnit2 --- .../TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj | 2 ++ build.cake | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Tests/TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj b/Tests/TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj index 5184a291b2..3ce37861d6 100644 --- a/Tests/TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj +++ b/Tests/TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj @@ -8,6 +8,8 @@ + + \ No newline at end of file diff --git a/build.cake b/build.cake index 7071147464..5dc5df1b81 100644 --- a/build.cake +++ b/build.cake @@ -1,5 +1,4 @@ #tool "nuget:?package=xunit.runner.console&version=2.3.0-beta5-build3769" -#tool "nuget:?package=nunit.runners&version=2.6.4" #tool "nuget:?package=nspec&version=1.0.13" #tool "nuget:?package=nspec&version=2.0.1" #tool "nuget:?package=nspec&version=3.1.0"