Skip to content

Commit b2dbc7e

Browse files
JakeGinnivanJakeGinnivan
committed
Downgraded to xUnit 1.9.2
1 parent 61876ca commit b2dbc7e

16 files changed

+43
-40
lines changed

‎Samples/TestStack.BDDfy.Samples/TestStack.BDDfy.Samples.csproj‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<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')" />
4-
<Import Project="..\..\packages\xunit.core.2.0.0-rc1-build2826\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.0.0-rc1-build2826\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
76
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,7 +13,7 @@
1413
<AssemblyName>TestStack.BDDfy.Samples</AssemblyName>
1514
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1615
<FileAlignment>512</FileAlignment>
17-
<NuGetPackageImportStamp>7ec62153</NuGetPackageImportStamp>
16+
<NuGetPackageImportStamp>9dadff8a</NuGetPackageImportStamp>
1817
</PropertyGroup>
1918
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2019
<DebugSymbols>true</DebugSymbols>
@@ -75,11 +74,11 @@
7574
<HintPath>..\..\packages\Shouldly.2.3.1\lib\net40\Shouldly.dll</HintPath>
7675
</Reference>
7776
<Reference Include="System" />
78-
<Reference Include="xunit.abstractions">
79-
<HintPath>..\..\packages\xunit.abstractions.2.0.0-rc1-build2826\lib\net35\xunit.abstractions.dll</HintPath>
77+
<Reference Include="xunit">
78+
<HintPath>..\..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
8079
</Reference>
81-
<Reference Include="xunit.core">
82-
<HintPath>..\..\packages\xunit.extensibility.core.2.0.0-rc1-build2826\lib\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.dll</HintPath>
80+
<Reference Include="xunit.extensions">
81+
<HintPath>..\..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll</HintPath>
8382
</Reference>
8483
</ItemGroup>
8584
<ItemGroup>
@@ -106,7 +105,6 @@
106105
<PropertyGroup>
107106
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
108107
</PropertyGroup>
109-
<Error Condition="!Exists('..\..\packages\xunit.core.2.0.0-rc1-build2826\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.0.0-rc1-build2826\build\portable-net45+aspnetcore50+win+wpa81+wp80+monotouch+monoandroid+Xamarin.iOS\xunit.core.props'))" />
110108
<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'))" />
111109
<Error Condition="!Exists('..\..\packages\Fody.1.26.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Fody.1.26.4\build\Fody.targets'))" />
112110
</Target>

‎Samples/TestStack.BDDfy.Samples/TicTacToe/TicTacToe.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Shouldly;
22
using Xunit;
3+
using Xunit.Extensions;
34

45
namespace TestStack.BDDfy.Samples.TicTacToe
56
{

‎Samples/TestStack.BDDfy.Samples/packages.config‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22
<packages>
33
<package id="Fody" version="1.26.4" targetFramework="net45" developmentDependency="true" />
44
<package id="ModuleInit.Fody" version="1.5.6.0" targetFramework="net45" developmentDependency="true" />
5-
<package id="xunit.abstractions" version="2.0.0-rc1-build2826" targetFramework="net45" />
6-
<package id="xunit.core" version="2.0.0-rc1-build2826" targetFramework="net45" />
7-
<package id="xunit.extensibility.core" version="2.0.0-rc1-build2826" targetFramework="net45" />
5+
<package id="xunit" version="1.9.2" targetFramework="net45" />
6+
<package id="xunit.extensions" version="1.9.2" targetFramework="net45" />
87
<package id="xunit.runner.visualstudio" version="2.0.0-rc1-build1030" targetFramework="net45" />
9-
<package id="xunit.runners" version="2.0.0-rc1-build2826" targetFramework="net45" />
108
</packages>

‎TestStack.BDDfy.Tests/Disposer/DisposingScenarios.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using Shouldly;
44
using TestStack.BDDfy.Tests.Exceptions;
55
using Xunit;
6+
using Xunit.Extensions;
67

78
namespace TestStack.BDDfy.Tests.Disposer
89
{

‎TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenGivenThrowsNotImplementedException.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using Shouldly;
23
using TestStack.BDDfy.Processors;
34
using Xunit;
@@ -8,12 +9,14 @@ public class WhenGivenThrowsNotImplementedException : NotImplementedExceptionBas
89
{
910
private void ExecuteUsingFluentScanner()
1011
{
11-
Should.Throw<InconclusiveException>(() => Sut.Execute(ThrowingMethods.Given, true));
12+
var ex = Should.Throw<Exception>(() => Sut.Execute(ThrowingMethods.Given, true));
13+
ex.GetType().FullName.ShouldBe("Gallio.Framework.TestInconclusiveException");
1214
}
1315

1416
private void ExecuteUsingReflectingScanners()
1517
{
16-
Should.Throw<InconclusiveException>(() => Sut.Execute(ThrowingMethods.Given, false));
18+
var ex = Should.Throw<Exception>(() => Sut.Execute(ThrowingMethods.Given, false));
19+
ex.GetType().FullName.ShouldBe("Gallio.Framework.TestInconclusiveException");
1720
}
1821

1922
[Fact]

‎TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenThenThrowsNotImplementedException.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using Shouldly;
23
using TestStack.BDDfy.Processors;
34
using Xunit;
@@ -8,12 +9,14 @@ public class WhenThenThrowsNotImplementedException : NotImplementedExceptionBase
89
{
910
private void ExecuteUsingReflectingScanners()
1011
{
11-
Should.Throw<InconclusiveException>(() => Sut.Execute(ThrowingMethods.Then, false));
12+
var ex = Should.Throw<Exception>(() => Sut.Execute(ThrowingMethods.Then, false));
13+
ex.GetType().FullName.ShouldBe("Gallio.Framework.TestInconclusiveException");
1214
}
1315

1416
private void ExecuteUsingFluentScanner()
1517
{
16-
Should.Throw<InconclusiveException>(() => Sut.Execute(ThrowingMethods.Then, true));
18+
var ex = Should.Throw<Exception>(() => Sut.Execute(ThrowingMethods.Then, true));
19+
ex.GetType().FullName.ShouldBe("Gallio.Framework.TestInconclusiveException");
1720
}
1821

1922
[Fact]

‎TestStack.BDDfy.Tests/Exceptions/NotImplementedException/WhenWhenThrowsNotImplementedException.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System;
12
using Shouldly;
23
using TestStack.BDDfy.Processors;
34
using Xunit;
@@ -8,12 +9,14 @@ public class WhenWhenThrowsNotImplementedException : NotImplementedExceptionBase
89
{
910
private void ExecuteUsingReflectingScanners()
1011
{
11-
Should.Throw<InconclusiveException>(() => Sut.Execute(ThrowingMethods.When, false));
12+
var ex = Should.Throw<Exception>(() => Sut.Execute(ThrowingMethods.When, false));
13+
ex.GetType().FullName.ShouldBe("Gallio.Framework.TestInconclusiveException");
1214
}
1315

1416
private void ExecuteUsingFluentScanner()
1517
{
16-
Should.Throw<InconclusiveException>(() => Sut.Execute(ThrowingMethods.When, true));
18+
var ex = Should.Throw<Exception>(() => Sut.Execute(ThrowingMethods.When, true));
19+
ex.GetType().FullName.ShouldBe("Gallio.Framework.TestInconclusiveException");
1720
}
1821

1922
[Fact]

‎TestStack.BDDfy.Tests/NetToStringTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Shouldly;
22
using TestStack.BDDfy.Configuration;
33
using Xunit;
4+
using Xunit.Extensions;
45

56
namespace TestStack.BDDfy.Tests
67
{

‎TestStack.BDDfy.Tests/Scanner/ReflectiveScanner/WhenTestClassUsesExecutableAttributes.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,17 @@ public void ButWhen()
134134
public void ThenStepsWithArgs()
135135
{
136136
var steps = _steps.Where(s => s.Title == "Then 1, 2" || s.Title == "Then 3, 4").ToList();
137-
steps.All(s => s.ExecutionOrder == ExecutionOrder.Assertion).ShouldBe(false);
138-
steps.All(s => s.Asserts).ShouldBe(false);
139-
steps.All(s => s.Title.EndsWith(" 1, 2") || s.Title.EndsWith(" 3, 4")).ShouldBe(false);
137+
steps.All(s => s.ExecutionOrder == ExecutionOrder.Assertion).ShouldBe(true);
138+
steps.All(s => s.Asserts).ShouldBe(true);
139+
steps.All(s => s.Title.EndsWith(" 1, 2") || s.Title.EndsWith(" 3, 4")).ShouldBe(true);
140140
}
141141

142142
[Fact]
143143
public void AndThen()
144144
{
145145
var step = _steps.Single(s => s.Title.Trim() == TypeWithAttribute.MethodTextForAndThen);
146146
step.ExecutionOrder.ShouldBe(ExecutionOrder.ConsecutiveAssertion);
147-
step.Asserts.ShouldBe(false);
147+
step.Asserts.ShouldBe(true);
148148
step.Title.Trim().ShouldBe(TypeWithAttribute.MethodTextForAndThen);
149149
}
150150

@@ -153,7 +153,7 @@ public void But()
153153
{
154154
var step = _steps.Single(s => s.Title == "I dont want this to be true");
155155
step.ExecutionOrder.ShouldBe(ExecutionOrder.ConsecutiveAssertion);
156-
step.Asserts.ShouldBe(false);
156+
step.Asserts.ShouldBe(true);
157157
}
158158

159159
[Fact]

‎TestStack.BDDfy.Tests/Stories/StoryCanBeSpecifiedInFluentMode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void Verify()
1414
.Then(_ => ThenTheSpecifiedStoryShouldBeUsed())
1515
.BDDfy<SharedStoryNotion>();
1616

17-
story.Metadata.ShouldBeAssignableTo<SharedStoryNotion>();
17+
story.Metadata.Type.ShouldBe(typeof(SharedStoryNotion));
1818
}
1919

2020
void WhenStoryIsSpecifiedInFluentMode()

0 commit comments

Comments
 (0)