From 1f20bc63c656ce0dcc99a26840604ca823b84b65 Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 16 Jan 2023 22:45:55 -0600 Subject: [PATCH] RemotePathMappingCheck Improvements --- src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs | 2 +- .../HealthCheck/Checks/DownloadClientCheckFixture.cs | 7 ++++--- .../Checks/DownloadClientRootFolderCheckFixture.cs | 2 +- .../Checks/DownloadClientSortingCheckFixture.cs | 2 +- .../HealthCheck/Checks/RemotePathMappingCheckFixture.cs | 2 +- .../HealthCheck/Checks/RemotePathMappingCheck.cs | 4 ++-- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs b/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs index 616c8c11c..d6185ea5e 100644 --- a/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs +++ b/src/NzbDrone.Core.Test/Download/DownloadServiceFixture.cs @@ -28,7 +28,7 @@ namespace NzbDrone.Core.Test.Download _downloadClients = new List(); Mocker.GetMock() - .Setup(v => v.GetDownloadClients()) + .Setup(v => v.GetDownloadClients(It.IsAny())) .Returns(_downloadClients); Mocker.GetMock() diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs index f049b2e2d..0b37d192d 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientCheckFixture.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Moq; using NUnit.Framework; using NzbDrone.Core.Download; using NzbDrone.Core.HealthCheck.Checks; @@ -14,7 +15,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks public void should_return_warning_when_download_client_has_not_been_configured() { Mocker.GetMock() - .Setup(s => s.GetDownloadClients()) + .Setup(s => s.GetDownloadClients(It.IsAny())) .Returns(Array.Empty()); Subject.Check().ShouldBeWarning(); @@ -30,7 +31,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks .Throws(); Mocker.GetMock() - .Setup(s => s.GetDownloadClients()) + .Setup(s => s.GetDownloadClients(It.IsAny())) .Returns(new IDownloadClient[] { downloadClient.Object }); Subject.Check().ShouldBeError(); @@ -45,7 +46,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks .Returns(new List()); Mocker.GetMock() - .Setup(s => s.GetDownloadClients()) + .Setup(s => s.GetDownloadClients(It.IsAny())) .Returns(new IDownloadClient[] { downloadClient.Object }); Subject.Check().ShouldBeOk(); diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs index 889872d3c..d58c902e6 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientRootFolderCheckFixture.cs @@ -44,7 +44,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks .Returns(_clientStatus); Mocker.GetMock() - .Setup(s => s.GetDownloadClients()) + .Setup(s => s.GetDownloadClients(It.IsAny())) .Returns(new IDownloadClient[] { _downloadClient.Object }); Mocker.GetMock() diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientSortingCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientSortingCheckFixture.cs index 4a3022206..47f62691f 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientSortingCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/DownloadClientSortingCheckFixture.cs @@ -39,7 +39,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks .Returns(_clientStatus); Mocker.GetMock() - .Setup(s => s.GetDownloadClients()) + .Setup(s => s.GetDownloadClients(It.IsAny())) .Returns(new IDownloadClient[] { _downloadClient.Object }); } diff --git a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs index 1581e237b..65ad530ae 100644 --- a/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs +++ b/src/NzbDrone.Core.Test/HealthCheck/Checks/RemotePathMappingCheckFixture.cs @@ -63,7 +63,7 @@ namespace NzbDrone.Core.Test.HealthCheck.Checks .Returns(_clientStatus); Mocker.GetMock() - .Setup(s => s.GetDownloadClients()) + .Setup(s => s.GetDownloadClients(It.IsAny())) .Returns(new IDownloadClient[] { _downloadClient.Object }); Mocker.GetMock() diff --git a/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs index 3e5b8e777..b1ebdd451 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/RemotePathMappingCheck.cs @@ -50,7 +50,7 @@ namespace NzbDrone.Core.HealthCheck.Checks } // Only check clients not in failure status, those get another message - var clients = _downloadClientProvider.GetDownloadClients(); + var clients = _downloadClientProvider.GetDownloadClients(true); foreach (var client in clients) { @@ -143,7 +143,7 @@ namespace NzbDrone.Core.HealthCheck.Checks // If the previous case did not match then the failure occured in DownloadedEpisodeImportService, // while trying to locate the files reported by the download client // Only check clients not in failure status, those get another message - var client = _downloadClientProvider.GetDownloadClients().FirstOrDefault(x => x.Definition.Name == failureMessage.DownloadClientInfo.Name); + var client = _downloadClientProvider.GetDownloadClients(true).FirstOrDefault(x => x.Definition.Name == failureMessage.DownloadClientInfo.Name); if (client == null) {