Skip to content
This repository was archived by the owner on Nov 15, 2022. It is now read-only.

Commit d34993a

Browse files
GraemeFGraemeF
committed
Use Should.Fluent for assertions.
1 parent 6527ef8 commit d34993a

29 files changed

+132
-83
lines changed

Diff for: ‎Twidder.Core.Tests/Twidder.Core.Tests.csproj

+3
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
<WarningLevel>4</WarningLevel>
3232
</PropertyGroup>
3333
<ItemGroup>
34+
<Reference Include="Should.Fluent">
35+
<HintPath>..\packages\ShouldFluent.1.1.12.0\lib\Should.Fluent.dll</HintPath>
36+
</Reference>
3437
<Reference Include="System" />
3538
<Reference Include="System.Core" />
3639
<Reference Include="System.Xml.Linq" />

Diff for: ‎Twidder.Core.Tests/TwitterCredentialsTests.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{
33
#region Using Directives
44

5+
using Should.Fluent;
6+
57
using Twiddler.Core.Models;
68

79
using Xunit;
@@ -14,14 +16,14 @@ public class TwitterCredentialsTests
1416
public void GettingAreValid_WhenAccessTokenIsMissing_ReturnsFalse()
1517
{
1618
var test = new AccessToken("id", string.Empty, "accessTokenSecret");
17-
Assert.False(test.IsValid);
19+
test.IsValid.Should().Be.False();
1820
}
1921

2022
[Fact]
2123
public void GettingAreValid_WhenCredentialsAreComplete_ReturnsTrue()
2224
{
2325
var test = new AccessToken("id", "accessToken", "accessTokenSecret");
24-
Assert.True(test.IsValid);
26+
test.IsValid.Should().Be.True();
2527
}
2628
}
2729
}

Diff for: ‎Twidder.Core.Tests/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="xunit" version="1.7.0.1540" />
4+
<package id="ShouldFluent" version="1.1.12.0" />
45
</packages>

Diff for: ‎Twiddler.AcceptanceTests/AuthorizationStepDefinitions.cs

+2-5
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
{
33
#region Using Directives
44

5-
using System;
6-
7-
using Should.Core.Assertions;
85
using Should.Fluent;
96

107
using TechTalk.SpecFlow;
@@ -36,13 +33,13 @@ public void ThenAuthorizationShouldFail()
3633
[Then(@"I should be authorized")]
3734
public void ThenIShouldBeAuthorized()
3835
{
39-
Assert.Equal("Authorized", Application.AuthorizationStatus, StringComparer.CurrentCultureIgnoreCase);
36+
Application.AuthorizationStatus.Should().Equal("Authorized");
4037
}
4138

4239
[Then(@"I should be unauthorized")]
4340
public void ThenIShouldBeUnuathorized()
4441
{
45-
Assert.Equal("Unauthorized", Application.AuthorizationStatus, StringComparer.CurrentCultureIgnoreCase);
42+
Application.AuthorizationStatus.Should().Equal("Unauthorized");
4643
}
4744

4845
[When(@"I authorize with Twitter")]

Diff for: ‎Twiddler.Tests/Commands/ArchiveTweetCommandTests.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
{
33
#region Using Directives
44

5+
using Should.Fluent;
6+
57
using Twiddler.Commands;
68
using Twiddler.Core.Models;
79
using Twiddler.TestData;
@@ -23,23 +25,23 @@ public void CanExecuteChanged_WhenTweetBecomesArchived_IsRaised()
2325

2426
tweet.Archive();
2527

26-
Assert.True(eventRaised);
28+
eventRaised.Should().Be.True();
2729
}
2830

2931
[Fact]
3032
public void CanExecute_WhenTweetIsArchived_IsFalse()
3133
{
3234
var test = new ArchiveTweetCommand(A.Tweet.Build());
3335

34-
Assert.True(test.CanExecute(null));
36+
test.CanExecute(null).Should().Be.True();
3537
}
3638

3739
[Fact]
3840
public void CanExecute_WhenTweetIsNotArchived_IsTrue()
3941
{
4042
var test = new ArchiveTweetCommand(A.Tweet.Build());
4143

42-
Assert.True(test.CanExecute(null));
44+
test.CanExecute(null).Should().Be.True();
4345
}
4446

4547
[Fact]
@@ -50,7 +52,7 @@ public void Execute_WhenTweetIsNotArchived_ArchivesTweet()
5052

5153
test.Execute(null);
5254

53-
Assert.True(tweet.IsArchived);
55+
tweet.IsArchived.Should().Be.True();
5456
}
5557
}
5658
}

Diff for: ‎Twiddler.Tests/Commands/DeauthorizeCommandTests.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ namespace Twiddler.Tests.Commands
66

77
using NSubstitute;
88

9+
using Should.Fluent;
10+
911
using Twiddler.Commands;
1012
using Twiddler.Core.Services;
1113

@@ -30,7 +32,7 @@ public void CanExecuteChanged_WhenAuthorizationStatusChanges_IsRaised()
3032
ClientAuthorizationStatusChangesTo(AuthorizationStatus.Verifying);
3133
GC.KeepAlive(test);
3234

33-
Assert.True(eventRaised);
35+
eventRaised.Should().Be.True();
3436
}
3537

3638
[Fact]
@@ -40,7 +42,7 @@ public void CanExecute_WhenAuthorized_ReturnsTrue()
4042

4143
ClientAuthorizationStatusChangesTo(AuthorizationStatus.Authorized);
4244

43-
Assert.True(test.CanExecute(null));
45+
test.CanExecute(null).Should().Be.True();
4446
}
4547

4648
[Theory]
@@ -54,7 +56,7 @@ public void CanExecute_WhenNotAuthorized_ReturnsFalse(AuthorizationStatus status
5456

5557
ClientAuthorizationStatusChangesTo(status);
5658

57-
Assert.False(test.CanExecute(null));
59+
test.CanExecute(null).Should().Be.False();
5860
}
5961

6062
[Fact]

Diff for: ‎Twiddler.Tests/Commands/MarkTweetAsReadCommandTests.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
using NSubstitute;
66

7+
using Should.Fluent;
8+
79
using Twiddler.Commands;
810
using Twiddler.Core.Models;
911
using Twiddler.Core.Services;
@@ -29,23 +31,23 @@ public void CanExecuteChanged_WhenTweetBecomesRead_IsRaised()
2931

3032
_tweet.MarkAsRead();
3133

32-
Assert.True(eventRaised);
34+
eventRaised.Should().Be.True();
3335
}
3436

3537
[Fact]
3638
public void CanExecute_WhenTweetIsNotRead_IsTrue()
3739
{
3840
MarkTweetAsReadCommand test = BuildDefaultTestSubject();
3941

40-
Assert.True(test.CanExecute(null));
42+
test.CanExecute(null).Should().Be.True();
4143
}
4244

4345
[Fact]
4446
public void CanExecute_WhenTweetIsRead_IsFalse()
4547
{
4648
MarkTweetAsReadCommand test = BuildDefaultTestSubject();
4749

48-
Assert.True(test.CanExecute(null));
50+
test.CanExecute(null).Should().Be.True();
4951
}
5052

5153
[Fact]
@@ -55,7 +57,7 @@ public void Execute_WhenTweetIsNotRead_MarksTweetAsRead()
5557

5658
test.Execute(null);
5759

58-
Assert.True(_tweet.IsRead);
60+
_tweet.IsRead.Should().Be.True();
5961
}
6062

6163
[Fact]

Diff for: ‎Twiddler.Tests/Screens/ImageThumbnailScreenTests.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
using NSubstitute;
88

9+
using Should.Fluent;
10+
911
using Twiddler.Commands.Interfaces;
1012
using Twiddler.Models;
1113
using Twiddler.Screens;
@@ -30,31 +32,31 @@ public void GettingFullSize__ReturnsFullSizeFromLocations()
3032
{
3133
ImageThumbnailScreen test = BuildDefaultTestSubject();
3234

33-
Assert.Equal(_imageLocations.FullSize, test.FullSize);
35+
test.FullSize.Should().Equal(_imageLocations.FullSize);
3436
}
3537

3638
[Fact]
3739
public void GettingLink__ReturnsLinkFromLocations()
3840
{
3941
ImageThumbnailScreen test = BuildDefaultTestSubject();
4042

41-
Assert.Equal(_imageLocations.Link, test.Link);
43+
test.Link.Should().Equal(_imageLocations.Link);
4244
}
4345

4446
[Fact]
4547
public void GettingOpenCommand__ReturnsCommand()
4648
{
4749
ImageThumbnailScreen test = BuildDefaultTestSubject();
4850

49-
Assert.Same(_openLinkCommand, test.OpenLinkCommand);
51+
test.OpenLinkCommand.Should().Be.SameAs(_openLinkCommand);
5052
}
5153

5254
[Fact]
5355
public void GettingThumbnail__ReturnsThumbnailFromLocations()
5456
{
5557
ImageThumbnailScreen test = BuildDefaultTestSubject();
5658

57-
Assert.Equal(_imageLocations.Thumbnail, test.Thumbnail);
59+
test.Thumbnail.Should().Equal(_imageLocations.Thumbnail);
5860
}
5961

6062
private ImageThumbnailScreen BuildDefaultTestSubject()

Diff for: ‎Twiddler.Tests/Screens/LoadingTweetScreenTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void GettingId__ReturnsTweetId()
4444
{
4545
LoadingTweetScreen test = BuildDefaultTestSubject();
4646

47-
Assert.Equal(_tweet.Id, test.Id);
47+
test.Id.Should().Equal(_tweet.Id);
4848
}
4949

5050
[Fact]

Diff for: ‎Twiddler.Tests/Screens/RequestMeterScreenTests.cs

+12-8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99

1010
using NSubstitute;
1111

12+
using Should.Core.Exceptions;
13+
using Should.Fluent;
14+
1215
using Twiddler.Screens;
1316
using Twiddler.Services.Interfaces;
1417

@@ -39,7 +42,7 @@ public void GettingHourlyLimit__GetsHourlyLimitFromLimitStatus()
3942
const int hourlyLimit = 350;
4043
_requestStatus.HourlyLimit = hourlyLimit;
4144

42-
Assert.Equal(hourlyLimit, test.HourlyLimit);
45+
test.HourlyLimit.Should().Equal(hourlyLimit);
4346
}
4447

4548
[Fact]
@@ -51,7 +54,7 @@ public void GettingPeriodDuration__GetsFormattedPeriodDurationFromLimitStatus()
5154
RequestMeterScreen test = BuildDefaultTestSubject();
5255
test.Initialize();
5356

54-
Assert.Equal("83m", test.PeriodDuration);
57+
test.PeriodDuration.Should().Equal("83m");
5558
}
5659

5760
[Fact]
@@ -62,7 +65,7 @@ public void GettingRemainingHits__GetsRemainingHitsFromLimitStatus()
6265
const int remainingHits = 33;
6366
_requestStatus.RemainingHits = remainingHits;
6467

65-
Assert.Equal(remainingHits, test.RemainingHits);
68+
test.RemainingHits.Should().Equal(remainingHits);
6669
}
6770

6871
[Fact]
@@ -73,7 +76,7 @@ public void GettingRemainingTime_WhenClockHasPassedTheEndTime_ReturnsZero()
7376
RequestMeterScreen test = BuildDefaultTestSubject();
7477
test.Initialize();
7578

76-
Assert.Equal("0m", test.RemainingTime);
79+
test.RemainingTime.Should().Equal("0m");
7780
}
7881

7982
[Fact]
@@ -84,7 +87,7 @@ public void GettingRemainingTime__GetsFormattedRemainingTimeFromLimitStatus()
8487
RequestMeterScreen test = BuildDefaultTestSubject();
8588
test.Initialize();
8689

87-
Assert.Equal("5m", test.RemainingTime);
90+
test.RemainingTime.Should().Equal("5m");
8891
}
8992

9093
[Theory]
@@ -101,7 +104,7 @@ public void GettingUsedHitsFraction__ReturnsFractionOfHourlyLimit(int remainingH
101104
_requestStatus.RemainingHits = remainingHits;
102105
_requestStatus.HourlyLimit = 100;
103106

104-
Assert.Equal(fraction, test.UsedHitsFraction);
107+
test.UsedHitsFraction.Should().Equal(fraction);
105108
}
106109

107110
[Theory]
@@ -117,7 +120,7 @@ public void GettingUsedTimeFraction__ReturnsFractionOfPeriodDuration(int remaini
117120

118121
TimeLeftInPeriodIs(TimeSpan.FromMinutes(remainingMinutes));
119122

120-
Assert.Equal(fraction, test.UsedTimeFraction);
123+
test.UsedTimeFraction.Should().Equal(fraction);
121124
}
122125

123126
[Fact]
@@ -150,7 +153,8 @@ public void Shutdown__UnsubscribesFromRequestStatusChanges()
150153
test.Initialize();
151154
test.Shutdown();
152155

153-
test.PropertyChanged += (sender, args) => Assert.True(false);
156+
test.PropertyChanged +=
157+
(sender, args) => { throw new AssertException("No properties should have changed."); };
154158

155159
PropertyChangesOnRequestStatus("RemainingHits");
156160
}

Diff for: ‎Twiddler.Tests/Screens/ShellScreenTests.cs

+4-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
using NSubstitute;
66

7+
using Should.Fluent;
8+
79
using Twiddler.Screens;
810
using Twiddler.Screens.Interfaces;
911
using Twiddler.Services.Interfaces;
@@ -27,7 +29,7 @@ public void GettingStatus_WhenInitialized_ReturnsInitializedStatus()
2729
test.Initialize();
2830

2931
_status.Received().Initialize();
30-
Assert.Same(_status, test.Status);
32+
test.Status.Should().Be.SameAs(_status);
3133
}
3234

3335
[Fact]
@@ -37,7 +39,7 @@ public void GettingTimeline_WhenInitialized_ReturnsInitializedTimeline()
3739
test.Initialize();
3840

3941
_timeline.Received().Initialize();
40-
Assert.Same(_timeline, test.Timeline);
42+
test.Timeline.Should().Be.SameAs(_timeline);
4143
}
4244

4345
[Fact]

0 commit comments

Comments
 (0)