Skip to content

Commit d35f8a6

Browse files
shealeyshealey
committed
Changed unit test tooling to xUnit - runners and test adapters are officially supported and maintained by the .Net Foundation for Visual Studio and the command line/CLI via dotnet test.
1 parent bb927e9 commit d35f8a6

13 files changed

+103
-125
lines changed

‎Contributors.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ Kevin Kuszyk
33
Jeff Sharp
44
James Nail
55
Jamie Humphries
6+
Stuart Healey

‎FluentAssertions.AspNetCore.Mvc.sln

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.8
4+
VisualStudioVersion = 15.0.26730.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
77
EndProject
@@ -18,12 +18,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565
1818
EndProject
1919
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
2020
EndProject
21-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}"
22-
EndProject
2321
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj", "{8156D339-E8DE-4A68-8828-9DA927D2949D}"
2422
EndProject
2523
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}"
2624
EndProject
25+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Tests", "tests\FluentAssertions.AspNetCore.Mvc.Tests\FluentAssertions.AspNetCore.Mvc.Tests.csproj", "{5DD9D1EB-F3CB-48AA-862C-269A01225810}"
26+
EndProject
2727
Global
2828
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2929
Debug|Any CPU = Debug|Any CPU
@@ -46,18 +46,6 @@ Global
4646
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
4747
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
4848
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
49-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
52-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
53-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.ActiveCfg = Debug|Any CPU
54-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.Build.0 = Debug|Any CPU
55-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.Build.0 = Release|Any CPU
57-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
58-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
59-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.ActiveCfg = Release|Any CPU
60-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.Build.0 = Release|Any CPU
6149
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
6250
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.Build.0 = Debug|Any CPU
6351
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -82,15 +70,27 @@ Global
8270
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
8371
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.ActiveCfg = Release|Any CPU
8472
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.Build.0 = Release|Any CPU
73+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
74+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.Build.0 = Debug|Any CPU
75+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
76+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
77+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.ActiveCfg = Debug|Any CPU
78+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.Build.0 = Debug|Any CPU
79+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.ActiveCfg = Release|Any CPU
80+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.Build.0 = Release|Any CPU
81+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
82+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.Build.0 = Release|Any CPU
83+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.ActiveCfg = Release|Any CPU
84+
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.Build.0 = Release|Any CPU
8585
EndGlobalSection
8686
GlobalSection(SolutionProperties) = preSolution
8787
HideSolutionNode = FALSE
8888
EndGlobalSection
8989
GlobalSection(NestedProjects) = preSolution
9090
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
91-
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
9291
{8156D339-E8DE-4A68-8828-9DA927D2949D} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
9392
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
93+
{5DD9D1EB-F3CB-48AA-862C-269A01225810} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
9494
EndGlobalSection
9595
GlobalSection(ExtensibilityGlobals) = postSolution
9696
SolutionGuid = {D1CB0506-FC11-4EA6-A715-DF5845427FE7}

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
19-
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
19+
<PackageReference Include="xunit" Version="2.2.0" />
20+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
2021
</ItemGroup>
2122

2223
<ItemGroup>
23-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170106-08" />
24-
<PackageReference Include="NUnit" Version="3.8.1" />
25-
<PackageReference Include="dotnet-test-nunit" Version="3.4.0-beta-1" />
24+
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
25+
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
2626
</ItemGroup>
2727

2828
</Project>

‎samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/ProductController_Tests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
2-
using NUnit.Framework;
2+
using Xunit;
33

44
namespace FluentAssertions.AspNetCore.Mvc.Sample.Tests
55
{
6-
[TestFixture]
76
public class ProductController_Tests
87
{
9-
[Test]
8+
[Fact]
109
public void List_ShouldReturnView()
1110
{
1211
var controller = new ProductController();

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/ActionResultAssertions_Tests.cs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
using System;
22
using Microsoft.AspNetCore.Mvc;
33
using Microsoft.AspNetCore.Routing;
4-
using NUnit.Framework;
4+
using Xunit;
55

66
namespace FluentAssertions.AspNetCore.Mvc.Tests
77
{
8-
[TestFixture]
98
public class ActionResultAssertions_Tests
109
{
11-
[Test]
10+
[Fact]
1211
public void BeContent_GivenContent_ShouldPass()
1312
{
1413
ActionResult result = new ContentResult();
1514
result.Should()
1615
.BeContentResult();
1716
}
1817

19-
[Test]
18+
[Fact]
2019
public void BeContent_GivenNotContent_ShouldFail()
2120
{
2221
ActionResult result = new ViewResult();
@@ -25,14 +24,14 @@ public void BeContent_GivenNotContent_ShouldFail()
2524
.WithMessage("Expected ActionResult to be \"ContentResult\", but found \"ViewResult\"");
2625
}
2726

28-
[Test]
27+
[Fact]
2928
public void BeEmpty_GivenEmpty_ShouldPass()
3029
{
3130
ActionResult result = new EmptyResult();
3231
result.Should().BeEmptyResult();
3332
}
3433

35-
[Test]
34+
[Fact]
3635
public void BeEmpty_GivenNotEmpty_ShouldPass()
3736
{
3837
ActionResult result = new ViewResult();
@@ -41,14 +40,14 @@ public void BeEmpty_GivenNotEmpty_ShouldPass()
4140
.WithMessage("Expected ActionResult to be \"EmptyResult\", but found \"ViewResult\"");
4241
}
4342

44-
[Test]
43+
[Fact]
4544
public void BeRedirectToRoute_GivenRedirectToRoute_ShouldPass()
4645
{
4746
ActionResult result = new RedirectToRouteResult(new RouteValueDictionary());
4847
result.Should().BeRedirectToRouteResult();
4948
}
5049

51-
[Test]
50+
[Fact]
5251
public void BeRedirectToRoute_GivenNotRedirectToRoute_ShouldFail()
5352
{
5453
ActionResult result = new ViewResult();
@@ -57,14 +56,14 @@ public void BeRedirectToRoute_GivenNotRedirectToRoute_ShouldFail()
5756
.WithMessage("Expected ActionResult to be \"RedirectToRouteResult\", but found \"ViewResult\"");
5857
}
5958

60-
[Test]
59+
[Fact]
6160
public void BeRedirect_GivenRedirect_ShouldPass()
6261
{
6362
ActionResult result = new RedirectResult("/");
6463
result.Should().BeRedirectResult();
6564
}
6665

67-
[Test]
66+
[Fact]
6867
public void BeRedirect_GivenNotRedirect_ShouldFail()
6968
{
7069
ActionResult result = new ViewResult();
@@ -73,14 +72,14 @@ public void BeRedirect_GivenNotRedirect_ShouldFail()
7372
.WithMessage("Expected ActionResult to be \"RedirectResult\", but found \"ViewResult\"");
7473
}
7574

76-
[Test]
75+
[Fact]
7776
public void BePartialView_GivenPartial_ShouldPass()
7877
{
7978
ActionResult result = new PartialViewResult();
8079
result.Should().BePartialViewResult();
8180
}
8281

83-
[Test]
82+
[Fact]
8483
public void BePartialView_GivenNotPartial_ShouldFail()
8584
{
8685
ActionResult result = new RedirectResult("/");
@@ -89,14 +88,14 @@ public void BePartialView_GivenNotPartial_ShouldFail()
8988
.WithMessage("Expected ActionResult to be \"PartialViewResult\", but found \"RedirectResult\"");
9089
}
9190

92-
[Test]
91+
[Fact]
9392
public void BeView_GivenView_ShouldPass()
9493
{
9594
ActionResult result = new ViewResult();
9695
result.Should().BeViewResult();
9796
}
9897

99-
[Test]
98+
[Fact]
10099
public void BeView_GivenNotView_ShouldFail()
101100
{
102101
ActionResult result = new RedirectResult("/");

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/ContentResultAssertions_Tests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
using System;
22
using Microsoft.AspNetCore.Mvc;
3-
using NUnit.Framework;
3+
using Xunit;
44

55
namespace FluentAssertions.AspNetCore.Mvc.Tests
66
{
7-
[TestFixture]
7+
88
public class ContentResultAssertions_Tests
99
{
10-
[Test]
10+
[Fact]
1111
public void WithContent_GivenExpected_ShouldPass()
1212
{
1313
ActionResult result = new ContentResult { Content = "content" };
1414
result.Should().BeContentResult().WithContent("content");
1515
}
1616

17-
[Test]
17+
[Fact]
1818
public void WithContent_GivenUnexpected_ShouldFail()
1919
{
2020
var actualContent = "content";
@@ -28,14 +28,14 @@ public void WithContent_GivenUnexpected_ShouldFail()
2828
.WithMessage(failureMessage);
2929
}
3030

31-
[Test]
31+
[Fact]
3232
public void WithContentType_GivenExpected_ShouldPass()
3333
{
3434
ActionResult result = new ContentResult { ContentType = "text/html" };
3535
result.Should().BeContentResult().WithContentType("text/html");
3636
}
3737

38-
[Test]
38+
[Fact]
3939
public void WithContentType_GivenUnexpected_ShouldFail()
4040
{
4141
var actualContentType = "text/html";

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/FailureMessageHelper_Tests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using FluentAssertions.Mvc.Tests.Helpers;
2-
using NUnit.Framework;
2+
using Xunit;
33

44
namespace FluentAssertions.AspNetCore.Mvc.Tests
55
{
6-
[TestFixture]
6+
77
class FailureMessageHelper_Tests
88
{
9-
[Test]
9+
[Fact]
1010
public void FailureMessageHelper_WithOneArg_Formats()
1111
{
1212
// Arrange
@@ -22,7 +22,7 @@ public void FailureMessageHelper_WithOneArg_Formats()
2222
result.Should().Be(expected);
2323
}
2424

25-
[Test]
25+
[Fact]
2626
public void FailureMessageHelper_WithMultipleArgs_Formats()
2727
{
2828
// Arrange

‎tests/FluentAssertions.AspNetCore.Mvc.Tests/FluentAssertions.AspNetCore.Mvc.Tests.csproj

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,28 @@
22

33
<PropertyGroup>
44
<VersionPrefix>0.7.0</VersionPrefix>
5-
<TargetFramework>netcoreapp1.1</TargetFramework>
5+
<TargetFramework>netcoreapp1.0</TargetFramework>
66
<AssemblyName>FluentAssertions.AspNetCore.Mvc.Tests</AssemblyName>
77
<PackageId>FluentAssertions.AspNetCore.Mvc.Tests</PackageId>
88
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
99
<NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
10-
<PackageTargetFallback>$(PackageTargetFallback);netcoreapp1.0;portable-net45+win8</PackageTargetFallback>
10+
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
1111
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
1212
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1313
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1414
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<Compile Include="..\FluentAssertions.Mvc.Tests.Shared\**\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
18+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
20+
<PackageReference Include="Moq" Version="4.7.99" />
21+
<PackageReference Include="xunit" Version="2.2.0" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
1923
</ItemGroup>
2024

2125
<ItemGroup>
2226
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
2327
</ItemGroup>
2428

25-
<ItemGroup>
26-
<PackageReference Include="NUnit" Version="3.8.1" />
27-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
28-
<PackageReference Include="Moq" Version="4.7.99" />
29-
</ItemGroup>
30-
3129
</Project>

0 commit comments

Comments
 (0)