diff --git a/Directory.Packages.props b/Directory.Packages.props index 8d8ab4226..f02e65613 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -29,7 +29,6 @@ - diff --git a/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddBillingActivity.cs b/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddBillingActivity.cs index c4fe358c0..6458beee1 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddBillingActivity.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddBillingActivity.cs @@ -1,8 +1,7 @@ using System; using DevBetterWeb.Core.Entities; using DevBetterWeb.Core.Enums; -using FluentAssertions; -using FluentAssertions.Execution; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Entities.MemberTests; @@ -21,13 +20,10 @@ public void AddsBillingActivityGivenRequiredParameters() var billingActivity = member.BillingActivities[0]; - using (new AssertionScope()) - { - billingActivity.Details.SubscriptionPlanName.Should().Be(subscriptionPlanName); - billingActivity.Details.ActionVerbPastTense.Should().Be(actionVerb); - billingActivity.Details.BillingPeriod.Should().Be(billingPeriod); - billingActivity.Details.MemberName.Should().Be(member.UserFullName()); - } + billingActivity.Details.SubscriptionPlanName.ShouldBe(subscriptionPlanName); + billingActivity.Details.ActionVerbPastTense.ShouldBe(actionVerb); + billingActivity.Details.BillingPeriod.ShouldBe(billingPeriod); + billingActivity.Details.MemberName.ShouldBe(member.UserFullName()); } [Fact] @@ -44,10 +40,7 @@ public void AddsBillingActivityGivenMessageAndAmount() var billingActivity = member.BillingActivities[0]; - using (new AssertionScope()) - { - billingActivity.Details.BillingPeriod.Should().Be(billingPeriod); - billingActivity.Details.Amount.Should().Be(amount); - } + billingActivity.Details.BillingPeriod.ShouldBe(billingPeriod); + billingActivity.Details.Amount.ShouldBe(amount); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddFavoriteArchiveVideo.cs b/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddFavoriteArchiveVideo.cs index 213d10e91..2e663a5b5 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddFavoriteArchiveVideo.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberAddFavoriteArchiveVideo.cs @@ -1,7 +1,6 @@ using System.Linq; using DevBetterWeb.Core.Entities; -using FluentAssertions; -using FluentAssertions.Execution; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Entities.MemberTests; @@ -22,11 +21,8 @@ public void ShouldAddFavoriteArchiveVideoGivenArchiveVideo() member.AddFavoriteArchiveVideo(archiveVideo); - using (new AssertionScope()) - { - member.FavoriteArchiveVideos.Single().ArchiveVideoId.Should().Be(_validArchiveVideoId); - member.FavoriteArchiveVideos.Single().MemberId.Should().Be(member.Id); - } + member.FavoriteArchiveVideos.Single().ArchiveVideoId.ShouldBe(_validArchiveVideoId); + member.FavoriteArchiveVideos.Single().MemberId.ShouldBe(member.Id); } [Fact] @@ -42,6 +38,6 @@ public void ShouldDoNothingGivenDuplicateArchiveVideo() member.AddFavoriteArchiveVideo(archiveVideo); member.AddFavoriteArchiveVideo(archiveVideo); - member.FavoriteArchiveVideos.Count().Should().Be(1); + member.FavoriteArchiveVideos.Count().ShouldBe(1); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberRemoveFavoriteArchiveVideo.cs b/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberRemoveFavoriteArchiveVideo.cs index 5557178d4..c767d06a1 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberRemoveFavoriteArchiveVideo.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Entities/MemberTests/MemberRemoveFavoriteArchiveVideo.cs @@ -1,6 +1,6 @@ using System.Linq; using DevBetterWeb.Core.Entities; -using FluentAssertions; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Entities.MemberTests; @@ -26,7 +26,7 @@ public void ShouldDoNothingGivenFavoriteArchiveVideoNotInFavoriteArchiveVideos() }; member.RemoveFavoriteArchiveVideo(nonexistingArchiveVideo); - member.FavoriteArchiveVideos.Count().Should().Be(expectedCount); + member.FavoriteArchiveVideos.Count().ShouldBe(expectedCount); } [Fact] @@ -39,8 +39,8 @@ public void ShouldRemoveFavoriteArchiveVideoGivenExistingFavoriteArchiveVideo() }; member.AddFavoriteArchiveVideo(archiveVideo); - member.RemoveFavoriteArchiveVideo(archiveVideo); + member.RemoveFavoriteArchiveVideo(archiveVideo); - member.FavoriteArchiveVideos.Should().BeEmpty(); + member.FavoriteArchiveVideos.ShouldBeEmpty(); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/Events/BillingActivityCreatedEventConstructor.cs b/tests/DevBetterWeb.UnitTests/Core/Events/BillingActivityCreatedEventConstructor.cs index 331801e41..972581640 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Events/BillingActivityCreatedEventConstructor.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Events/BillingActivityCreatedEventConstructor.cs @@ -4,7 +4,7 @@ using DevBetterWeb.Core.Events; using DevBetterWeb.Core.ValueObjects; using DevBetterWeb.UnitTests.Core.Entities; -using FluentAssertions; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Events; @@ -28,9 +28,9 @@ public void ShouldSetValues() { var sut = new BillingActivityCreatedEvent(_billingActivity, _member); - sut.DateOccurred.Should().NotBe(default); - sut.Member.Should().Be(_member); - sut.BillingActivity.Should().Be(_billingActivity); + sut.DateOccurred.ShouldNotBe(default); + sut.Member.ShouldBe(_member); + sut.BillingActivity.ShouldBe(_billingActivity); } [Fact] @@ -38,7 +38,7 @@ public void ShouldThrowExceptionWhenBillingActivityIsNull() { var action = () => new BillingActivityCreatedEvent(null!, _member); - action.Should().Throw(); + action.ShouldThrow(); } [Fact] @@ -46,6 +46,6 @@ public void ShouldThrowExceptionWhenMemberIsNull() { var action = () => new BillingActivityCreatedEvent(_billingActivity, null!); - action.Should().Throw(); + action.ShouldThrow(); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionAddedEventConstructor.cs b/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionAddedEventConstructor.cs index 47101f821..0bcc71b89 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionAddedEventConstructor.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionAddedEventConstructor.cs @@ -2,7 +2,7 @@ using DevBetterWeb.Core.Entities; using DevBetterWeb.Core.Events; using DevBetterWeb.UnitTests.Core.Entities; -using FluentAssertions; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Events; @@ -17,8 +17,8 @@ public void ShouldSetValues() { var sut = new SubscriptionAddedEvent(_member, _memberSubscription); - sut.Member.Should().Be(_member); - sut.MemberSubscription.Should().Be(_memberSubscription); + sut.Member.ShouldBe(_member); + sut.MemberSubscription.ShouldBe(_memberSubscription); } [Fact] @@ -26,7 +26,7 @@ public void ShouldThrowExceptionWhenMemberIsNull() { var action = () => new SubscriptionAddedEvent(null!, _memberSubscription); - action.Should().Throw(); + action.ShouldThrow(); } [Fact] @@ -34,6 +34,6 @@ public void ShouldThrowExceptionWhenMemberSubscriptionIsNull() { var action = () => new SubscriptionAddedEvent(_member, null!); - action.Should().Throw(); + action.ShouldThrow(); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionUpdatedEventConstructor.cs b/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionUpdatedEventConstructor.cs index 9d4d1186a..04aba1371 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionUpdatedEventConstructor.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Events/SubscriptionUpdatedEventConstructor.cs @@ -2,7 +2,7 @@ using DevBetterWeb.Core.Entities; using DevBetterWeb.Core.Events; using DevBetterWeb.UnitTests.Core.Entities; -using FluentAssertions; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Events; @@ -17,8 +17,8 @@ public void ShouldSetValues() { var sut = new SubscriptionUpdatedEvent(_member, _memberSubscription); - sut.Member.Should().Be(_member); - sut.MemberSubscription.Should().Be(_memberSubscription); + sut.Member.ShouldBe(_member); + sut.MemberSubscription.ShouldBe(_memberSubscription); } [Fact] @@ -26,7 +26,7 @@ public void ShouldThrowExceptionWhenMemberIsNull() { var action = () => new SubscriptionUpdatedEvent(null!, _memberSubscription); - action.Should().Throw(); + action.ShouldThrow(); } [Fact] @@ -34,6 +34,6 @@ public void ShouldThrowExceptionWhenMemberSubscriptionIsNull() { var action = () => new SubscriptionUpdatedEvent(_member, null!); - action.Should().Throw(); + action.ShouldThrow(); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/Specs/ArchiveVideoByPageSpecEvaluate.cs b/tests/DevBetterWeb.UnitTests/Core/Specs/ArchiveVideoByPageSpecEvaluate.cs index c24422956..433191aa1 100644 --- a/tests/DevBetterWeb.UnitTests/Core/Specs/ArchiveVideoByPageSpecEvaluate.cs +++ b/tests/DevBetterWeb.UnitTests/Core/Specs/ArchiveVideoByPageSpecEvaluate.cs @@ -3,7 +3,7 @@ using System.Linq; using DevBetterWeb.Core.Entities; using DevBetterWeb.Core.Specs; -using FluentAssertions; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.Specs; @@ -44,7 +44,7 @@ public void ReturnsUnfilteredListGivenNullSearchExpression() var result = sut.Evaluate(_archiveVideos); - result.Should().HaveCount(_archiveVideos.Count()); + result.Count().ShouldBe(_archiveVideos.Count()); } [Theory] @@ -61,7 +61,7 @@ public void ReturnsFilteredListGivenSearchExpression(string search, int expected var result = sut.Evaluate(_archiveVideos); - result.Should().HaveCount(expectedCount); + result.Count().ShouldBe(expectedCount); } [Theory] @@ -80,7 +80,7 @@ public void ReturnsFilteredListGivenSkipExpression(int skip, int expectedCount) var result = sut.Evaluate(_archiveVideos); - result.Should().HaveCount(expectedCount); + result.Count().ShouldBe(expectedCount); } [Theory] @@ -99,6 +99,6 @@ public void ReturnsFilteredListGivenSizeExpression(int size, int expectedCount) var result = sut.Evaluate(_archiveVideos); - result.Should().HaveCount(expectedCount); + result.Count().ShouldBe(expectedCount); } } diff --git a/tests/DevBetterWeb.UnitTests/Core/ValueObjects/MemberFavoriteArchiveVideoConstructor.cs b/tests/DevBetterWeb.UnitTests/Core/ValueObjects/MemberFavoriteArchiveVideoConstructor.cs index fbc03aa0d..1617ca577 100644 --- a/tests/DevBetterWeb.UnitTests/Core/ValueObjects/MemberFavoriteArchiveVideoConstructor.cs +++ b/tests/DevBetterWeb.UnitTests/Core/ValueObjects/MemberFavoriteArchiveVideoConstructor.cs @@ -1,6 +1,5 @@ using DevBetterWeb.Core.ValueObjects; -using FluentAssertions; -using FluentAssertions.Execution; +using Shouldly; using Xunit; namespace DevBetterWeb.UnitTests.Core.ValueObjects; @@ -15,10 +14,7 @@ public void SetValuesGivenMemberIdAndArchiveVideoId() { var memberFavoriteArchiveVideo = new MemberFavoriteArchiveVideo(_validMemberId, _validArchiveVideoId); - using (new AssertionScope()) - { - memberFavoriteArchiveVideo.ArchiveVideoId.Should().Be(_validArchiveVideoId); - memberFavoriteArchiveVideo.MemberId.Should().Be(_validMemberId); - } + memberFavoriteArchiveVideo.ArchiveVideoId.ShouldBe(_validArchiveVideoId); + memberFavoriteArchiveVideo.MemberId.ShouldBe(_validMemberId); } } diff --git a/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj b/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj index 3a66976f6..a61b30cfb 100644 --- a/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj +++ b/tests/DevBetterWeb.UnitTests/DevBetterWeb.UnitTests.csproj @@ -5,10 +5,10 @@ false - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/DevBetterWeb.UnitTests/Infrastructure/Services/JsonParserServiceTests.cs b/tests/DevBetterWeb.UnitTests/Infrastructure/Services/JsonParserServiceTests.cs index 90ce2dec2..85e18f047 100644 --- a/tests/DevBetterWeb.UnitTests/Infrastructure/Services/JsonParserServiceTests.cs +++ b/tests/DevBetterWeb.UnitTests/Infrastructure/Services/JsonParserServiceTests.cs @@ -3,8 +3,8 @@ using DevBetterWeb.Infrastructure.Services; using Microsoft.Extensions.Logging; using NSubstitute; +using Shouldly; using Xunit; -using FluentAssertions; namespace DevBetterWeb.UnitTests.Infrastructure.Services; @@ -34,7 +34,7 @@ public void Parse_ValidJson_WorksAsExpected() var actualResult = this._jsonParserService.Parse(validJson); - expectedResult.Should().BeEquivalentTo(actualResult, opt => opt.ComparingByMembers()); + actualResult.RootElement.GetProperty("Name").GetString().ShouldBeEquivalentTo(expectedResult.RootElement.GetProperty("Name").GetString()); } [Fact] diff --git a/tests/DevBetterWeb.UnitTests/Web/Services/VideoDetailsServiceTests.cs b/tests/DevBetterWeb.UnitTests/Web/Services/VideoDetailsServiceTests.cs index 9f7410301..e24e43bb2 100644 --- a/tests/DevBetterWeb.UnitTests/Web/Services/VideoDetailsServiceTests.cs +++ b/tests/DevBetterWeb.UnitTests/Web/Services/VideoDetailsServiceTests.cs @@ -1,5 +1,4 @@ using System.Collections.Generic; -using FluentAssertions; using Flurl.Http.Testing; using NSubstitute; using Xunit; @@ -7,6 +6,7 @@ using DevBetterWeb.Web.Services; using NimblePros.Vimeo.Models; using System.Threading.Tasks; +using Shouldly; namespace DevBetterWeb.UnitTests.Web.Services; @@ -24,7 +24,7 @@ public async Task GetTranscript_Returns_Empty_String_When_No_TextTracks() var result = await videoDetailsService.GetTranscriptAsync(textTracks, "https://it-does-not-matter-for-this-test.com"); - result.Should().BeEmpty(); + result.ShouldBeEmpty(); } [Fact] @@ -38,6 +38,6 @@ public async Task GetTranscript_Returns_Empty_String_When_TextTrackLink_Is_Inval var result = await videoDetailsService.GetTranscriptAsync(textTracks, "https://it-does-not-matter-for-this-test.com"); - result.Should().BeEmpty(); + result.ShouldBeEmpty(); } } diff --git a/tests/DevBetterWeb.UnitTests/Web/Services/WebVTTParsingServiceTests.cs b/tests/DevBetterWeb.UnitTests/Web/Services/WebVTTParsingServiceTests.cs index ebbe72c10..40c4de601 100644 --- a/tests/DevBetterWeb.UnitTests/Web/Services/WebVTTParsingServiceTests.cs +++ b/tests/DevBetterWeb.UnitTests/Web/Services/WebVTTParsingServiceTests.cs @@ -1,6 +1,6 @@ using Xunit; -using FluentAssertions; using DevBetterWeb.Web.Services; +using Shouldly; namespace DevBetterWeb.UnitTests.Web.Services; @@ -37,6 +37,6 @@ get people invited. var actual = new WebVTTParsingService().Parse(vtt, "https://devbetter.com/Videos/Details/1234"); - actual.Should().Be(expected); + actual.ShouldBe(expected); } }