From fe0abd527e3e64659e3cd9a3f65685dcb5550acb Mon Sep 17 00:00:00 2001 From: Bogdan Date: Fri, 5 May 2023 13:23:20 +0300 Subject: [PATCH] Fix track lookup in integration tests --- .../FileNameBuilderTests/ReplaceCharacterFixture.cs | 2 +- src/NzbDrone.Integration.Test/IntegrationTestBase.cs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixture.cs index c560c8f2d..66a00004b 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReplaceCharacterFixture.cs @@ -46,7 +46,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests .With(e => e.AlbumRelease = _release) .Build(); - _trackFiles = new TrackFile { Quality = new QualityModel(Quality.FLAC), ReleaseGroup = "SonarrTest" }; + _trackFiles = new TrackFile { Quality = new QualityModel(Quality.FLAC), ReleaseGroup = "LidarrTest" }; _namingConfig = NamingConfig.Default; _namingConfig.RenameTracks = true; diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index 590f19837..dac95c213 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -297,9 +297,9 @@ namespace NzbDrone.Integration.Test } } - public void EnsureTrackFile(ArtistResource artist, int albumId, int albumReleaseId, int trackId, Quality quality) + public void EnsureTrackFile(ArtistResource artist, int albumId, int albumReleaseId, int trackNumber, Quality quality) { - var result = Tracks.GetTracksInArtist(artist.Id).Single(v => v.Id == trackId); + var result = Tracks.GetTracksInArtist(artist.Id).Single(v => v.AlbumId == albumId && v.AbsoluteTrackNumber == trackNumber); if (result.TrackFile == null) { @@ -318,14 +318,14 @@ namespace NzbDrone.Integration.Test ArtistId = artist.Id, AlbumId = albumId, AlbumReleaseId = albumReleaseId, - TrackIds = new List { trackId }, + TrackIds = new List { trackNumber }, Quality = new QualityModel(quality) } } }); Commands.WaitAll(); - var track = Tracks.GetTracksInArtist(artist.Id).Single(x => x.Id == trackId); + var track = Tracks.GetTracksInArtist(artist.Id).Single(x => x.AlbumId == albumId && x.AbsoluteTrackNumber == trackNumber); track.TrackFileId.Should().NotBe(0); }