From d34993a656c2655ff690eaacb57b81e490861b84 Mon Sep 17 00:00:00 2001 From: Graeme Foster Date: Wed, 16 Feb 2011 22:14:04 +0000 Subject: [PATCH] Use Should.Fluent for assertions. --- Twidder.Core.Tests/Twidder.Core.Tests.csproj | 3 ++ Twidder.Core.Tests/TwitterCredentialsTests.cs | 6 ++-- Twidder.Core.Tests/packages.config | 1 + .../AuthorizationStepDefinitions.cs | 7 ++-- .../Commands/ArchiveTweetCommandTests.cs | 10 +++--- .../Commands/DeauthorizeCommandTests.cs | 8 +++-- .../Commands/MarkTweetAsReadCommandTests.cs | 10 +++--- .../Screens/ImageThumbnailScreenTests.cs | 10 +++--- .../Screens/LoadingTweetScreenTests.cs | 2 +- .../Screens/RequestMeterScreenTests.cs | 20 +++++++----- Twiddler.Tests/Screens/ShellScreenTests.cs | 6 ++-- Twiddler.Tests/Screens/StatusScreenTests.cs | 12 ++++--- Twiddler.Tests/Screens/TimelineScreenTests.cs | 6 ++-- Twiddler.Tests/Screens/TweetScreenTests.cs | 32 ++++++++++--------- .../ImageServices/TwitPicDecoderTests.cs | 11 ++++--- .../ImageServices/YFrogDecoderTests.cs | 13 ++++---- .../LinkThumbnailScreenFactoryTests.cs | 6 ++-- .../Services/MemoryTweetStoreTests.cs | 6 ++-- Twiddler.Tests/Services/StoreTimelineTests.cs | 4 +-- Twiddler.Tests/Services/TweetRatingTests.cs | 8 +++-- .../AuthorizeCommandTests.cs | 8 +++-- .../Twiddler.TweetSharp.Tests.csproj | 3 ++ .../TwitterClientTests.cs | 4 ++- Twiddler.TweetSharp.Tests/packages.config | 1 + .../CredentialsDocumentStoreTests.cs | 6 ++-- Twiddler.TwitterStore.Tests/TweetTests.cs | 4 ++- .../Twiddler.TwitterStore.Tests.csproj | 3 ++ .../TwitterDocumentStoreTests.cs | 4 ++- Twiddler.TwitterStore.Tests/packages.config | 1 + 29 files changed, 132 insertions(+), 83 deletions(-) diff --git a/Twidder.Core.Tests/Twidder.Core.Tests.csproj b/Twidder.Core.Tests/Twidder.Core.Tests.csproj index 9677772..a0e0aed 100644 --- a/Twidder.Core.Tests/Twidder.Core.Tests.csproj +++ b/Twidder.Core.Tests/Twidder.Core.Tests.csproj @@ -31,6 +31,9 @@ 4 + + ..\packages\ShouldFluent.1.1.12.0\lib\Should.Fluent.dll + diff --git a/Twidder.Core.Tests/TwitterCredentialsTests.cs b/Twidder.Core.Tests/TwitterCredentialsTests.cs index 3288cb0..3f0b5f4 100644 --- a/Twidder.Core.Tests/TwitterCredentialsTests.cs +++ b/Twidder.Core.Tests/TwitterCredentialsTests.cs @@ -2,6 +2,8 @@ { #region Using Directives + using Should.Fluent; + using Twiddler.Core.Models; using Xunit; @@ -14,14 +16,14 @@ public class TwitterCredentialsTests public void GettingAreValid_WhenAccessTokenIsMissing_ReturnsFalse() { var test = new AccessToken("id", string.Empty, "accessTokenSecret"); - Assert.False(test.IsValid); + test.IsValid.Should().Be.False(); } [Fact] public void GettingAreValid_WhenCredentialsAreComplete_ReturnsTrue() { var test = new AccessToken("id", "accessToken", "accessTokenSecret"); - Assert.True(test.IsValid); + test.IsValid.Should().Be.True(); } } } \ No newline at end of file diff --git a/Twidder.Core.Tests/packages.config b/Twidder.Core.Tests/packages.config index 46b0b72..37bc630 100644 --- a/Twidder.Core.Tests/packages.config +++ b/Twidder.Core.Tests/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/Twiddler.AcceptanceTests/AuthorizationStepDefinitions.cs b/Twiddler.AcceptanceTests/AuthorizationStepDefinitions.cs index cd96366..5d780df 100644 --- a/Twiddler.AcceptanceTests/AuthorizationStepDefinitions.cs +++ b/Twiddler.AcceptanceTests/AuthorizationStepDefinitions.cs @@ -2,9 +2,6 @@ { #region Using Directives - using System; - - using Should.Core.Assertions; using Should.Fluent; using TechTalk.SpecFlow; @@ -36,13 +33,13 @@ public void ThenAuthorizationShouldFail() [Then(@"I should be authorized")] public void ThenIShouldBeAuthorized() { - Assert.Equal("Authorized", Application.AuthorizationStatus, StringComparer.CurrentCultureIgnoreCase); + Application.AuthorizationStatus.Should().Equal("Authorized"); } [Then(@"I should be unauthorized")] public void ThenIShouldBeUnuathorized() { - Assert.Equal("Unauthorized", Application.AuthorizationStatus, StringComparer.CurrentCultureIgnoreCase); + Application.AuthorizationStatus.Should().Equal("Unauthorized"); } [When(@"I authorize with Twitter")] diff --git a/Twiddler.Tests/Commands/ArchiveTweetCommandTests.cs b/Twiddler.Tests/Commands/ArchiveTweetCommandTests.cs index 828c8e7..f3d177b 100644 --- a/Twiddler.Tests/Commands/ArchiveTweetCommandTests.cs +++ b/Twiddler.Tests/Commands/ArchiveTweetCommandTests.cs @@ -2,6 +2,8 @@ { #region Using Directives + using Should.Fluent; + using Twiddler.Commands; using Twiddler.Core.Models; using Twiddler.TestData; @@ -23,7 +25,7 @@ public void CanExecuteChanged_WhenTweetBecomesArchived_IsRaised() tweet.Archive(); - Assert.True(eventRaised); + eventRaised.Should().Be.True(); } [Fact] @@ -31,7 +33,7 @@ public void CanExecute_WhenTweetIsArchived_IsFalse() { var test = new ArchiveTweetCommand(A.Tweet.Build()); - Assert.True(test.CanExecute(null)); + test.CanExecute(null).Should().Be.True(); } [Fact] @@ -39,7 +41,7 @@ public void CanExecute_WhenTweetIsNotArchived_IsTrue() { var test = new ArchiveTweetCommand(A.Tweet.Build()); - Assert.True(test.CanExecute(null)); + test.CanExecute(null).Should().Be.True(); } [Fact] @@ -50,7 +52,7 @@ public void Execute_WhenTweetIsNotArchived_ArchivesTweet() test.Execute(null); - Assert.True(tweet.IsArchived); + tweet.IsArchived.Should().Be.True(); } } } \ No newline at end of file diff --git a/Twiddler.Tests/Commands/DeauthorizeCommandTests.cs b/Twiddler.Tests/Commands/DeauthorizeCommandTests.cs index fa14f4c..f017b45 100644 --- a/Twiddler.Tests/Commands/DeauthorizeCommandTests.cs +++ b/Twiddler.Tests/Commands/DeauthorizeCommandTests.cs @@ -6,6 +6,8 @@ namespace Twiddler.Tests.Commands using NSubstitute; + using Should.Fluent; + using Twiddler.Commands; using Twiddler.Core.Services; @@ -30,7 +32,7 @@ public void CanExecuteChanged_WhenAuthorizationStatusChanges_IsRaised() ClientAuthorizationStatusChangesTo(AuthorizationStatus.Verifying); GC.KeepAlive(test); - Assert.True(eventRaised); + eventRaised.Should().Be.True(); } [Fact] @@ -40,7 +42,7 @@ public void CanExecute_WhenAuthorized_ReturnsTrue() ClientAuthorizationStatusChangesTo(AuthorizationStatus.Authorized); - Assert.True(test.CanExecute(null)); + test.CanExecute(null).Should().Be.True(); } [Theory] @@ -54,7 +56,7 @@ public void CanExecute_WhenNotAuthorized_ReturnsFalse(AuthorizationStatus status ClientAuthorizationStatusChangesTo(status); - Assert.False(test.CanExecute(null)); + test.CanExecute(null).Should().Be.False(); } [Fact] diff --git a/Twiddler.Tests/Commands/MarkTweetAsReadCommandTests.cs b/Twiddler.Tests/Commands/MarkTweetAsReadCommandTests.cs index dbf9d02..2ace453 100644 --- a/Twiddler.Tests/Commands/MarkTweetAsReadCommandTests.cs +++ b/Twiddler.Tests/Commands/MarkTweetAsReadCommandTests.cs @@ -4,6 +4,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Commands; using Twiddler.Core.Models; using Twiddler.Core.Services; @@ -29,7 +31,7 @@ public void CanExecuteChanged_WhenTweetBecomesRead_IsRaised() _tweet.MarkAsRead(); - Assert.True(eventRaised); + eventRaised.Should().Be.True(); } [Fact] @@ -37,7 +39,7 @@ public void CanExecute_WhenTweetIsNotRead_IsTrue() { MarkTweetAsReadCommand test = BuildDefaultTestSubject(); - Assert.True(test.CanExecute(null)); + test.CanExecute(null).Should().Be.True(); } [Fact] @@ -45,7 +47,7 @@ public void CanExecute_WhenTweetIsRead_IsFalse() { MarkTweetAsReadCommand test = BuildDefaultTestSubject(); - Assert.True(test.CanExecute(null)); + test.CanExecute(null).Should().Be.True(); } [Fact] @@ -55,7 +57,7 @@ public void Execute_WhenTweetIsNotRead_MarksTweetAsRead() test.Execute(null); - Assert.True(_tweet.IsRead); + _tweet.IsRead.Should().Be.True(); } [Fact] diff --git a/Twiddler.Tests/Screens/ImageThumbnailScreenTests.cs b/Twiddler.Tests/Screens/ImageThumbnailScreenTests.cs index 5ea86fe..c4a788a 100644 --- a/Twiddler.Tests/Screens/ImageThumbnailScreenTests.cs +++ b/Twiddler.Tests/Screens/ImageThumbnailScreenTests.cs @@ -6,6 +6,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Commands.Interfaces; using Twiddler.Models; using Twiddler.Screens; @@ -30,7 +32,7 @@ public void GettingFullSize__ReturnsFullSizeFromLocations() { ImageThumbnailScreen test = BuildDefaultTestSubject(); - Assert.Equal(_imageLocations.FullSize, test.FullSize); + test.FullSize.Should().Equal(_imageLocations.FullSize); } [Fact] @@ -38,7 +40,7 @@ public void GettingLink__ReturnsLinkFromLocations() { ImageThumbnailScreen test = BuildDefaultTestSubject(); - Assert.Equal(_imageLocations.Link, test.Link); + test.Link.Should().Equal(_imageLocations.Link); } [Fact] @@ -46,7 +48,7 @@ public void GettingOpenCommand__ReturnsCommand() { ImageThumbnailScreen test = BuildDefaultTestSubject(); - Assert.Same(_openLinkCommand, test.OpenLinkCommand); + test.OpenLinkCommand.Should().Be.SameAs(_openLinkCommand); } [Fact] @@ -54,7 +56,7 @@ public void GettingThumbnail__ReturnsThumbnailFromLocations() { ImageThumbnailScreen test = BuildDefaultTestSubject(); - Assert.Equal(_imageLocations.Thumbnail, test.Thumbnail); + test.Thumbnail.Should().Equal(_imageLocations.Thumbnail); } private ImageThumbnailScreen BuildDefaultTestSubject() diff --git a/Twiddler.Tests/Screens/LoadingTweetScreenTests.cs b/Twiddler.Tests/Screens/LoadingTweetScreenTests.cs index b26091f..ab90fe7 100644 --- a/Twiddler.Tests/Screens/LoadingTweetScreenTests.cs +++ b/Twiddler.Tests/Screens/LoadingTweetScreenTests.cs @@ -44,7 +44,7 @@ public void GettingId__ReturnsTweetId() { LoadingTweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(_tweet.Id, test.Id); + test.Id.Should().Equal(_tweet.Id); } [Fact] diff --git a/Twiddler.Tests/Screens/RequestMeterScreenTests.cs b/Twiddler.Tests/Screens/RequestMeterScreenTests.cs index 6529c44..fe3f29f 100644 --- a/Twiddler.Tests/Screens/RequestMeterScreenTests.cs +++ b/Twiddler.Tests/Screens/RequestMeterScreenTests.cs @@ -9,6 +9,9 @@ using NSubstitute; + using Should.Core.Exceptions; + using Should.Fluent; + using Twiddler.Screens; using Twiddler.Services.Interfaces; @@ -39,7 +42,7 @@ public void GettingHourlyLimit__GetsHourlyLimitFromLimitStatus() const int hourlyLimit = 350; _requestStatus.HourlyLimit = hourlyLimit; - Assert.Equal(hourlyLimit, test.HourlyLimit); + test.HourlyLimit.Should().Equal(hourlyLimit); } [Fact] @@ -51,7 +54,7 @@ public void GettingPeriodDuration__GetsFormattedPeriodDurationFromLimitStatus() RequestMeterScreen test = BuildDefaultTestSubject(); test.Initialize(); - Assert.Equal("83m", test.PeriodDuration); + test.PeriodDuration.Should().Equal("83m"); } [Fact] @@ -62,7 +65,7 @@ public void GettingRemainingHits__GetsRemainingHitsFromLimitStatus() const int remainingHits = 33; _requestStatus.RemainingHits = remainingHits; - Assert.Equal(remainingHits, test.RemainingHits); + test.RemainingHits.Should().Equal(remainingHits); } [Fact] @@ -73,7 +76,7 @@ public void GettingRemainingTime_WhenClockHasPassedTheEndTime_ReturnsZero() RequestMeterScreen test = BuildDefaultTestSubject(); test.Initialize(); - Assert.Equal("0m", test.RemainingTime); + test.RemainingTime.Should().Equal("0m"); } [Fact] @@ -84,7 +87,7 @@ public void GettingRemainingTime__GetsFormattedRemainingTimeFromLimitStatus() RequestMeterScreen test = BuildDefaultTestSubject(); test.Initialize(); - Assert.Equal("5m", test.RemainingTime); + test.RemainingTime.Should().Equal("5m"); } [Theory] @@ -101,7 +104,7 @@ public void GettingUsedHitsFraction__ReturnsFractionOfHourlyLimit(int remainingH _requestStatus.RemainingHits = remainingHits; _requestStatus.HourlyLimit = 100; - Assert.Equal(fraction, test.UsedHitsFraction); + test.UsedHitsFraction.Should().Equal(fraction); } [Theory] @@ -117,7 +120,7 @@ public void GettingUsedTimeFraction__ReturnsFractionOfPeriodDuration(int remaini TimeLeftInPeriodIs(TimeSpan.FromMinutes(remainingMinutes)); - Assert.Equal(fraction, test.UsedTimeFraction); + test.UsedTimeFraction.Should().Equal(fraction); } [Fact] @@ -150,7 +153,8 @@ public void Shutdown__UnsubscribesFromRequestStatusChanges() test.Initialize(); test.Shutdown(); - test.PropertyChanged += (sender, args) => Assert.True(false); + test.PropertyChanged += + (sender, args) => { throw new AssertException("No properties should have changed."); }; PropertyChangesOnRequestStatus("RemainingHits"); } diff --git a/Twiddler.Tests/Screens/ShellScreenTests.cs b/Twiddler.Tests/Screens/ShellScreenTests.cs index 45159c2..2552060 100644 --- a/Twiddler.Tests/Screens/ShellScreenTests.cs +++ b/Twiddler.Tests/Screens/ShellScreenTests.cs @@ -4,6 +4,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Screens; using Twiddler.Screens.Interfaces; using Twiddler.Services.Interfaces; @@ -27,7 +29,7 @@ public void GettingStatus_WhenInitialized_ReturnsInitializedStatus() test.Initialize(); _status.Received().Initialize(); - Assert.Same(_status, test.Status); + test.Status.Should().Be.SameAs(_status); } [Fact] @@ -37,7 +39,7 @@ public void GettingTimeline_WhenInitialized_ReturnsInitializedTimeline() test.Initialize(); _timeline.Received().Initialize(); - Assert.Same(_timeline, test.Timeline); + test.Timeline.Should().Be.SameAs(_timeline); } [Fact] diff --git a/Twiddler.Tests/Screens/StatusScreenTests.cs b/Twiddler.Tests/Screens/StatusScreenTests.cs index fca1394..38cf0ba 100644 --- a/Twiddler.Tests/Screens/StatusScreenTests.cs +++ b/Twiddler.Tests/Screens/StatusScreenTests.cs @@ -8,6 +8,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Commands.Interfaces; using Twiddler.Core.Commands; using Twiddler.Core.Services; @@ -44,7 +46,7 @@ public void Authorization_WhenClientStatusChanges_RaisesPropertyChanged() AssertThatChangeNotificationIsRaisedBy(x => x.Authorization). When(() => ClientAuthorizationStatusChangesTo(newStatus)); - Assert.Equal(newStatus, test.Authorization); + test.Authorization.Should().Equal(newStatus); } [Theory] @@ -59,7 +61,7 @@ public void GettingAuthorization__ReturnsStatusFromClient(AuthorizationStatus st StatusScreen test = BuildDefaultTestSubject(); test.Initialize(); - Assert.Equal(status, test.Authorization); + test.Authorization.Should().Equal(status); } [Fact] @@ -67,7 +69,7 @@ public void GettingAuthorizeCommand__ReturnsCommand() { StatusScreen test = BuildDefaultTestSubject(); - Assert.Same(_authorizeCommand, test.AuthorizeCommand); + test.AuthorizeCommand.Should().Be.SameAs(_authorizeCommand); } [Fact] @@ -75,7 +77,7 @@ public void GettingDeauthorizeCommand__ReturnsCommand() { StatusScreen test = BuildDefaultTestSubject(); - Assert.Same(_deauthorizeCommand, test.DeauthorizeCommand); + test.DeauthorizeCommand.Should().Be.SameAs(_deauthorizeCommand); } [Fact] @@ -84,7 +86,7 @@ public void GettingRequestMeter_WhenInitialized_ReturnsInitializedRequestMeter() StatusScreen test = BuildDefaultTestSubject(); test.Initialize(); - Assert.Same(_requestMeterScreen, test.RequestMeter); + test.RequestMeter.Should().Be.SameAs(_requestMeterScreen); _requestMeterScreen.Received().Initialize(); } diff --git a/Twiddler.Tests/Screens/TimelineScreenTests.cs b/Twiddler.Tests/Screens/TimelineScreenTests.cs index a79e3b8..e471eb3 100644 --- a/Twiddler.Tests/Screens/TimelineScreenTests.cs +++ b/Twiddler.Tests/Screens/TimelineScreenTests.cs @@ -8,6 +8,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Core.Models; using Twiddler.Screens; using Twiddler.Screens.Interfaces; @@ -34,7 +36,7 @@ public void GettingScreens_WhenThereAreNoTweets_IsEmpty() { var test = new TimelineScreen(new Lazy(() => _timeline), null); - Assert.Empty(test.Screens); + test.Screens.Should().Be.Empty(); } [Fact] @@ -47,7 +49,7 @@ public void GettingScreens_WhenThereIsATweet_ContainsAScreen() _tweets.Add(A.Tweet.Build()); - Assert.Contains(mockScreen, test.Screens); + test.Screens.Should().Contain.Item(mockScreen); mockScreen.Received().Initialize(); } diff --git a/Twiddler.Tests/Screens/TweetScreenTests.cs b/Twiddler.Tests/Screens/TweetScreenTests.cs index a4799e2..9a36fea 100644 --- a/Twiddler.Tests/Screens/TweetScreenTests.cs +++ b/Twiddler.Tests/Screens/TweetScreenTests.cs @@ -9,6 +9,8 @@ namespace Twiddler.Tests.Screens using NSubstitute; + using Should.Fluent; + using Twiddler.Commands; using Twiddler.Core.Models; using Twiddler.Core.Services; @@ -23,21 +25,21 @@ namespace Twiddler.Tests.Screens public class TweetScreenTests { + private readonly ILinkThumbnailScreen _linkThumbnailScreen = Substitute.For(); + private readonly ILinkThumbnailScreenFactory _linkThumbnailScreenFactory = Substitute.For(); - private readonly ILinkThumbnailScreen _linkThumbnailScreen = Substitute.For(); + private readonly ITweet _tweet = A.Tweet.Build(); private readonly ITweetRating _tweetRating = Substitute.For(); - private readonly ITweet _tweet = A.Tweet.Build(); - [Fact] public void GettingCreatedDate__ReturnsCreatedDate() { TweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(_tweet.CreatedDate, test.CreatedDate); + test.CreatedDate.Should().Equal(_tweet.CreatedDate); } [Fact] @@ -45,7 +47,7 @@ public void GettingId__ReturnsTweetId() { TweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(_tweet.Id, test.Id); + test.Id.Should().Equal(_tweet.Id); } [Fact] @@ -60,7 +62,7 @@ public void GettingInReplyToTweet_WhenTheTweetIsAReply_IsALoadingTweetScreen() null); test.Initialize(); - Assert.Same(mockScreen, test.InReplyToTweet); + test.InReplyToTweet.Should().Be.SameAs(mockScreen); } [Fact] @@ -69,7 +71,7 @@ public void GettingInReplyToTweet_WhenTheTweetIsNotAReply_IsNull() TweetScreen test = BuildDefaultTestSubject(); test.Initialize(); - Assert.Null(test.InReplyToTweet); + test.InReplyToTweet.Should().Be.Null(); } [Fact] @@ -87,7 +89,7 @@ public void GettingLinks_WhenTweetContainsALink_ReturnsCollectionWithOpenedLinkS null); test.Initialize(); - Assert.Contains(_linkThumbnailScreen, test.Links); + test.Links.Should().Contain.Item(_linkThumbnailScreen); } [Fact] @@ -95,7 +97,7 @@ public void GettingMarkAsReadCommand__ReturnsCommand() { TweetScreen test = BuildDefaultTestSubject(); - Assert.IsType(test.MarkAsReadCommand); + test.MarkAsReadCommand.Should().Be.OfType(); } [Fact] @@ -104,21 +106,21 @@ public void GettingMentionVisibility_WhenTweetIsAMention_ReturnsVisible() TweetScreen test = BuildDefaultTestSubject(); _tweetRating.IsMention.Returns(true); - Assert.Equal(Visibility.Visible, test.MentionVisibility); + test.MentionVisibility.Should().Equal(Visibility.Visible); } [Fact] public void GettingMentionVisibility_WhenTweetIsNotAMention_ReturnsCollapsed() { TweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(Visibility.Collapsed, test.MentionVisibility); + test.MentionVisibility.Should().Equal(Visibility.Collapsed); } [Fact] public void GettingOpacity_WhenTweetIsNotRead_ReturnsOpaque() { TweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(1.0, test.Opacity); + test.Opacity.Should().Equal(1.0); } [Fact] @@ -130,7 +132,7 @@ public void GettingOpacity_WhenTweetIsRead_ReturnsSemitransparent() test. AssertThatChangeNotificationIsRaisedBy(x => x.Opacity). When(() => _tweet.MarkAsRead()); - Assert.Equal(.5, test.Opacity); + test.Opacity.Should().Equal(0.5); } [Fact] @@ -138,7 +140,7 @@ public void GettingStatus__ReturnsTweetStatus() { TweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(_tweet.Status, test.Status); + test.Status.Should().Equal(_tweet.Status); } [Fact] @@ -146,7 +148,7 @@ public void GettingUser__ReturnsUser() { TweetScreen test = BuildDefaultTestSubject(); - Assert.Equal(_tweet.User, test.User); + test.User.Should().Be.SameAs(_tweet.User); } private TweetScreen BuildDefaultTestSubject() diff --git a/Twiddler.Tests/Services/ImageServices/TwitPicDecoderTests.cs b/Twiddler.Tests/Services/ImageServices/TwitPicDecoderTests.cs index b14dbb7..385ef77 100644 --- a/Twiddler.Tests/Services/ImageServices/TwitPicDecoderTests.cs +++ b/Twiddler.Tests/Services/ImageServices/TwitPicDecoderTests.cs @@ -4,10 +4,11 @@ using System; + using Should.Fluent; + using Twiddler.Models; using Twiddler.Services.ImageServices; - using Xunit; using Xunit.Extensions; #endregion @@ -19,7 +20,7 @@ public class TwitPicDecoderTests [InlineData("http://twitpic.com/")] public void CanGetImageLocations_GivenOtherUrl_ReturnsFalse(string url) { - Assert.False(new TwitPicDecoder().CanGetImageLocations(new Uri(url))); + new TwitPicDecoder().CanGetImageLocations(new Uri(url)).Should().Be.False(); } [Theory] @@ -27,7 +28,7 @@ public void CanGetImageLocations_GivenOtherUrl_ReturnsFalse(string url) [InlineData("http://twitpic.com/show/thumb/1e10q")] public void CanGetImageLocations_GivenTwitPicImageUrl_ReturnsTrue(string url) { - Assert.True(new TwitPicDecoder().CanGetImageLocations(new Uri(url))); + new TwitPicDecoder().CanGetImageLocations(new Uri(url)).Should().Be.True(); } [Theory] @@ -38,7 +39,7 @@ public void GetImageLocations_GivenTwitPicImageUrl_ReturnsLinkLocation(string ur { ImageLocations locations = new TwitPicDecoder().GetImageLocations(new Uri(url)); - Assert.Equal(linkUrl, locations.Link.ToString()); + locations.Link.ToString().Should().Equal(linkUrl); } [Theory] @@ -49,7 +50,7 @@ public void GetImageLocations_GivenTwitPicImageUrl_ReturnsThumbnailLocation(stri { ImageLocations locations = new TwitPicDecoder().GetImageLocations(new Uri(url)); - Assert.Equal(linkUrl, locations.Thumbnail.ToString()); + locations.Thumbnail.ToString().Should().Equal(linkUrl); } } } \ No newline at end of file diff --git a/Twiddler.Tests/Services/ImageServices/YFrogDecoderTests.cs b/Twiddler.Tests/Services/ImageServices/YFrogDecoderTests.cs index ef89478..d68b4da 100644 --- a/Twiddler.Tests/Services/ImageServices/YFrogDecoderTests.cs +++ b/Twiddler.Tests/Services/ImageServices/YFrogDecoderTests.cs @@ -4,10 +4,11 @@ using System; + using Should.Fluent; + using Twiddler.Models; using Twiddler.Services.ImageServices; - using Xunit; using Xunit.Extensions; #endregion @@ -19,7 +20,7 @@ public class YFrogDecoderTests [InlineData("http://yfrog.com/")] public void CanGetImageLocations_GivenOtherUrl_ReturnsFalse(string url) { - Assert.False(new YFrogDecoder().CanGetImageLocations(new Uri(url))); + new YFrogDecoder().CanGetImageLocations(new Uri(url)).Should().Be.False(); } [Theory] @@ -35,7 +36,7 @@ public void CanGetImageLocations_GivenOtherUrl_ReturnsFalse(string url) [InlineData("http://yfrog.eu/0u6mcz")] public void CanGetImageLocations_GivenYFrogImageUrl_ReturnsTrue(string url) { - Assert.True(new YFrogDecoder().CanGetImageLocations(new Uri(url))); + new YFrogDecoder().CanGetImageLocations(new Uri(url)).Should().Be.True(); } [Theory] @@ -43,7 +44,7 @@ public void CanGetImageLocations_GivenYFrogImageUrl_ReturnsTrue(string url) [InlineData("http://yfrog.com/0u6mcs")] public void CanGetImageLocations_GivenYFrogUrlOfOtherContentType_ReturnsFalse(string url) { - Assert.False(new YFrogDecoder().CanGetImageLocations(new Uri(url))); + new YFrogDecoder().CanGetImageLocations(new Uri(url)).Should().Be.False(); } [Theory] @@ -52,7 +53,7 @@ public void GetImageLocations_GivenYFrogImageUrl_ReturnsLinkLocation(string url, { ImageLocations locations = new YFrogDecoder().GetImageLocations(new Uri(url)); - Assert.Equal(linkUrl, locations.Link.ToString()); + locations.Link.ToString().Should().Equal(linkUrl); } [Theory] @@ -61,7 +62,7 @@ public void GetImageLocations_GivenYFrogImageUrl_ReturnsThumbnailLocation(string { ImageLocations locations = new YFrogDecoder().GetImageLocations(new Uri(url)); - Assert.Equal(linkUrl, locations.Thumbnail.ToString()); + locations.Thumbnail.ToString().Should().Equal(linkUrl); } } } \ No newline at end of file diff --git a/Twiddler.Tests/Services/LinkThumbnailScreenFactoryTests.cs b/Twiddler.Tests/Services/LinkThumbnailScreenFactoryTests.cs index bb1ea31..65d462a 100644 --- a/Twiddler.Tests/Services/LinkThumbnailScreenFactoryTests.cs +++ b/Twiddler.Tests/Services/LinkThumbnailScreenFactoryTests.cs @@ -8,6 +8,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Models; using Twiddler.Screens.Interfaces; using Twiddler.Services; @@ -37,7 +39,7 @@ public void CreateScreenForLink_GivenUrlWithRegisteredHost_ReturnsInstanceForHos { LinkThumbnailScreenFactory test = BuildDefaultTestSubject(); - Assert.Same(_imageThumbnailScreen, test.CreateScreenForLink(KnownUri)); + test.CreateScreenForLink(KnownUri).Should().Be.SameAs(_imageThumbnailScreen); } [Fact] @@ -45,7 +47,7 @@ public void CreateScreenForLink_GivenUrlWithUnregisteredHost_ReturnsNull() { LinkThumbnailScreenFactory test = BuildDefaultTestSubject(); - Assert.Null(test.CreateScreenForLink(UnknownUri)); + test.CreateScreenForLink(UnknownUri).Should().Be.Null(); } private LinkThumbnailScreenFactory BuildDefaultTestSubject() diff --git a/Twiddler.Tests/Services/MemoryTweetStoreTests.cs b/Twiddler.Tests/Services/MemoryTweetStoreTests.cs index 2643405..c400d1c 100644 --- a/Twiddler.Tests/Services/MemoryTweetStoreTests.cs +++ b/Twiddler.Tests/Services/MemoryTweetStoreTests.cs @@ -4,6 +4,8 @@ using System.Collections.Generic; + using Should.Fluent; + using Twiddler.Core.Models; using Twiddler.Services; using Twiddler.TestData; @@ -22,14 +24,14 @@ public void GetTweet_GivenAKnownTweet_ReturnsTheTweet() ITweet tweet = A.Tweet.Build(); test.Add(tweet); - Assert.Same(tweet, test.GetTweet(tweet.Id)); + test.GetTweet(tweet.Id).Should().Be.SameAs(tweet); } [Fact] public void GetTweet_GivenAnUnknownTweet_Throws() { var test = new MemoryTweetStore(); - + Assert.Throws(typeof(KeyNotFoundException), () => test.GetTweet("456")); } diff --git a/Twiddler.Tests/Services/StoreTimelineTests.cs b/Twiddler.Tests/Services/StoreTimelineTests.cs index 90d281a..3a6e838 100644 --- a/Twiddler.Tests/Services/StoreTimelineTests.cs +++ b/Twiddler.Tests/Services/StoreTimelineTests.cs @@ -70,7 +70,7 @@ public void GettingTweets_Initially_IsEmpty() { StoreTimeline test = BuildDefaultTestSubject(); - Assert.Empty(test.Tweets); + test.Tweets.Should().Be.Empty(); } [Fact] @@ -81,7 +81,7 @@ public void GettingTweets_WhenTheStoreHasInboxTweets_ContainsTweets() StoreTimeline test = BuildDefaultTestSubject(); - Assert.Contains(tweet, test.Tweets); + test.Tweets.Should().Contain.Item(tweet); } private StoreTimeline BuildDefaultTestSubject() diff --git a/Twiddler.Tests/Services/TweetRatingTests.cs b/Twiddler.Tests/Services/TweetRatingTests.cs index ded865a..a1d8335 100644 --- a/Twiddler.Tests/Services/TweetRatingTests.cs +++ b/Twiddler.Tests/Services/TweetRatingTests.cs @@ -4,6 +4,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Core.Models; using Twiddler.Core.Services; using Twiddler.Services; @@ -25,7 +27,7 @@ public void GettingIsMention_WhenTheUserIsMentioned_ReturnsTrue() _tweet = A.Tweet.Mentioning(_user.ScreenName).Build(); TweetRating test = BuildDefaultTestSubject(); - Assert.True(test.IsMention); + test.IsMention.Should().Be.True(); } [Fact] @@ -35,7 +37,7 @@ public void GettingIsMention_WhenTheUserIsNotAuthenticated_ReturnsFalse() _user = null; TweetRating test = BuildDefaultTestSubject(); - Assert.False(test.IsMention); + test.IsMention.Should().Be.False(); } [Fact] @@ -44,7 +46,7 @@ public void GettingIsMention_WhenTheUserIsNotMentioned_ReturnsFalse() _tweet = A.Tweet.Build(); TweetRating test = BuildDefaultTestSubject(); - Assert.False(test.IsMention); + test.IsMention.Should().Be.False(); } private TweetRating BuildDefaultTestSubject() diff --git a/Twiddler.TweetSharp.Tests/AuthorizeCommandTests.cs b/Twiddler.TweetSharp.Tests/AuthorizeCommandTests.cs index 7d0956b..a809a91 100644 --- a/Twiddler.TweetSharp.Tests/AuthorizeCommandTests.cs +++ b/Twiddler.TweetSharp.Tests/AuthorizeCommandTests.cs @@ -7,6 +7,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Core.Models; using Twiddler.Core.Services; @@ -36,7 +38,7 @@ public void CanExecuteChanged_WhenAuthorizationStatusChanges_IsRaised() ClientAuthorizationStatusChangesTo(AuthorizationStatus.Verifying); GC.KeepAlive(test); - Assert.True(eventRaised); + eventRaised.Should().Be.True(); } [Theory] @@ -47,7 +49,7 @@ public void CanExecute_WhenAbleToAuthorize_IsTrue(AuthorizationStatus status) ClientAuthorizationStatusChangesTo(status); - Assert.True(test.CanExecute(null)); + test.CanExecute(null).Should().Be.True(); } [Theory] @@ -61,7 +63,7 @@ public void CanExecute_WhenUnableToAuthorize_IsFalse(AuthorizationStatus status) ClientAuthorizationStatusChangesTo(status); - Assert.False(test.CanExecute(null)); + test.CanExecute(null).Should().Be.False(); } private AuthorizeCommand BuildDefaultTestSubject() diff --git a/Twiddler.TweetSharp.Tests/Twiddler.TweetSharp.Tests.csproj b/Twiddler.TweetSharp.Tests/Twiddler.TweetSharp.Tests.csproj index f91f4ae..9bf677f 100644 --- a/Twiddler.TweetSharp.Tests/Twiddler.TweetSharp.Tests.csproj +++ b/Twiddler.TweetSharp.Tests/Twiddler.TweetSharp.Tests.csproj @@ -60,6 +60,9 @@ ..\packages\TweetSharp.0.0.10\lib\4.0\Remotion.Data.Linq.dll + + ..\packages\ShouldFluent.1.1.12.0\lib\Should.Fluent.dll + diff --git a/Twiddler.TweetSharp.Tests/TwitterClientTests.cs b/Twiddler.TweetSharp.Tests/TwitterClientTests.cs index 2dee05e..2c77a9f 100644 --- a/Twiddler.TweetSharp.Tests/TwitterClientTests.cs +++ b/Twiddler.TweetSharp.Tests/TwitterClientTests.cs @@ -4,6 +4,8 @@ using NSubstitute; + using Should.Fluent; + using Twiddler.Core.Models; using Twiddler.Core.Services; using Twiddler.TestData; @@ -21,7 +23,7 @@ public void GettingAuthorization_Initially_ReturnsUnknown() Substitute.For(), x => A.User); - Assert.Equal(AuthorizationStatus.Unknown, test.AuthorizationStatus); + test.AuthorizationStatus.Should().Equal(AuthorizationStatus.Unknown); } } } \ No newline at end of file diff --git a/Twiddler.TweetSharp.Tests/packages.config b/Twiddler.TweetSharp.Tests/packages.config index 1017b3a..4d77557 100644 --- a/Twiddler.TweetSharp.Tests/packages.config +++ b/Twiddler.TweetSharp.Tests/packages.config @@ -12,4 +12,5 @@ + \ No newline at end of file diff --git a/Twiddler.TwitterStore.Tests/CredentialsDocumentStoreTests.cs b/Twiddler.TwitterStore.Tests/CredentialsDocumentStoreTests.cs index 27a52d5..2e5c774 100644 --- a/Twiddler.TwitterStore.Tests/CredentialsDocumentStoreTests.cs +++ b/Twiddler.TwitterStore.Tests/CredentialsDocumentStoreTests.cs @@ -6,6 +6,8 @@ using Raven.Client; + using Should.Fluent; + using Twiddler.Core.Models; using Twiddler.TwitterStore.Interfaces; @@ -37,7 +39,7 @@ public void Load_WhenTheCredentialsAreInTheStore_ReturnsTheCredentials() _documentSession.Load(id).Returns(credentials); - Assert.Same(credentials, test.Load(id)); + test.Load(id).Should().Be.SameAs(credentials); } [Fact] @@ -49,7 +51,7 @@ public void Load_WhenTheCredentialsAreNotFoundInTheStore_ReturnsNewCredentials() _documentSession.Load(id).Returns((AccessToken)null); - Assert.NotNull(test.Load(id)); + test.Load(id).Should().Not.Be.Null(); } private AccessTokenDocumentStore BuildDefaultTestSubject() diff --git a/Twiddler.TwitterStore.Tests/TweetTests.cs b/Twiddler.TwitterStore.Tests/TweetTests.cs index b582622..8c15288 100644 --- a/Twiddler.TwitterStore.Tests/TweetTests.cs +++ b/Twiddler.TwitterStore.Tests/TweetTests.cs @@ -4,6 +4,8 @@ using Caliburn.Testability.Extensions; + using Should.Fluent; + using Twiddler.TwitterStore.Models; using Xunit; @@ -26,7 +28,7 @@ public void Archive__UpdatesIsArchived() public void GettingIsRead_Initially_IsFalse() { var test = new Tweet(); - Assert.False(test.IsRead); + test.IsRead.Should().Be.False(); } [Fact] diff --git a/Twiddler.TwitterStore.Tests/Twiddler.TwitterStore.Tests.csproj b/Twiddler.TwitterStore.Tests/Twiddler.TwitterStore.Tests.csproj index df96a27..ca21c03 100644 --- a/Twiddler.TwitterStore.Tests/Twiddler.TwitterStore.Tests.csproj +++ b/Twiddler.TwitterStore.Tests/Twiddler.TwitterStore.Tests.csproj @@ -44,6 +44,9 @@ False ..\packages\reactiveui-core.2.1.0.1\lib\Net4\ReactiveUI.dll + + ..\packages\ShouldFluent.1.1.12.0\lib\Should.Fluent.dll + diff --git a/Twiddler.TwitterStore.Tests/TwitterDocumentStoreTests.cs b/Twiddler.TwitterStore.Tests/TwitterDocumentStoreTests.cs index 817b70d..404c648 100644 --- a/Twiddler.TwitterStore.Tests/TwitterDocumentStoreTests.cs +++ b/Twiddler.TwitterStore.Tests/TwitterDocumentStoreTests.cs @@ -6,6 +6,8 @@ using Raven.Client; + using Should.Fluent; + using Twiddler.TwitterStore.Interfaces; using Twiddler.TwitterStore.Models; @@ -50,7 +52,7 @@ public void GetTweet_GivenTweetThatIsInTheStore_ReturnsTheTweet() _documentSession.Load(id).Returns(tweet); - Assert.Same(tweet, test.GetTweet(id)); + test.GetTweet(id).Should().Be.SameAs(tweet); } } } \ No newline at end of file diff --git a/Twiddler.TwitterStore.Tests/packages.config b/Twiddler.TwitterStore.Tests/packages.config index 375d113..6c867ed 100644 --- a/Twiddler.TwitterStore.Tests/packages.config +++ b/Twiddler.TwitterStore.Tests/packages.config @@ -6,4 +6,5 @@ + \ No newline at end of file