From 951a9ade00d7c9105f03608cb598450d706b826f Mon Sep 17 00:00:00 2001 From: Stepan Goremykin Date: Sat, 18 Mar 2023 23:05:46 +0100 Subject: [PATCH] Update FluentAssertions --- .../DiskTests/DirectoryLookupServiceFixture.cs | 4 ++-- .../DiskTests/DiskTransferServiceFixture.cs | 13 ++++++------- .../TPLTests/RateLimitServiceFixture.cs | 2 +- .../Datastore/BasicRepositoryFixture.cs | 3 ++- .../Migration/070_delay_profileFixture.cs | 5 ++++- ...1_add_ultrahd_quality_in_profilesFixture.cs | 4 ++-- ...17_add_webrip_qualites_in_profileFixture.cs | 18 +++++++++--------- ...22_add_remux_qualities_in_profileFixture.cs | 12 ++++++------ .../ProviderStatusServiceFixture.cs | 7 ++++--- .../Sonarr.Test.Common.csproj | 2 +- 10 files changed, 37 insertions(+), 33 deletions(-) diff --git a/src/NzbDrone.Common.Test/DiskTests/DirectoryLookupServiceFixture.cs b/src/NzbDrone.Common.Test/DiskTests/DirectoryLookupServiceFixture.cs index 78aa99f7d..009037f49 100644 --- a/src/NzbDrone.Common.Test/DiskTests/DirectoryLookupServiceFixture.cs +++ b/src/NzbDrone.Common.Test/DiskTests/DirectoryLookupServiceFixture.cs @@ -49,7 +49,7 @@ namespace NzbDrone.Common.Test.DiskTests .Setup(s => s.GetDirectoryInfos(It.IsAny())) .Returns(_folders); - Subject.LookupContents(root, false, false).Directories.Should().NotContain(Path.Combine(root, RECYCLING_BIN)); + Subject.LookupContents(root, false, false).Directories.Should().NotContain(dir => dir.Path == Path.Combine(root, RECYCLING_BIN)); } [Test] @@ -62,7 +62,7 @@ namespace NzbDrone.Common.Test.DiskTests .Setup(s => s.GetDirectoryInfos(It.IsAny())) .Returns(_folders); - Subject.LookupContents(root, false, false).Directories.Should().NotContain(Path.Combine(root, SYSTEM_VOLUME_INFORMATION)); + Subject.LookupContents(root, false, false).Directories.Should().NotContain(dir => dir.Path == Path.Combine(root, SYSTEM_VOLUME_INFORMATION)); } [Test] diff --git a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs index 3db00384f..93607c665 100644 --- a/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs +++ b/src/NzbDrone.Common.Test/DiskTests/DiskTransferServiceFixture.cs @@ -1,4 +1,3 @@ -using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -584,7 +583,7 @@ namespace NzbDrone.Common.Test.DiskTests var count = Subject.MirrorFolder(source.FullName, destination.FullName); - count.Should().Equals(0); + count.Should().Be(0); destination.GetFileSystemInfos().Should().BeEmpty(); } @@ -604,7 +603,7 @@ namespace NzbDrone.Common.Test.DiskTests var count = Subject.MirrorFolder(source.FullName, destination.FullName); - count.Should().Equals(0); + count.Should().Be(0); destination.GetFileSystemInfos().Should().HaveCount(1); } @@ -621,7 +620,7 @@ namespace NzbDrone.Common.Test.DiskTests var count = Subject.MirrorFolder(source.FullName, destination.FullName); - count.Should().Equals(3); + count.Should().Be(3); VerifyCopyFolder(original.FullName, destination.FullName); } @@ -638,7 +637,7 @@ namespace NzbDrone.Common.Test.DiskTests var count = Subject.MirrorFolder(source.FullName, destination.FullName); - count.Should().Equals(3); + count.Should().Be(3); File.Exists(Path.Combine(destination.FullName, _nfsFile)).Should().BeFalse(); } @@ -658,7 +657,7 @@ namespace NzbDrone.Common.Test.DiskTests var count = Subject.MirrorFolder(source.FullName, destination.FullName); - count.Should().Equals(0); + count.Should().Be(0); VerifyCopyFolder(original.FullName, destination.FullName); } @@ -675,7 +674,7 @@ namespace NzbDrone.Common.Test.DiskTests var count = Subject.MirrorFolder(source.FullName + Path.DirectorySeparatorChar, destination.FullName); - count.Should().Equals(3); + count.Should().Be(3); VerifyCopyFolder(original.FullName, destination.FullName); } diff --git a/src/NzbDrone.Common.Test/TPLTests/RateLimitServiceFixture.cs b/src/NzbDrone.Common.Test/TPLTests/RateLimitServiceFixture.cs index a92eed1f1..1c6b5cb3d 100644 --- a/src/NzbDrone.Common.Test/TPLTests/RateLimitServiceFixture.cs +++ b/src/NzbDrone.Common.Test/TPLTests/RateLimitServiceFixture.cs @@ -120,7 +120,7 @@ namespace NzbDrone.Common.Test.TPLTests Subject.WaitAndPulse("me", "sub", TimeSpan.FromMilliseconds(100)); - (GetRateLimitStore()["me"] - _epoch).Should().BeCloseTo(TimeSpan.FromMilliseconds(200)); + (GetRateLimitStore()["me"] - _epoch).Should().BeCloseTo(TimeSpan.FromMilliseconds(200), TimeSpan.FromMilliseconds(20)); } } } diff --git a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs index 92d345580..91d72e227 100644 --- a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs @@ -13,6 +13,7 @@ namespace NzbDrone.Core.Test.Datastore [TestFixture] public class BasicRepositoryFixture : DbTest, ScheduledTask> { + private readonly TimeSpan _dateTimePrecision = TimeSpan.FromMilliseconds(20); private List _basicList; [SetUp] @@ -20,7 +21,7 @@ namespace NzbDrone.Core.Test.Datastore { AssertionOptions.AssertEquivalencyUsing(options => { - options.Using(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation.ToUniversalTime())).WhenTypeIs(); + options.Using(ctx => ctx.Subject.Should().BeCloseTo(ctx.Expectation.ToUniversalTime(), _dateTimePrecision)).WhenTypeIs(); return options; }); diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/070_delay_profileFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/070_delay_profileFixture.cs index be2b07b66..bdc199f1f 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/070_delay_profileFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/070_delay_profileFixture.cs @@ -96,7 +96,10 @@ namespace NzbDrone.Core.Test.Datastore.Migration var series = db.Query("SELECT Tags FROM Series"); series.Should().HaveCount(1); - series.First().Tags.Should().BeEquivalentTo(tag.Id); + + var actualTags = series.First().Tags; + var expectedTags = Enumerable.Repeat(tag.Id, actualTags.Count); + actualTags.Should().Equal(expectedTags); } } } diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/101_add_ultrahd_quality_in_profilesFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/101_add_ultrahd_quality_in_profilesFixture.cs index 6062e562c..d4c97f327 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/101_add_ultrahd_quality_in_profilesFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/101_add_ultrahd_quality_in_profilesFixture.cs @@ -28,8 +28,8 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = profiles.First().Items; items.Should().HaveCount(4); - items.Select(v => v.Quality).Should().BeEquivalentTo(1, 16, 18, 19); - items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, false, false); + items.Select(v => v.Quality).Should().Equal(1, 16, 18, 19); + items.Select(v => v.Allowed).Should().Equal(true, false, false, false); } } } diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/117_add_webrip_qualites_in_profileFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/117_add_webrip_qualites_in_profileFixture.cs index 31ad9a7ae..78c976e1a 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/117_add_webrip_qualites_in_profileFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/117_add_webrip_qualites_in_profileFixture.cs @@ -33,9 +33,9 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = profiles.First().Items; items.Should().HaveCount(6); - items.Select(v => v.Quality).Should().BeEquivalentTo(1, null, null, null, null, null); - items.Select(v => v.Items.Count).Should().BeEquivalentTo(0, 2, 2, 2, 2, 2); - items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, false, false, false, false); + items.Select(v => v.Quality).Should().Equal(1, null, null, null, null, null); + items.Select(v => v.Items.Count).Should().Equal(0, 2, 2, 2, 2, 2); + items.Select(v => v.Allowed).Should().Equal(true, false, false, false, false, false); } [Test] @@ -56,9 +56,9 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = profiles.First().Items; items.Should().HaveCount(6); - items.Select(v => v.Quality).Should().BeEquivalentTo(1, null, null, null, null, null); - items.Select(v => v.Items.Count).Should().BeEquivalentTo(0, 2, 2, 2, 2, 2); - items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, false, false, false, false); + items.Select(v => v.Quality).Should().Equal(1, null, null, null, null, null); + items.Select(v => v.Items.Count).Should().Equal(0, 2, 2, 2, 2, 2); + items.Select(v => v.Allowed).Should().Equal(true, false, false, false, false, false); } [Test] @@ -79,9 +79,9 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = profiles.First().Items; items.Should().HaveCount(6); - items.Select(v => v.Quality).Should().BeEquivalentTo(1, null, null, null, null, null); - items.Select(v => v.Items.Count).Should().BeEquivalentTo(0, 2, 2, 2, 2, 2); - items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, false, false, false, false); + items.Select(v => v.Quality).Should().Equal(1, null, null, null, null, null); + items.Select(v => v.Items.Count).Should().Equal(0, 2, 2, 2, 2, 2); + items.Select(v => v.Allowed).Should().Equal(true, false, false, false, false, false); } [Test] diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs index dbee94cda..74ca3960e 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/122_add_remux_qualities_in_profileFixture.cs @@ -27,9 +27,9 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = profiles.First().Items; items.Should().HaveCount(4); - items.Select(v => v.Quality).Should().BeEquivalentTo(7, 20, 19, 21); - items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, true, false); - items.Select(v => v.Name).Should().BeEquivalentTo(null, null, null, (string)null); + items.Select(v => v.Quality).Should().Equal(7, 20, 19, 21); + items.Select(v => v.Allowed).Should().Equal(true, false, true, false); + items.Select(v => v.Name).Should().Equal(null, null, null, null); } [Test] @@ -50,9 +50,9 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = profiles.First().Items; items.Should().HaveCount(4); - items.Select(v => v.Quality).Should().BeEquivalentTo(null, 20, 19, 21); - items.Select(v => v.Allowed).Should().BeEquivalentTo(true, false, true, false); - items.Select(v => v.Name).Should().BeEquivalentTo("Why?!", null, null, null); + items.Select(v => v.Quality).Should().Equal(null, 20, 19, 21); + items.Select(v => v.Allowed).Should().Equal(true, false, true, false); + items.Select(v => v.Name).Should().Equal("Why?!", null, null, null); } } } diff --git a/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderStatusServiceFixture.cs b/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderStatusServiceFixture.cs index f9c0d4325..569544e86 100644 --- a/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderStatusServiceFixture.cs +++ b/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderStatusServiceFixture.cs @@ -34,6 +34,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests public class ProviderStatusServiceFixture : CoreTest { + private readonly TimeSpan _disabledTillPrecision = TimeSpan.FromMilliseconds(500); private DateTime _epoch; [SetUp] @@ -90,7 +91,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests var status = Subject.GetBlockedProviders().FirstOrDefault(); status.Should().NotBeNull(); status.DisabledTill.Should().HaveValue(); - status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500); + status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), _disabledTillPrecision); } [Test] @@ -133,7 +134,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests var status = Subject.GetBlockedProviders().FirstOrDefault(); status.Should().NotBeNull(); status.DisabledTill.Should().HaveValue(); - status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(15), 500); + status.DisabledTill.Value.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(15), _disabledTillPrecision); } [Test] @@ -160,7 +161,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests status.Should().NotBeNull(); origStatus.EscalationLevel.Should().Be(3); - status.DisabledTill.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), 500); + status.DisabledTill.Should().BeCloseTo(_epoch + TimeSpan.FromMinutes(5), _disabledTillPrecision); } } } diff --git a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj index 88aca7792..0fbe39105 100644 --- a/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Sonarr.Test.Common.csproj @@ -3,7 +3,7 @@ net6.0 - +