Skip to content

Update Test Tooling to Officially Supported Framework #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Update Test Tooling to Officially Supported Framework #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d35f8a6
Changed unit test tooling to xUnit - runners and test adapters are of…
shealey Sep 9, 2017
3c29f9f
Resolved missing xUnit dlls from publish output directory of FluentAs…
shealey Sep 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Contributors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Kevin Kuszyk
Jeff Sharp
James Nail
Jamie Humphries
Stuart Healey
86 changes: 43 additions & 43 deletions FluentAssertions.AspNetCore.Mvc.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26730.8
VisualStudioVersion = 15.0.26730.12
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{4E91D524-3DC0-4E08-82FE-6FDAEB89212B}"
EndProject
Expand All @@ -18,11 +18,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{A4C33565
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FluentAssertions.AspNetCore.Mvc", "src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj", "{EA71D220-089E-4CB1-B187-D9BB4DFD8624}"
EndProject
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}"
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}"
EndProject
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}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample", "samples\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj", "{6DCC13DB-3226-4529-ADAA-10BB04A9F397}"
EndProject
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}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FluentAssertions.AspNetCore.Mvc.Sample.Tests", "samples\FluentAssertions.AspNetCore.Mvc.Sample.Tests\FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj", "{FE001B08-AD54-4694-AEE6-410824DE6A46}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -46,51 +46,51 @@ Global
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.ActiveCfg = Release|Any CPU
{EA71D220-089E-4CB1-B187-D9BB4DFD8624}.Release|x86.Build.0 = Release|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.ActiveCfg = Debug|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Debug|x86.Build.0 = Debug|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Any CPU.Build.0 = Release|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.ActiveCfg = Release|Any CPU
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD}.Release|x86.Build.0 = Release|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|x86.ActiveCfg = Debug|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Debug|x86.Build.0 = Debug|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Any CPU.Build.0 = Release|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|x86.ActiveCfg = Release|Any CPU
{8156D339-E8DE-4A68-8828-9DA927D2949D}.Release|x86.Build.0 = Release|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|x86.ActiveCfg = Debug|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Debug|x86.Build.0 = Debug|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Any CPU.Build.0 = Release|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.ActiveCfg = Release|Any CPU
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8}.Release|x86.Build.0 = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.ActiveCfg = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Debug|x86.Build.0 = Debug|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Any CPU.Build.0 = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.ActiveCfg = Release|Any CPU
{5DD9D1EB-F3CB-48AA-862C-269A01225810}.Release|x86.Build.0 = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.ActiveCfg = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Debug|x86.Build.0 = Debug|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Any CPU.Build.0 = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.ActiveCfg = Release|Any CPU
{6DCC13DB-3226-4529-ADAA-10BB04A9F397}.Release|x86.Build.0 = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.ActiveCfg = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Debug|x86.Build.0 = Debug|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Any CPU.Build.0 = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.ActiveCfg = Release|Any CPU
{FE001B08-AD54-4694-AEE6-410824DE6A46}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EA71D220-089E-4CB1-B187-D9BB4DFD8624} = {89B09C65-4F1E-4B5A-AD58-E244113F2C02}
{9F29BCB2-B780-49E0-8F16-EE2572AF1BBD} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
{8156D339-E8DE-4A68-8828-9DA927D2949D} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
{80E3D9C6-F6F6-40CF-93A6-BCD7C26118D8} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
{5DD9D1EB-F3CB-48AA-862C-269A01225810} = {A4C33565-1E6E-4AE7-8F02-1911DBA00263}
{6DCC13DB-3226-4529-ADAA-10BB04A9F397} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
{FE001B08-AD54-4694-AEE6-410824DE6A46} = {4E91D524-3DC0-4E08-82FE-6FDAEB89212B}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D1CB0506-FC11-4EA6-A715-DF5845427FE7}
Expand Down
10 changes: 5 additions & 5 deletions ...ssertions.AspNetCore.Mvc.Sample.Tests/FluentAssertions.AspNetCore.Mvc.Sample.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\FluentAssertions.AspNetCore.Mvc\FluentAssertions.AspNetCore.Mvc.csproj" />
<ProjectReference Include="..\FluentAssertions.AspNetCore.Mvc.Sample\FluentAssertions.AspNetCore.Mvc.Sample.csproj" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
</ItemGroup>

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

</Project>
17 changes: 8 additions & 9 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/ProductController_Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
using NUnit.Framework;
using FluentAssertions.AspNetCore.Mvc.Sample.Controllers;
using Xunit;

namespace FluentAssertions.AspNetCore.Mvc.Sample.Tests
{
[TestFixture]
public class ProductController_Tests
{
[Test]
public void List_ShouldReturnView()
{
[Fact]
public void List_ShouldReturnView()
{
var controller = new ProductController();
controller.List().Should()
controller.List().Should()
.BeViewResult()
.WithViewName("Index");
}
}
}
}
}
19 changes: 0 additions & 19 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample.Tests/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample/Controllers/ProductController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;

// For more information on enabling MVC for empty projects, visit http://go.microsoft.com/fwlink/?LinkID=397860
using Microsoft.AspNetCore.Mvc;

namespace FluentAssertions.AspNetCore.Mvc.Sample.Controllers
{
Expand Down
26 changes: 3 additions & 23 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample/FluentAssertions.AspNetCore.Mvc.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
Expand All @@ -11,34 +10,15 @@
</PropertyGroup>

<ItemGroup>
<None Update="wwwroot\**\*;Views\**\*;Areas\**\Views">
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="1.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.3" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.0.1" />
</ItemGroup>

<Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
<Exec Command="bower install" />
<Exec Command="dotnet bundle" />
</Target>

<ItemGroup>
<DotNetCliToolReference Include="BundlerMinifier.Core" Version="2.2.301" />
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.1" />
</ItemGroup>

</Project>
7 changes: 1 addition & 6 deletions samples/FluentAssertions.AspNetCore.Mvc.Sample/Models/ProductViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;

namespace FluentAssertions.AspNetCore.Mvc.Sample.Models
namespace FluentAssertions.AspNetCore.Mvc.Sample.Models
{
public class ProductViewModel
{
Expand Down
Loading