Skip to content

Commit 8c2b774

Browse files
ForNeVeRForNeVeR
committed
Migrate tests to Xunit.
1 parent a876fd0 commit 8c2b774

5 files changed

Lines changed: 62 additions & 16 deletions

File tree

‎License.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
The MIT License (MIT)
22
=====================
33

4-
Copyright (C) 2011—2013 by F. von Never, Hagane
4+
Copyright (C) 2011—2015 by F. von Never, Hagane
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1919
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
2020
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2121
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22-
THE SOFTWARE.
22+
THE SOFTWARE.

‎Naggum.Test/CompilerTest.fs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
namespace Naggum.Test
2-
open Naggum.Compiler
3-
open NUnit.Framework
2+
43
open System.Diagnostics
54
open System.IO
65

7-
[<TestFixture>]
6+
open Xunit
7+
8+
open Naggum.Compiler
9+
810
type CompilerTest() =
911
static let testExtension = "naggum"
1012
static let resultExtension = "result"
@@ -28,9 +30,9 @@ type CompilerTest() =
2830
let result = ``process``.StandardOutput.ReadToEnd()
2931

3032
let reference = File.ReadAllText resultPath
31-
Assert.AreEqual(reference, result)
33+
Assert.Equal(reference, result)
3234

33-
[<Test>]
35+
[<Fact>]
3436
member this.RunTests() =
3537
filenames
36-
|> List.iter CompilerTest.RunTest
38+
|> List.iter CompilerTest.RunTest

‎Naggum.Test/Naggum.Test.dll.config‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
5+
</startup>
6+
<runtime>
7+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
8+
<dependentAssembly>
9+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
10+
<bindingRedirect oldVersion="2.0.0.0" newVersion="4.4.0.0" />
11+
<bindingRedirect oldVersion="2.3.0.0" newVersion="4.4.0.0" />
12+
<bindingRedirect oldVersion="2.3.5.0" newVersion="4.4.0.0" />
13+
<bindingRedirect oldVersion="4.0.0.0" newVersion="4.4.0.0" />
14+
<bindingRedirect oldVersion="4.3.0.0" newVersion="4.4.0.0" />
15+
<bindingRedirect oldVersion="3.3.1.0" newVersion="4.4.0.0" />
16+
<bindingRedirect oldVersion="2.3.5.1" newVersion="4.4.0.0" />
17+
<bindingRedirect oldVersion="3.78.3.1" newVersion="4.4.0.0" />
18+
<bindingRedirect oldVersion="3.259.3.1" newVersion="4.4.0.0" />
19+
<bindingRedirect oldVersion="4.3.1.0" newVersion="4.4.0.0" />
20+
<bindingRedirect oldVersion="3.47.4.0" newVersion="4.4.0.0" />
21+
<bindingRedirect oldVersion="3.78.4.0" newVersion="4.4.0.0" />
22+
<bindingRedirect oldVersion="3.259.4.0" newVersion="4.4.0.0" />
23+
</dependentAssembly>
24+
</assemblyBinding>
25+
</runtime>
26+
</configuration>

‎Naggum.Test/Naggum.Test.fsproj‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,27 +49,40 @@
4949
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5050
<ItemGroup>
5151
<Compile Include="CompilerTest.fs" />
52-
<None Include="packages.config" />
52+
<Content Include="packages.config" />
53+
<Content Include="Naggum.Test.dll.config">
54+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
55+
</Content>
5356
</ItemGroup>
5457
<ItemGroup>
5558
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
5659
<Private>True</Private>
5760
</Reference>
5861
<Reference Include="mscorlib" />
59-
<Reference Include="nunit.framework">
60-
<HintPath>..\packages\NUnit.2.6.1\lib\nunit.framework.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
6362
<Reference Include="System" />
6463
<Reference Include="System.Core" />
6564
<Reference Include="System.Numerics" />
66-
</ItemGroup>
67-
<ItemGroup>
65+
<Reference Include="xunit.abstractions">
66+
<HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
67+
<Private>True</Private>
68+
</Reference>
6869
<ProjectReference Include="..\ngc\ngc.fsproj">
6970
<Name>ngc</Name>
7071
<Project>{a4269c5e-e4ac-44bf-a06e-1b45248910ad}</Project>
7172
<Private>True</Private>
7273
</ProjectReference>
74+
<Reference Include="xunit.assert">
75+
<HintPath>..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
76+
<Private>True</Private>
77+
</Reference>
78+
<Reference Include="xunit.core">
79+
<HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
80+
<Private>True</Private>
81+
</Reference>
82+
<Reference Include="xunit.execution.desktop">
83+
<HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
84+
<Private>True</Private>
85+
</Reference>
7386
</ItemGroup>
7487
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
7588
Other similar extension points exist, see Microsoft.Common.targets.

‎Naggum.Test/packages.config‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="2.6.1" targetFramework="net40" />
3+
<package id="xunit" version="2.1.0" targetFramework="net461" />
4+
<package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
5+
<package id="xunit.assert" version="2.1.0" targetFramework="net461" />
6+
<package id="xunit.core" version="2.1.0" targetFramework="net461" />
7+
<package id="xunit.extensibility.core" version="2.1.0" targetFramework="net461" />
8+
<package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net461" />
49
</packages>

0 commit comments

Comments
 (0)