From 041e28fbb971b318eac61236a4ee23b22f3ba3e2 Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 16 Sep 2019 18:01:28 +0100 Subject: [PATCH] New: FluentAssertions to 5.9.0 --- .../Http/HttpHeaderFixture.cs | 2 +- .../Datastore/BasicRepositoryFixture.cs | 2 +- .../Datastore/DatabaseRelationshipFixture.cs | 2 +- ..._add_artistmetadataid_constraintFixture.cs | 2 +- .../TorrentRssParserFactoryFixture.cs | 2 +- .../TorrentRssSettingsDetectorFixture.cs | 22 ++++----- .../Identification/DistanceFixture.cs | 48 +++++++++---------- .../Identification/GetCandidatesFixture.cs | 6 +-- .../IdentificationServiceFixture.cs | 2 +- .../TrackGroupingServiceFixture.cs | 2 +- .../Identification/TrackMappingFixture.cs | 12 ++--- .../ArtistRepositoryFixture.cs | 2 +- .../ProviderBaseFixture.cs | 2 +- .../JsonTests/JsonFixture.cs | 2 +- .../Lidarr.Test.Common.csproj | 2 +- 15 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs b/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs index 8abdcf6e8..e0a22072e 100644 --- a/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs +++ b/src/NzbDrone.Common.Test/Http/HttpHeaderFixture.cs @@ -35,7 +35,7 @@ namespace NzbDrone.Common.Test.Http var httpheader = new HttpHeader(headers); Action action = () => httpheader.GetEncodingFromContentType(); - action.ShouldThrow(); + action.Should().Throw(); } [Test] diff --git a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs index 1a1a900c6..e4775e037 100644 --- a/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/BasicRepositoryFixture.cs @@ -64,7 +64,7 @@ namespace NzbDrone.Core.Test.Datastore Subject.Insert(_basicType); var storeObject = Subject.Get(_basicType.Id); - storeObject.ShouldBeEquivalentTo(_basicType, o=>o.IncludingAllRuntimeProperties()); + storeObject.Should().BeEquivalentTo(_basicType, o=>o.IncludingAllRuntimeProperties()); } [Test] diff --git a/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs b/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs index 58bc8cc89..78a439466 100644 --- a/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/DatabaseRelationshipFixture.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Test.Datastore var loadedAlbum = Db.Single().Album.Value; loadedAlbum.Should().NotBeNull(); - loadedAlbum.ShouldBeEquivalentTo(album, + loadedAlbum.Should().BeEquivalentTo(album, options => options .IncludingAllRuntimeProperties() .Excluding(c => c.Artist) diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/031_add_artistmetadataid_constraintFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/031_add_artistmetadataid_constraintFixture.cs index cb4943710..df031267a 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/031_add_artistmetadataid_constraintFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/031_add_artistmetadataid_constraintFixture.cs @@ -45,7 +45,7 @@ namespace NzbDrone.Core.Test.Datastore.Migration { var artists = db.Query("SELECT Artists.* from Artists"); - artists.Select(x => x["Id"]).ShouldBeEquivalentTo(ids); + artists.Select(x => x["Id"]).Should().BeEquivalentTo(ids); var duplicates = artists.GroupBy(x => x["ArtistMetadataId"]) .Where(x => x.Count() > 1); diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs index 2e8e9aace..0ed86b3c1 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssParserFactoryFixture.cs @@ -118,7 +118,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var detection2 = Subject.GetParser(_indexerSettings1); - detection1.ShouldBeEquivalentTo(detection2); + detection1.Should().BeEquivalentTo(detection2); VerifyDetectionCount(1); } diff --git a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs index 409da6bd0..a25cae5f7 100644 --- a/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs +++ b/src/NzbDrone.Core.Test/IndexerTests/TorrentRssIndexerTests/TorrentRssSettingsDetectorFixture.cs @@ -37,7 +37,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = true, UseEnclosureUrl = false, @@ -55,7 +55,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = false, @@ -73,7 +73,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = false, @@ -93,7 +93,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = true, @@ -111,7 +111,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = true, @@ -129,7 +129,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = false, @@ -149,7 +149,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = true, @@ -169,7 +169,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = true, @@ -189,7 +189,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = true, @@ -209,7 +209,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = false, @@ -242,7 +242,7 @@ namespace NzbDrone.Core.Test.IndexerTests.TorrentRssIndexerTests var settings = Subject.Detect(_indexerSettings); - settings.ShouldBeEquivalentTo(new TorrentRssIndexerParserSettings + settings.Should().BeEquivalentTo(new TorrentRssIndexerParserSettings { UseEZTVFormat = false, UseEnclosureUrl = true, diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/DistanceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/DistanceFixture.cs index 07a50bdca..4b1040083 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/DistanceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/DistanceFixture.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.Add("add", 1.0); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"add", new List { 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"add", new List { 1.0 }}} ); } [Test] @@ -22,13 +22,13 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddEquality("equality", "ghi", new List { "abc", "def", "ghi" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"equality", new List { 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"equality", new List { 0.0 }}} ); dist.AddEquality("equality", "xyz", new List { "abc", "def", "ghi" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"equality", new List { 0.0, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"equality", new List { 0.0, 1.0 }}} ); dist.AddEquality("equality", "abc", new List { "abc", "def", "ghi" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"equality", new List { 0.0, 1.0, 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"equality", new List { 0.0, 1.0, 0.0 }}} ); } [Test] @@ -36,10 +36,10 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddBool("expr", true); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"expr", new List { 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"expr", new List { 1.0 }}} ); dist.AddBool("expr", false); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"expr", new List { 1.0, 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"expr", new List { 1.0, 0.0 }}} ); } [Test] @@ -47,16 +47,16 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddNumber("number", 1, 1); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"number", new List { 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"number", new List { 0.0 }}} ); dist.AddNumber("number", 1, 2); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"number", new List { 0.0, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"number", new List { 0.0, 1.0 }}} ); dist.AddNumber("number", 2, 1); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"number", new List { 0.0, 1.0, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"number", new List { 0.0, 1.0, 1.0 }}} ); dist.AddNumber("number", -1, 2); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"number", new List { 0.0, 1.0, 1.0, 1.0, 1.0, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"number", new List { 0.0, 1.0, 1.0, 1.0, 1.0, 1.0 }}} ); } [Test] @@ -64,13 +64,13 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddPriority("priority", "abc", new List { "abc" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0 }}} ); dist.AddPriority("priority", "def", new List { "abc", "def" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 0.5 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 0.5 }}} ); dist.AddPriority("priority", "xyz", new List { "abc", "def" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 0.5, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 0.5, 1.0 }}} ); } [Test] @@ -78,16 +78,16 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddPriority("priority", new List { "abc" }, new List { "abc" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0 }}} ); dist.AddPriority("priority", new List { "def" }, new List { "abc" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 1.0 }}} ); dist.AddPriority("priority", new List { "abc", "xyz" }, new List { "abc" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 1.0, 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 1.0, 0.0 }}} ); dist.AddPriority("priority", new List { "def", "xyz" }, new List { "abc", "def" }); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 1.0, 0.0, 0.5 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"priority", new List { 0.0, 1.0, 0.0, 0.5 }}} ); } [Test] @@ -95,16 +95,16 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddRatio("ratio", 25, 100); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25 }}} ); dist.AddRatio("ratio", 10, 5); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25, 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25, 1.0 }}} ); dist.AddRatio("ratio", -5, 5); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25, 1.0, 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25, 1.0, 0.0 }}} ); dist.AddRatio("ratio", 5, 0); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25, 1.0, 0.0, 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"ratio", new List { 0.25, 1.0, 0.0, 0.0 }}} ); } [Test] @@ -112,7 +112,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddString("string", "abcd", "bcde"); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"string", new List { 0.5 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"string", new List { 0.5 }}} ); } [Test] @@ -120,7 +120,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddString("string", string.Empty, "bcd"); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"string", new List { 1.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"string", new List { 1.0 }}} ); } [Test] @@ -128,7 +128,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification { var dist = new Distance(); dist.AddString("string", string.Empty, string.Empty); - dist.Penalties.ShouldBeEquivalentTo(new Dictionary> { {"string", new List { 0.0 }}} ); + dist.Penalties.Should().BeEquivalentTo(new Dictionary> { {"string", new List { 0.0 }}} ); } [Test] diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/GetCandidatesFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/GetCandidatesFixture.cs index c73c7ad50..b4c769152 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/GetCandidatesFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/GetCandidatesFixture.cs @@ -122,7 +122,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification var local = GivenLocalAlbumRelease(); - Subject.GetCandidatesFromFingerprint(local, null, null, null, false).ShouldBeEquivalentTo(new List()); + Subject.GetCandidatesFromFingerprint(local, null, null, null, false).Should().BeEquivalentTo(new List()); } [Test] @@ -133,7 +133,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification var localTracks = GivenLocalTracks(tracks, release); var localAlbumRelease = new LocalAlbumRelease(localTracks); - Subject.GetCandidatesFromTags(localAlbumRelease, null, null, release, false).ShouldBeEquivalentTo( + Subject.GetCandidatesFromTags(localAlbumRelease, null, null, release, false).Should().BeEquivalentTo( new List { new CandidateAlbumRelease(release) } ); } @@ -151,7 +151,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification .Setup(x => x.GetReleaseByForeignReleaseId("xxx", true)) .Returns(release); - Subject.GetCandidatesFromTags(localAlbumRelease, null, null, null, false).ShouldBeEquivalentTo( + Subject.GetCandidatesFromTags(localAlbumRelease, null, null, null, false).Should().BeEquivalentTo( new List { new CandidateAlbumRelease(release) } ); } diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs index 32ea75906..1057ff9e5 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/IdentificationServiceFixture.cs @@ -183,7 +183,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification TestLogger.Debug($"Found releases:\n{result.Where(x => x.AlbumRelease != null).Select(x => x.AlbumRelease?.ForeignReleaseId).ToJson()}"); result.Should().HaveCount(testcase.ExpectedMusicBrainzReleaseIds.Count); - result.Where(x => x.AlbumRelease != null).Select(x => x.AlbumRelease.ForeignReleaseId).ShouldBeEquivalentTo(testcase.ExpectedMusicBrainzReleaseIds); + result.Where(x => x.AlbumRelease != null).Select(x => x.AlbumRelease.ForeignReleaseId).Should().BeEquivalentTo(testcase.ExpectedMusicBrainzReleaseIds); } } } diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackGroupingServiceFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackGroupingServiceFixture.cs index 9e2bc3bf8..094e5989a 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackGroupingServiceFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackGroupingServiceFixture.cs @@ -301,7 +301,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification var output = Subject.GroupTracks(tracks); output.Count.Should().Be(100); - output.Select(x => x.LocalTracks.Count).Distinct().ShouldBeEquivalentTo(new List { 10 }); + output.Select(x => x.LocalTracks.Count).Distinct().Should().BeEquivalentTo(new List { 10 }); } [Test] diff --git a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackMappingFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackMappingFixture.cs index d7743de99..ce84b1436 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackMappingFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/TrackImport/Identification/TrackMappingFixture.cs @@ -110,7 +110,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification result.Mapping .ToDictionary(x => x.Key, y => y.Value.Item1) - .ShouldBeEquivalentTo(new Dictionary { + .Should().BeEquivalentTo(new Dictionary { {localTracks[0], tracks[0]}, {localTracks[1], tracks[2]}, {localTracks[2], tracks[1]}, @@ -135,7 +135,7 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification result.Mapping .ToDictionary(x => x.Key, y => y.Value.Item1) - .ShouldBeEquivalentTo(new Dictionary { + .Should().BeEquivalentTo(new Dictionary { {localTracks[0], tracks[0]}, {localTracks[1], tracks[1]}, {localTracks[2], tracks[2]}, @@ -156,12 +156,12 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification result.Mapping .ToDictionary(x => x.Key, y => y.Value.Item1) - .ShouldBeEquivalentTo(new Dictionary { + .Should().BeEquivalentTo(new Dictionary { {localTracks[0], tracks[0]}, {localTracks[1], tracks[2]} }); result.LocalExtra.Should().BeEmpty(); - result.MBExtra.ShouldBeEquivalentTo(new List { tracks[1] }); + result.MBExtra.Should().BeEquivalentTo(new List { tracks[1] }); } [Test] @@ -176,11 +176,11 @@ namespace NzbDrone.Core.Test.MediaFiles.TrackImport.Identification result.Mapping .ToDictionary(x => x.Key, y => y.Value.Item1) - .ShouldBeEquivalentTo(new Dictionary { + .Should().BeEquivalentTo(new Dictionary { {localTracks[0], tracks[0]}, {localTracks[2], tracks[1]} }); - result.LocalExtra.ShouldBeEquivalentTo(new List { localTracks[1] }); + result.LocalExtra.Should().BeEquivalentTo(new List { localTracks[1] }); result.MBExtra.Should().BeEmpty(); } } diff --git a/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs b/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs index b2e7c6b86..3768c1078 100644 --- a/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs +++ b/src/NzbDrone.Core.Test/MusicTests/ArtistRepositoryTests/ArtistRepositoryFixture.cs @@ -137,7 +137,7 @@ namespace NzbDrone.Core.Test.MusicTests.ArtistRepositoryTests _artistRepo.Insert(artist1); Action insertDupe = () => _artistRepo.Insert(artist2); - insertDupe.ShouldThrow(); + insertDupe.Should().Throw(); } } } diff --git a/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs b/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs index 02bbdd8b2..88a35b910 100644 --- a/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs +++ b/src/NzbDrone.Core.Test/ThingiProviderTests/ProviderBaseFixture.cs @@ -23,7 +23,7 @@ namespace NzbDrone.Core.Test.ThingiProviderTests var storedSetting = (NewznabSettings)storedProvider.Settings; - storedSetting.ShouldBeEquivalentTo(newznabSettings, o=>o.IncludingAllRuntimeProperties()); + storedSetting.Should().BeEquivalentTo(newznabSettings, o=>o.IncludingAllRuntimeProperties()); } } } diff --git a/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs b/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs index fc4d58c6d..86e0736db 100644 --- a/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs +++ b/src/NzbDrone.Libraries.Test/JsonTests/JsonFixture.cs @@ -22,7 +22,7 @@ namespace NzbDrone.Libraries.Test.JsonTests var quality = new TypeWithNumbers { Int32 = int.MaxValue, Int64 = long.MaxValue, nullableWithValue = 12 }; var result = Json.Deserialize(quality.ToJson()); - result.ShouldBeEquivalentTo(quality, o => o.IncludingAllRuntimeProperties()); + result.Should().BeEquivalentTo(quality, o => o.IncludingAllRuntimeProperties()); } } } diff --git a/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj index 2b8b67ee3..8b630671e 100644 --- a/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj +++ b/src/NzbDrone.Test.Common/Lidarr.Test.Common.csproj @@ -4,7 +4,7 @@ x86 - +