8000 Migrate tests to XUnit.net 2.0-rc4 · GiTechLab/libgit2sharp@bc18f25 · GitHub
[go: up one dir, main page]
Skip to content

Commit bc18f25

Browse files
nulltokenTherzok
nulltoken
authored and
Therzok
committed
Migrate tests to XUnit.net 2.0-rc4
1 parent 4d816d9 commit bc18f25

File tree

11 files changed

+47
-99
lines changed

11 files changed

+47
-99
lines changed

‎.nuget/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="xunit.runners" version="1.9.2" />
3+
<package id="xunit.runner.console" version="2.0.0-rc4-build2924" />
44
</packages>

‎CI/build.msbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<DeployFolder>$(RootDir)\Build</DeployFolder>
77
</PropertyGroup>
88

9-
<UsingTask AssemblyFile="$(RootDir)\packages\xunit.runners.1.9.2\tools\xunit.runner.msbuild.dll"
9+
<UsingTask AssemblyFile="$(RootDir)\packages\xunit.runner.msbuild.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.dll"
1010
TaskName="Xunit.Runner.MSBuild.xunit" />
1111
<Target Name="Clean">
1212
<Message Text="Commit SHA = $(CommitSha)" />
@@ -37,7 +37,7 @@
3737
</Target>
3838

3939
<Target Name="Test" DependsOnTargets="Build">
40-
<xunit Assembly="$(TestBuildDir)/LibGit2Sharp.Tests.dll" Xml="$(DeployFolder)/Test-result.xml" />
40+
<xunit Assemblies="$(TestBuildDir)/LibGit2Sharp.Tests.dll" Xml="$(DeployFolder)/Test-result.xml" />
4141
</Target>
4242

4343
<Target Name="Deploy" DependsOnTargets="Test">

‎LibGit2Sharp.Tests/ConflictFixture.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public void CanGetOriginalNamesOfRenameConflicts()
112112
}
113113
}
114114

115-
[Theory, PropertyData("ConflictData")]
115+
[Theory, MemberData("ConflictData")]
116116
public void CanRetrieveSingleConflictByPath(string filepath, string ancestorId, string ourId, string theirId)
117117
{
118118
var path = SandboxMergedTestRepo();

‎LibGit2Sharp.Tests/IndexFixture.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,14 +162,14 @@ public void CanMoveAnExistingFileOverANonExistingFile(string sourcePath, FileSta
162162
[InlineData("new_tracked_file.txt", FileStatus.Added, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
163163
[InlineData("modified_staged_file.txt", FileStatus.Staged, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
164164
[InlineData("modified_unstaged_file.txt", FileStatus.Modified, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt" })]
165-
public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
165+
public void MovingOverAnExistingFileThrows(string sourcePath, FileStatus sourceStatus, string[] destPaths)
166166
{
167167
InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
168168
}
169169

170170
[Theory]
171171
[InlineData("new_untracked_file.txt", FileStatus.Untracked, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
172-
public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
172+
public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, FileStatus sourceStatus, string[] destPaths)
173173
{
174174
InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
175175
}
@@ -178,7 +178,7 @@ public void MovingAFileWichIsNotUnderSourceControlThrows(string sourcePath, File
178178
[InlineData("deleted_unstaged_file.txt", FileStatus.Missing, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
179179
[InlineData("deleted_staged_file.txt", FileStatus.Removed, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
180180
[InlineData("i_dont_exist.txt", FileStatus.Nonexistent, new[] { "README", "new_tracked_file.txt", "modified_staged_file.txt", "modified_unstaged_file.txt", "new_untracked_file.txt", "deleted_unstaged_file.txt", "deleted_staged_file.txt", "i_dont_exist.txt" })]
181-
public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus, IEnumerable<string> destPaths)
181+
public void MovingAFileNotInTheWorkingDirectoryThrows(string sourcePath, FileStatus sourceStatus, string[] destPaths)
182182
{
183183
InvalidMoveUseCases(sourcePath, sourceStatus, destPaths);
184184
}
@@ -471,12 +471,12 @@ public void RetrievingAssumedUnchangedMarkedIndexEntries()
471471
{
472472
var path = SandboxAssumeUnchangedTestRepo();
473473
using (var repo = new Repository(path))
474-
{
474+
{
475475
var regularFile = repo.Index["hello.txt"];
476476
Assert.False(regularFile.AssumeUnchanged);
477477

478478
var assumeUnchangedFile = repo.Index["world.txt"];
479-
Assert.True(assumeUnchangedFile.AssumeUnchanged);
479+
Assert.True(assumeUnchangedFile.AssumeUnchanged);
480480
}
481481
}
482482

‎LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props')" />
3+
<Import Project="..\packages\xunit.runner.msbuild.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props" Condition="Exists('..\packages\xunit.runner.msbuild.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" />
4+
<Import Project="..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
5+
<Import Project="..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props')" />
46
<PropertyGroup>
57
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
68
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,9 +13,10 @@
1113
<AppDesignerFolder>Properties</AppDesignerFolder>
1214
<RootNamespace>LibGit2Sharp.Tests</RootNamespace>
1315
<AssemblyName>LibGit2Sharp.Tests</AssemblyName>
14-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
16+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1517
<FileAlignment>512</FileAlignment>
1618
<TargetFrameworkProfile />
19+
<NuGetPackageImportStamp>71066f89</NuGetPackageImportStamp>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1922
<DebugSymbols>true</DebugSymbols>
@@ -23,6 +26,7 @@
2326
<DefineConstants>TRACE;DEBUG;NET40</DefineConstants>
2427
<ErrorReport>prompt</ErrorReport>
2528
<WarningLevel>4</WarningLevel>
29+
<Prefer32Bit>false</Prefer32Bit>
2630
</PropertyGroup>
2731
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2832
<DebugType>pdbonly</DebugType>
@@ -31,6 +35,7 @@
3135
<DefineConstants>TRACE</DefineConstants>
3236
<ErrorReport>prompt</ErrorReport>
3337
<WarningLevel>4</WarningLevel>
38+
<Prefer32Bit>false</Prefer32Bit>
3439
</PropertyGroup>
3540
<ItemGroup>
3641
<Reference Include="Moq, Version=4.2.1409.1722, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
@@ -40,12 +45,14 @@
4045
<Reference Include="System" />
4146
<Reference Include="System.Core" />
4247
<Reference Include="System.Xml" />
43-
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
48+
<Reference Include="xunit.abstractions, Version=2.0. F438 0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
49+
<HintPath>..\packages\xunit.abstractions.2.0.0-rc4-build2924\lib\net35\xunit.abstractions.dll</HintPath>
50+
</Reference>
51+
<Reference Include="xunit.assert">
52+
<HintPath>..\packages\xunit.assert.2.0.0-rc4-build2924\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.assert.dll</HintPath>
4653
</Reference>
47-
<Reference Include="xunit.extensions">
48-
<HintPath>..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
54+
<Reference Include="xunit.core">
55+
<HintPath>..\packages\xunit.extensibility.core.2.0.0-rc4-build2924\lib\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
4956
</Reference>
5057
</ItemGroup>
5158
<ItemGroup>
@@ -148,7 +155,9 @@
148155
<PropertyGroup>
149156
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
150157
</PropertyGroup>
151-
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0-rc1-build1030\build\net20\xunit.runner.visualstudio.props'))" />
158+
<Error Condition="!Exists('..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.visualstudio.2.0.0-rc4-build1049\build\net20\xunit.runner.visualstudio.props'))" />
159+
<Error Condition="!Exists('..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.core.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
160+
<Error Condition="!Exists('..\packages\xunit.runner.msbuild.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\xunit.runner.msbuild.2.0.0-rc4-build2924\build\portable-net45+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.runner.msbuild.props'))" />
152161
</Target>
153162
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
154163
Other similar extension points exist, see Microsoft.Common.targets.
@@ -157,4 +166,4 @@
157166
<Target Name="AfterBuild">
158167
</Target>
159168
-->
160-
</Project>
169+
</Project>

‎LibGit2Sharp.Tests/StageFixture.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ public void CanStageAnUnknownFileWithLaxUnmatchedExplicitPathsValidation(string
8383
Assert.Null(repo.Index[relativePath]);
8484
Assert.Equal(status, repo.RetrieveStatus(relativePath));
8585

86-
Assert.DoesNotThrow(() => repo.Stage(relativePath));
87-
Assert.DoesNotThrow(() => repo.Stage(relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } }));
86+
repo.Stage(relativePath);
87+
repo.Stage(relativePath, new StageOptions { ExplicitPathsOptions = new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false } });
8888

8989
Assert.Equal(status, repo.RetrieveStatus(relativePath));
9090
}

‎LibGit2Sharp.Tests/TestHelpers/SkippableFactAttribute.cs

Lines changed: 0 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -58,79 +58,18 @@
5858
//* portion of the software in compiled or object code form, you may
5959
//* only do so under a license that complies with this license.
6060
//**********************************************************************
61-
using System.Collections.Generic;
62-
using System.Linq;
63-
using System.Xml;
6461
using Xunit;
65-
using Xunit.Extensions;
66-
using Xunit.Sdk;
6762

6863
namespace LibGit2Sharp.Tests.TestHelpers
6964
{
7065
class SkippableFactAttribute : FactAttribute
7166
{
72-
protected override IEnumerable<ITestCommand> EnumerateTestCommands(IMethodInfo method)
73-
{
74-
return base.EnumerateTestCommands(method).Select(SkippableTestCommand.Wrap(method));
75-
}
7667
}
7768

7869
class SkippableTheoryAttribute : TheoryAttribute
7970
{
80-
protected override IEnumerable<ITestCommand> EnumerateTestCommands(IMethodInfo method)
81-
{
82-
return base.EnumerateTestCommands(method).Select(SkippableTestCommand.Wrap(method));
83-
}
8471
}
8572

86-
class SkippableTestCommand : ITestCommand
87-
{
88-
public static Func<ITestCommand, ITestCommand> Wrap(IMethodInfo method)
89-
{
90-
return c => new SkippableTestCommand(method, c);
91-
}
92-
93-
private readonly IMethodInfo method;
94-
private readonly ITestCommand inner;
95-
96-
private SkippableTestCommand(IMethodInfo method, ITestCommand inner)
97-
{
98-
this.method = method;
99-
this.inner = inner;
100-
}
101-
102-
public MethodResult Execute(object testClass)
103-
{
104-
try
105-
{
106-
return inner.Execute(testClass);
107-
}
108-
catch (SkipException e)
109-
{
110-
return new SkipResult(method, DisplayName, e.Reason);
111-
}
112-
}
113-
114-
public XmlNode ToStartXml()
115-
{
116-
return inner.ToStartXml();
117-
}
118-
119-
public string DisplayName
120-
{
121-
get { return inner.DisplayName; }
122-
}
123-
124-
public bool ShouldCreateInstance
125-
{
126-
get { return inner.ShouldCreateInstance; }
127-
}
128-
129-
public int Timeout
130-
{
131-
get { return inner.Timeout; }
132-
}
133-
}
13473

13574
class SkipException : Exception
13675
{

‎LibGit2Sharp.Tests/UnstageFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void CanUnstageUnknownPathsWithLaxUnmatchedExplicitPathsValidation(string
106106
{
107107
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
108108

109-
Assert.DoesNotThrow(() => repo.Unstage(relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false }));
109+
repo.Unstage(relativePath, new ExplicitPathsOptions() { ShouldFailOnUnmatchedPath = false });
110110
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
111111
}
112112
}
@@ -182,8 +182,8 @@ public void CanUnstageUnknownPathsAgainstAnOrphanedHeadWithLaxUnmatchedExplicitP
182182

183183
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
184184

185-
Assert.DoesNotThrow(() => repo.Unstage(relativePath));
186-
Assert.DoesNotThrow(() => repo.Unstage(relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false }));
185+
repo.Unstage(relativePath);
186+
repo.Unstage(relativePath, new ExplicitPathsOptions { ShouldFailOnUnmatchedPath = false });
187187
Assert.Equal(currentStatus, repo.RetrieveStatus(relativePath));
188188
}
189189
}

‎LibGit2Sharp.Tests/app.config

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-1.9.2.1705" newVersion="1.9.2.1705" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
5+
</startup>
116
</configuration>

‎LibGit2Sharp.Tests/packages.config

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Moq" version="4.2.1409.1722" targetFramework="net40" />
4-
<package id="xunit" version="1.9.2" targetFramework="net40" />
5-
<package id="xunit.extensions" version="1.9.2" targetFramework="net40" />
6-
<package id="xunit.runner.visualstudio" version="2.0.0-rc1-build1030" targetFramework="net40" />
4+
<package id="xunit" version="2.0.0-rc4-build2924" targetFramework="net45" />
5+
<package id="xunit.abstractions" version="2.0.0-rc4-build2924" targetFramework="net45" />
6+
<package id="xunit.assert" version="2.0.0-rc4-build2924" targetFramework="net45" />
7+
<package id="xunit.core" version="2.0.0-rc4-build2924" targetFramework="net45" />
8+
<package id="xunit.extensibility.core" version="2.0.0-rc4-build2924" targetFramework="net45" />
9+
<package id="xunit.runner.msbuild" version="2.0.0-rc4-build2924" targetFramework="net45" />
10+
<package id="xunit.runner.visualstudio" version="2.0.0-rc4-build1049" targetFramework="net40" />
711
</packages>

0 commit comments

Comments
 (0)
0