Skip to content

Try to add Xunit.v3 #706

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.

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,6 @@
<PackageVersion Include="xunit.extensibility.core" Version="[2.4.1, 3.0.0)" />
<PackageVersion Include="xunit.extensibility.execution" Version="[2.4.1, 3.0.0)" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.0" />
<PackageVersion Include="xunit.v3.extensibility.core" Version="2.0.0" />
</ItemGroup>
</Project>
8 changes: 7 additions & 1 deletion FsCheck.sln
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.9.34616.47
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -59,6 +59,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharp.DocSnippets", "examp
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FsCheck.Test.CSharp", "tests\FsCheck.Test.CSharp\FsCheck.Test.CSharp.csproj", "{86955D54-4D54-4D4C-A7DC-F98F4CCFE498}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsCheck.Xunit.v3", "src\FsCheck.Xunit.v3\FsCheck.Xunit.v3.fsproj", "{CADBF086-2B3D-42D5-8A66-F9ACC6119ED0}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -113,6 +115,10 @@ Global
{86955D54-4D54-4D4C-A7DC-F98F4CCFE498}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86955D54-4D54-4D4C-A7DC-F98F4CCFE498}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86955D54-4D54-4D4C-A7DC-F98F4CCFE498}.Release|Any CPU.Build.0 = Release|Any CPU
{CADBF086-2B3D-42D5-8A66-F9ACC6119ED0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CADBF086-2B3D-42D5-8A66-F9ACC6119ED0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CADBF086-2B3D-42D5-8A66-F9ACC6119ED0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CADBF086-2B3D-42D5-8A66-F9ACC6119ED0}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
23 changes: 23 additions & 0 deletions src/FsCheck.Xunit.v3/AssemblyInfo.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@

// Auto-generated; edits may be deleted at any time
namespace System
open System.Reflection
open System.Runtime.CompilerServices

[<assembly: AssemblyTitle("FsCheck.Xunit.v3")>]
[<assembly: AssemblyProduct("FsCheck.Xunit.v3")>]
[<assembly: AssemblyDescription("Integrates FsCheck with xUnit.v3.NET")>]
[<assembly: AssemblyVersion("3.1.0")>]
[<assembly: AssemblyFileVersion("3.1.0")>]
[<assembly: AssemblyKeyFile("../../FsCheckKey.snk")>]
[<assembly: InternalsVisibleTo("FsCheck.Test")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] AssemblyTitle = "FsCheck.Xunit.v3"
let [<Literal>] AssemblyProduct = "FsCheck.Xunit.v3"
let [<Literal>] AssemblyDescription = "Integrates FsCheck with xUnit.v3.NET"
let [<Literal>] AssemblyVersion = "3.1.0"
let [<Literal>] AssemblyFileVersion = "3.1.0"
let [<Literal>] AssemblyKeyFile = "../../FsCheckKey.snk"
let [<Literal>] InternalsVisibleTo = "FsCheck.Test"
60 changes: 60 additions & 0 deletions src/FsCheck.Xunit.v3/CheckExtensions.fs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
namespace FsCheck.Xunit

open System
open System.Runtime.CompilerServices
open FsCheck
open global.Xunit

module private Helper =
let private runner (testOutputHelper: ITestOutputHelper) =
{ new IRunner with
member __.OnStartFixture t =
Runner.onStartFixtureToString t |> testOutputHelper.WriteLine
member __.OnArguments (ntest,args, every) =
every ntest args |> testOutputHelper.WriteLine
member __.OnShrink(args, everyShrink) =
everyShrink args |> testOutputHelper.WriteLine
member __.OnFinished(name,testResult) =
Runner.onFinishedToString name testResult |> testOutputHelper.WriteLine
}

let private throwingRunner (testOutputHelper: ITestOutputHelper) =
{ new IRunner with
member __.OnStartFixture t =
testOutputHelper.WriteLine (Runner.onStartFixtureToString t)
member __.OnArguments (ntest,args, every) =
testOutputHelper.WriteLine (every ntest args)
member __.OnShrink(args, everyShrink) =
testOutputHelper.WriteLine (everyShrink args)
member __.OnFinished(name,testResult) =
match testResult with
| FsCheck.TestResult.Passed _ -> testOutputHelper.WriteLine (Runner.onFinishedToString name testResult)
| _ -> failwithf "%s" (Runner.onFinishedToString name testResult)
}

let writeToXunit (config:Config) (testOutputHelper: ITestOutputHelper) =
config.WithRunner(runner testOutputHelper)

let writeToXunitThrow (config:Config) (testOutputHelper: ITestOutputHelper) =
config.WithRunner(throwingRunner testOutputHelper)

[<AbstractClass;Sealed;Extension>]
type CheckExtensions =
[<Extension>]
static member QuickCheck(property:Property, testOutputHelper: ITestOutputHelper) =
Check.One(Helper.writeToXunit Config.Quick testOutputHelper,property)
[<Extension>]
static member QuickCheck(property:Property, testName:string, testOutputHelper: ITestOutputHelper) =
Check.One(testName,Helper.writeToXunit Config.Quick testOutputHelper,property)
[<Extension>]
static member QuickCheckThrowOnFailure(property:Property, testOutputHelper: ITestOutputHelper) =
Check.One(Helper.writeToXunitThrow Config.QuickThrowOnFailure testOutputHelper,property)
[<Extension>]
static member VerboseCheck(property:Property, testOutputHelper: ITestOutputHelper) =
Check.One(Helper.writeToXunit Config.Verbose testOutputHelper, property)
[<Extension>]
static member VerboseCheck(property:Property, testName:string, testOutputHelper: ITestOutputHelper) =
Check.One(testName, Helper.writeToXunit Config.Verbose testOutputHelper, property)
[<Extension>]
static member VerboseCheckThrowOnFailure(property:Property, testOutputHelper: ITestOutputHelper) =
Check.One(Helper.writeToXunitThrow Config.VerboseThrowOnFailure testOutputHelper,property)
28 changes: 28 additions & 0 deletions src/FsCheck.Xunit.v3/FsCheck.Xunit.v3.fsproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>FsCheck.Xunit</AssemblyName>
<TargetFrameworks>netstandard2.0;net462</TargetFrameworks>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageDescription>
FsCheck.Xunit integrates FsCheck with xUnit.v3.NET by adding a PropertyAttribute that runs FsCheck tests, similar to xUnit.v3.NET's FactAttribute.

All the options normally available in vanilla FsCheck via configuration can be controlled via the PropertyAttribute.
</PackageDescription>
<PackageTags>$(PackageTags);xunit;xunit.net</PackageTags>
</PropertyGroup>
<ItemGroup>
<Compile Include="AssemblyInfo.fs"/>
<Compile Include="Runner.fs"/>
<Compile Include="PropertyAttribute.fs"/>
<Compile Include="CheckExtensions.fs"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Core"/>
<PackageReference Include="xunit.v3.extensibility.core" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../FsCheck/FsCheck.fsproj"/>
</ItemGroup>
</Project>
Loading