Skip to content

Commit a185fdc

Browse files
robdmoorerobdmoore
committed
Moved from NUnit to XUnit+Shouldly
1 parent 8a65799 commit a185fdc

12 files changed

Lines changed: 145 additions & 130 deletions

‎NTestDataBuilder.Tests/AsProxyTests.cs‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
using System;
22
using NSubstitute;
33
using NTestDataBuilder.Tests.Builders;
4-
using NUnit.Framework;
4+
using Shouldly;
5+
using Xunit;
56

67
namespace NTestDataBuilder.Tests
78
{
8-
class AsProxyTests
9+
public class AsProxyTests
910
{
10-
[Test]
11+
[Fact]
1112
public void GivenBuilderIsSetAsProxy_WhenBuilding_AnNSubstituteProxyIsReturned()
1213
{
1314
var builder = new CustomerBuilder().AsProxy();
1415

1516
var proxy = builder.Build();
1617

1718
proxy.CustomerForHowManyYears(Arg.Any<DateTime>()).Returns(100);
18-
Assert.That(proxy.CustomerForHowManyYears(DateTime.Now), Is.EqualTo(100));
19+
proxy.CustomerForHowManyYears(DateTime.Now).ShouldBe(100);
1920
}
2021

21-
[Test]
22+
[Fact]
2223
public void GivenBuilderThatAltersProxyIsSetAsProxy_WhenBuilding_TheProxyIsAltered()
2324
{
2425
var builder = new ProxyAlteringCustomerBuilder()
@@ -27,7 +28,7 @@ public void GivenBuilderThatAltersProxyIsSetAsProxy_WhenBuilding_TheProxyIsAlter
2728

2829
var proxy = builder.Build();
2930

30-
Assert.That(proxy.CustomerForHowManyYears(DateTime.Now), Is.EqualTo(10));
31+
proxy.CustomerForHowManyYears(DateTime.Now).ShouldBe(10);
3132
}
3233
}
3334
}

‎NTestDataBuilder.Tests/BuildListTests.cs‎

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,94 @@
1-
using System.Linq;
1+
using System.Collections.Generic;
2+
using System.Linq;
23
using FizzWare.NBuilder;
34
using NTestDataBuilder.Tests.Builders;
45
using NTestDataBuilder.Tests.Entities;
5-
using NUnit.Framework;
6+
using Shouldly;
7+
using Xunit;
68

79
namespace NTestDataBuilder.Tests
810
{
9-
class BuildListTests
11+
public class BuildListTests
1012
{
11-
[Test]
13+
[Fact]
1214
public void GivenListOfBuilders_WhenCallingBuildList_ThenAListOfEntitiesOfTheRightSizeShouldBeReturned()
1315
{
1416
var builders = BasicCustomerBuilder.CreateListOfSize(5);
1517

1618
var entities = builders.BuildList<Customer, BasicCustomerBuilder>();
1719

18-
Assert.That(entities, Has.Count.EqualTo(5));
20+
entities.Count.ShouldBe(5);
1921
}
2022

21-
[Test]
23+
[Fact]
2224
public void GivenListOfBuilders_WhenCallingBuildList_ThenAListOfEntitiesOfTheRightTypeShouldBeReturned()
2325
{
2426
var builders = BasicCustomerBuilder.CreateListOfSize(5);
2527

2628
var entities = builders.BuildList<Customer, BasicCustomerBuilder>();
2729

28-
Assert.That(entities, Has.All.With.TypeOf<Customer>());
30+
entities.ShouldBeAssignableTo<IList<Customer>>();
2931
}
3032

31-
[Test]
33+
[Fact]
3234
public void GivenListOfBuilders_WhenCallingBuildList_ThenAListOfUniqueEntitiesShouldBeReturned()
3335
{
3436
var builders = BasicCustomerBuilder.CreateListOfSize(5);
3537

3638
var entities = builders.BuildList<Customer, BasicCustomerBuilder>();
3739

38-
Assert.That(entities, Is.Unique);
40+
entities[0].ShouldNotBe(entities[1]);
41+
entities[0].ShouldNotBe(entities[2]);
42+
entities[0].ShouldNotBe(entities[3]);
43+
entities[0].ShouldNotBe(entities[4]);
44+
entities[1].ShouldNotBe(entities[2]);
45+
entities[1].ShouldNotBe(entities[3]);
46+
entities[1].ShouldNotBe(entities[4]);
47+
entities[2].ShouldNotBe(entities[3]);
48+
entities[2].ShouldNotBe(entities[4]);
49+
entities[3].ShouldNotBe(entities[4]);
3950
}
4051

41-
[Test]
52+
[Fact]
4253
public void GivenListOfBuildersWithNoCustomisation_WhenCallingExtensionMethodToBuildList_ThenListOfTheRightSizeShouldBeReturned()
4354
{
4455
var builders = CustomerBuilder.CreateListOfSize(5);
4556

4657
var entities = builders.BuildList();
4758

48-
Assert.That(entities, Has.Count.EqualTo(5));
59+
entities.Count.ShouldBe(5);
4960
}
5061

51-
[Test]
62+
[Fact]
5263
public void GivenListOfBuildersWithNoCustomisation_WhenCallingExtensionMethodToBuildList_ThenListOfTheRightTypeShouldBeReturned()
5364
{
5465
var builders = CustomerBuilder.CreateListOfSize(5);
5566

5667
var entities = builders.BuildList();
5768

58-
Assert.That(entities, Has.All.TypeOf<Customer>());
69+
entities.ShouldBeAssignableTo<IList<Customer>>();
5970
}
6071

61-
[Test]
72+
[Fact]
6273
public void GivenListOfBuildersWithNoCustomisation_WhenCallingExtensionMethodToBuildList_ThenAListOfUniqueEntitiesShouldBeReturned()
6374
{
6475
var builders = CustomerBuilder.CreateListOfSize(5);
6576

6677
var entities = builders.BuildList();
6778

68-
Assert.That(entities, Is.Unique);
79+
entities[0].ShouldNotBe(entities[1]);
80+
entities[0].ShouldNotBe(entities[2]);
81+
entities[0].ShouldNotBe(entities[3]);
82+
entities[0].ShouldNotBe(entities[4]);
83+
entities[1].ShouldNotBe(entities[2]);
84+
entities[1].ShouldNotBe(entities[3]);
85+
entities[1].ShouldNotBe(entities[4]);
86+
entities[2].ShouldNotBe(entities[3]);
87+
entities[2].ShouldNotBe(entities[4]);
88+
entities[3].ShouldNotBe(entities[4]);
6989
}
7090

71-
[Test]
91+
[Fact]
7292
public void GivenListOfBuildersWithCustomisation_WhenCallingExtensionMethodToBuildList_ThenTheCustomisationShouldTakeEffect()
7393
{
7494
var generator = new SequentialGenerator<int>();
@@ -77,7 +97,8 @@ public void GivenListOfBuildersWithCustomisation_WhenCallingExtensionMethodToBui
7797

7898
var data = list.BuildList();
7999

80-
Assert.That(data.Select(c => c.FirstName), Is.EqualTo(new[]{"0", "1", "2"}));
100+
data.Select(c => c.FirstName).ToArray()
101+
.ShouldBe(new[]{"0", "1", "2"});
81102
}
82103
}
83104
}

‎NTestDataBuilder.Tests/BuildTests.cs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
using NTestDataBuilder.Tests.Builders;
22
using NTestDataBuilder.Tests.Entities;
3-
using NUnit.Framework;
3+
using Shouldly;
4+
using Xunit;
45

56
namespace NTestDataBuilder.Tests
67
{
7-
class BuildTests
8+
public class BuildTests
89
{
9-
[Test]
10+
[Fact]
1011
public void GivenBasicBuilder_WhenCallingBuild_ThenReturnAnObject()
1112
{
1213
var builder = new BasicCustomerBuilder();
1314

1415
var customer = builder.Build();
1516

16-
Assert.That(customer, Is.TypeOf<Customer>());
17+
customer.ShouldBeOfType<Customer>();
1718
}
1819

19-
[Test]
20+
[Fact]
2021
public void GivenBuilderWithMethodCalls_WhenCallingBuild_ThenReturnAnObjectWithTheConfiguredParameters()
2122
{
2223
var builder = new CustomerBuilder()
@@ -26,9 +27,9 @@ public void GivenBuilderWithMethodCalls_WhenCallingBuild_ThenReturnAnObjectWithT
2627

2728
var customer = builder.Build();
2829

29-
Assert.That(customer.FirstName, Is.EqualTo("Matt"));
30-
Assert.That(customer.LastName, Is.EqualTo("Kocaj"));
31-
Assert.That(customer.YearJoined, Is.EqualTo(2010));
30+
customer.FirstName.ShouldBe("Matt");
31+
customer.LastName.ShouldBe("Kocaj");
32+
customer.YearJoined.ShouldBe(2010);
3233
}
3334
}
3435
}

‎NTestDataBuilder.Tests/CreateListTests.cs‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,35 @@
1-
using System.Linq;
1+
using System.Collections.Generic;
2+
using System.Linq;
23
using FizzWare.NBuilder;
34
using NTestDataBuilder.Tests.Builders;
4-
using NUnit.Framework;
5+
using Shouldly;
6+
using Xunit;
57

68
namespace NTestDataBuilder.Tests
79
{
8-
class CreateListTests
10+
public class CreateListTests
911
{
10-
[Test]
12+
[Fact]
1113
public void GivenCreatingListOfSizeX_WhenListIsBuilt_ThenAListOfTheRightSizeIsGenerated()
1214
{
1315
var builderExpression = BasicCustomerBuilder.CreateListOfSize(5);
1416

1517
var builtList = builderExpression.Build();
1618

17-
Assert.That(builtList, Has.Count.EqualTo(5));
19+
builtList.Count.ShouldBe(5);
1820
}
1921

20-
[Test]
21-
public void GivenCreatingListOfSizeX_WhenListIsBuilt_ThenAListOfUniqueBuildersIsGenerated()
22-
{
23-
var builderExpression = BasicCustomerBuilder.CreateListOfSize(5);
24-
25-
var builtList = builderExpression.Build();
26-
27-
Assert.That(builtList, Is.Unique);
28-
}
29-
30-
[Test]
22+
[Fact]
3123
public void GivenCreatingListOfSizeX_WhenListIsBuilt_ThenAListOfTheRightBuilderTypesIsGenerated()
3224
{
3325
var builderExpression = BasicCustomerBuilder.CreateListOfSize(5);
3426

3527
var builtList = builderExpression.Build();
3628

37-
Assert.That(builtList, Has.All.With.TypeOf<BasicCustomerBuilder>());
29+
builtList.ShouldBeAssignableTo<IList<BasicCustomerBuilder>>();
3830
}
3931

40-
[Test]
32+
[Fact]
4133
public void GivenCreatingAList_WhenUsingNBuilderToChangeTheList_ThenTheChangesAreReflected()
4234
{
4335
var generator = new SequentialGenerator<int>();
@@ -46,7 +38,8 @@ public void GivenCreatingAList_WhenUsingNBuilderToChangeTheList_ThenTheChangesAr
4638
.All().With(b => b.WithFirstName(generator.Generate().ToString()))
4739
.Build();
4840

49-
Assert.That(list.Select(b => b.Get(x => x.FirstName)), Is.EqualTo(new[]{"0", "1", "2"}));
41+
list.Select(b => b.Get(x => x.FirstName)).ToArray()
42+
.ShouldBe(new[] {"0", "1", "2"});
5043
}
5144
}
5245
}

‎NTestDataBuilder.Tests/EquivalenceClasses/StringEquivalenceClassesTests.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
using NTestDataBuilder.EquivalenceClasses;
2-
using NUnit.Framework;
32
using Shouldly;
3+
using Xunit;
44

55
namespace NTestDataBuilder.Tests.EquivalenceClasses
66
{
77
public class StringEquivalenceClassesTests
88
{
99
public AnonymousValueFixture Any { get; private set; }
1010

11-
[SetUp]
12-
public void Setup()
11+
public StringEquivalenceClassesTests()
1312
{
1413
Any = new AnonymousValueFixture();
1514
}
1615

17-
[Test]
16+
[Fact]
1817
public void WhenGettingAnyString_ThenReturnDifferentNonEmptyStringsEveryTime()
1918
{
2019
var s1 = Any.String();
@@ -27,7 +26,7 @@ public void WhenGettingAnyString_ThenReturnDifferentNonEmptyStringsEveryTime()
2726
s1.ShouldNotBe(s2);
2827
}
2928

30-
[Test]
29+
[Fact]
3130
public void WhenGettingAnyStringStartingWithSomething_ThenReturnDifferentStringsStartingWithThatStringEveryTime()
3231
{
3332
var s1 = Any.StringStartingWith("St4rt");

0 commit comments

Comments
 (0)