Download clients now use thingy provider

2026-04-24 22:35:39 -04:00 · 2014-02-13 21:31:49 -08:00
parent ba22600412
commit 606d78f5e1
123 changed files with 2076 additions and 1820 deletions
@@ -4,8 +4,9 @@ using Moq;
 using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.Disk;
-using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.Blackhole;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
@@ -13,7 +14,7 @@ using NzbDrone.Test.Common;
 namespace NzbDrone.Core.Test.Download.DownloadClientTests
 {
    [TestFixture]
-    public class BlackholeProviderFixture : CoreTest<BlackholeProvider>
+    public class BlackholeProviderFixture : CoreTest<Blackhole>
    {
        private const string _nzbUrl = "http://www.nzbs.com/url";
        private const string _title = "some_nzb_title";
@@ -27,13 +28,16 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
            _blackHoleFolder = @"c:\nzb\blackhole\".AsOsAgnostic();
            _nzbPath = @"c:\nzb\blackhole\some_nzb_title.nzb".AsOsAgnostic();

-
-            Mocker.GetMock<IConfigService>().SetupGet(c => c.BlackholeFolder).Returns(_blackHoleFolder);
-
            _remoteEpisode = new RemoteEpisode();
            _remoteEpisode.Release = new ReleaseInfo();
            _remoteEpisode.Release.Title = _title;
            _remoteEpisode.Release.DownloadUrl = _nzbUrl;
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new FolderSettings
+            {
+                Folder = _blackHoleFolder
+            };
        }

        private void WithExistingFile()
@@ -3,17 +3,15 @@ using System.Linq;
 using FizzWare.NBuilder;
 using Moq;
 using NUnit.Framework;
-using NzbDrone.Common;
-using NzbDrone.Common.Serializer;
-using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.Nzbget;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;

-namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetProviderTests
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
 {
-    public class DownloadNzbFixture : CoreTest
+    public class DownloadNzbFixture : CoreTest<Nzbget>
    {
        private const string _url = "http://www.nzbdrone.com";
        private const string _title = "30.Rock.S01E01.Pilot.720p.hdtv";
@@ -32,6 +30,17 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetProviderTests
                                                      .With(e => e.AirDate = DateTime.Today.ToString(Episode.AIR_DATE_FORMAT))
                                                      .Build()
                                                      .ToList();
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new NzbgetSettings
+            {
+                Host = "localhost",
+                Port = 6789,
+                Username = "nzbget",
+                Password = "pass",
+                TvCategory = "tv",
+                RecentTvPriority = (int)NzbgetPriority.High
+            };
        }

        [Test]
@@ -39,14 +48,14 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetProviderTests
        {
            var p = new object[] {"30.Rock.S01E01.Pilot.720p.hdtv.nzb", "TV", 50, false, "http://www.nzbdrone.com"};

-            Mocker.GetMock<INzbGetCommunicationProxy>()
-                    .Setup(s => s.AddNzb(p))
+            Mocker.GetMock<INzbgetProxy>()
+                    .Setup(s => s.AddNzb(It.IsAny<NzbgetSettings>(), p))
                    .Returns(true);

-            Mocker.Resolve<NzbgetClient>().DownloadNzb(_remoteEpisode);
+            Subject.DownloadNzb(_remoteEpisode);

-            Mocker.GetMock<INzbGetCommunicationProxy>()
-                    .Verify(v => v.AddNzb(It.IsAny<object []>()), Times.Once());
+            Mocker.GetMock<INzbgetProxy>()
+                    .Verify(v => v.AddNzb(It.IsAny<NzbgetSettings>(), It.IsAny<object []>()), Times.Once());
        }
    }
 }
@@ -5,40 +5,52 @@ using FizzWare.NBuilder;
 using FluentAssertions;
 using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients.Nzbget;
 using NzbDrone.Core.Parser;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Core.Tv;

-namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetProviderTests
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.NzbgetTests
 {
-    public class QueueFixture : CoreTest<NzbgetClient>
+    public class QueueFixture : CoreTest<Nzbget>
    {
-        private List<NzbGetQueueItem> _queue;
+        private List<NzbgetQueueItem> _queue;

        [SetUp]
        public void Setup()
        {
-            _queue = Builder<NzbGetQueueItem>.CreateListOfSize(5)
+            _queue = Builder<NzbgetQueueItem>.CreateListOfSize(5)
                                             .All()
                                             .With(q => q.NzbName = "30.Rock.S01E01.Pilot.720p.hdtv.nzb")
                                             .Build()
                                             .ToList();
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new NzbgetSettings
+            {
+                Host = "localhost",
+                Port = 6789,
+                Username = "nzbget",
+                Password = "pass",
+                TvCategory = "tv",
+                RecentTvPriority = (int)NzbgetPriority.High
+            };
        }

        private void WithFullQueue()
        {
-            Mocker.GetMock<INzbGetCommunicationProxy>()
-                  .Setup(s => s.GetQueue())
+            Mocker.GetMock<INzbgetProxy>()
+                  .Setup(s => s.GetQueue(It.IsAny<NzbgetSettings>()))
                  .Returns(_queue);
        }

        private void WithEmptyQueue()
        {
-            Mocker.GetMock<INzbGetCommunicationProxy>()
-                  .Setup(s => s.GetQueue())
-                  .Returns(new List<NzbGetQueueItem>());
+            Mocker.GetMock<INzbgetProxy>()
+                  .Setup(s => s.GetQueue(It.IsAny<NzbgetSettings>()))
+                  .Returns(new List<NzbgetQueueItem>());
        }

        [Test]
@@ -6,7 +6,9 @@ using NUnit.Framework;
 using NzbDrone.Common;
 using NzbDrone.Common.Disk;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Download;
 using NzbDrone.Core.Download.Clients;
+using NzbDrone.Core.Download.Clients.Pneumatic;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Test.Framework;
 using NzbDrone.Test.Common;
@@ -14,7 +16,7 @@ using NzbDrone.Test.Common;
 namespace NzbDrone.Core.Test.Download.DownloadClientTests
 {
    [TestFixture]
-    public class PneumaticProviderFixture : CoreTest<PneumaticClient>
+    public class PneumaticProviderFixture : CoreTest<Pneumatic>
    {
        private const string _nzbUrl = "http://www.nzbs.com/url";
        private const string _title = "30.Rock.S01E05.hdtv.xvid-LoL";
@@ -31,7 +33,6 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests
            _nzbPath = Path.Combine(_pneumaticFolder, _title + ".nzb").AsOsAgnostic();
            _sabDrop = @"d:\unsorted tv\".AsOsAgnostic();

-            Mocker.GetMock<IConfigService>().SetupGet(c => c.PneumaticFolder).Returns(_pneumaticFolder);
            Mocker.GetMock<IConfigService>().SetupGet(c => c.DownloadedEpisodesFolder).Returns(_sabDrop);

            _remoteEpisode = new RemoteEpisode();
@@ -41,6 +42,12 @@ namespace NzbDrone.Core.Test.Download.DownloadClientTests

            _remoteEpisode.ParsedEpisodeInfo = new ParsedEpisodeInfo();
            _remoteEpisode.ParsedEpisodeInfo.FullSeason = false;
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new FolderSettings
+            {
+                Folder = _pneumaticFolder
+            };
        }

        private void WithExistingFile()
@@ -1,191 +0,0 @@
-using System;
-using System.IO;
-using System.Linq;
-using FizzWare.NBuilder;
-using FluentAssertions;
-using Moq;
-using NUnit.Framework;
-using NzbDrone.Common;
-using NzbDrone.Core.Configuration;
-using NzbDrone.Core.Download.Clients.Sabnzbd;
-using NzbDrone.Core.Parser.Model;
-using NzbDrone.Core.Test.Framework;
-using NzbDrone.Core.Tv;
-
-namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabProviderTests
-{
-    [TestFixture]
-
-    public class SabProviderFixture : CoreTest<SabnzbdClient>
-    {
-        private const string URL = "http://www.nzbclub.com/nzb_download.aspx?mid=1950232";
-        private const string TITLE = "My Series Name - 5x2-5x3 - My title [Bluray720p] [Proper]";
-        private RemoteEpisode _remoteEpisode;
-
-        [SetUp]
-        public void Setup()
-        {
-            var fakeConfig = Mocker.GetMock<IConfigService>();
-
-            fakeConfig.SetupGet(c => c.SabHost).Returns("192.168.5.55");
-            fakeConfig.SetupGet(c => c.SabPort).Returns(2222);
-            fakeConfig.SetupGet(c => c.SabApiKey).Returns("5c770e3197e4fe763423ee7c392c25d1");
-            fakeConfig.SetupGet(c => c.SabUsername).Returns("admin");
-            fakeConfig.SetupGet(c => c.SabPassword).Returns("pass");
-            fakeConfig.SetupGet(c => c.SabTvCategory).Returns("tv");
-
-            _remoteEpisode = new RemoteEpisode();
-            _remoteEpisode.Release = new ReleaseInfo();
-            _remoteEpisode.Release.Title = TITLE;
-            _remoteEpisode.Release.DownloadUrl = URL;
-
-            _remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
-                                                      .All()
-                                                      .With(e => e.AirDate = DateTime.Today.ToString(Episode.AIR_DATE_FORMAT))
-                                                      .Build()
-                                                      .ToList();
-        }
-
-        [Test]
-        public void should_be_able_to_get_categories_when_config_is_passed_in()
-        {
-
-            const string host = "192.168.5.22";
-            const int port = 1111;
-            const string apikey = "5c770e3197e4fe763423ee7c392c25d2";
-            const string username = "admin2";
-            const string password = "pass2";
-
-            Mocker.GetMock<IHttpProvider>(MockBehavior.Strict)
-                    .Setup(s => s.DownloadString("http://192.168.5.22:1111/api?mode=get_cats&output=json&apikey=5c770e3197e4fe763423ee7c392c25d2&ma_username=admin2&ma_password=pass2"))
-                    .Returns(ReadAllText("Files", "Categories_json.txt"));
-
-            var result = Subject.GetCategories(host, port, apikey, username, password);
-
-
-            result.Should().NotBeNull();
-            result.categories.Should().NotBeEmpty();
-        }
-
-        [Test]
-        public void should_be_able_to_get_categories_using_config()
-        {
-            Mocker.GetMock<IHttpProvider>(MockBehavior.Strict)
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=get_cats&output=json&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(ReadAllText("Files", "Categories_json.txt"));
-
-
-            var result = Subject.GetCategories();
-
-
-            result.Should().NotBeNull();
-            result.categories.Should().NotBeEmpty();
-        }
-
-        [Test]
-        public void GetHistory_should_return_a_list_with_items_when_the_history_has_items()
-        {
-            Mocker.GetMock<IHttpProvider>()
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=history&output=json&start=0&limit=0&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(ReadAllText("Files", "History.txt"));
-
-
-            var result = Subject.GetHistory();
-
-
-            result.Should().HaveCount(1);
-        }
-
-        [Test]
-        public void GetHistory_should_return_an_empty_list_when_the_queue_is_empty()
-        {
-            Mocker.GetMock<IHttpProvider>()
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=history&output=json&start=0&limit=0&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(ReadAllText("Files", "HistoryEmpty.txt"));
-
-
-            var result = Subject.GetHistory();
-
-
-            result.Should().BeEmpty();
-        }
-
-        [Test]
-        public void GetHistory_should_return_an_empty_list_when_there_is_an_error_getting_the_queue()
-        {
-            Mocker.GetMock<IHttpProvider>()
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=history&output=json&start=0&limit=0&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(ReadAllText("Files", "JsonError.txt"));
-
-
-            Assert.Throws<ApplicationException>(() => Subject.GetHistory(), "API Key Incorrect");
-        }
-
-        [Test]
-        public void GetVersion_should_return_the_version_using_passed_in_values()
-        {
-            var response = "{ \"version\": \"0.6.9\" }";
-
-            Mocker.GetMock<IHttpProvider>()
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=version&output=json&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(response);
-
-
-            var result = Subject.GetVersion("192.168.5.55", 2222, "5c770e3197e4fe763423ee7c392c25d1", "admin", "pass");
-
-
-            result.Should().NotBeNull();
-            result.Version.Should().Be("0.6.9");
-        }
-
-        [Test]
-        public void GetVersion_should_return_the_version_using_saved_values()
-        {
-            var response = "{ \"version\": \"0.6.9\" }";
-
-            Mocker.GetMock<IHttpProvider>()
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=version&output=json&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(response);
-
-
-            var result = Subject.GetVersion();
-
-
-            result.Should().NotBeNull();
-            result.Version.Should().Be("0.6.9");
-        }
-
-        [Test]
-        public void Test_should_return_version_as_a_string()
-        {
-            const string response = "{ \"version\": \"0.6.9\" }";
-
-            Mocker.GetMock<IHttpProvider>()
-                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=version&output=json&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
-                    .Returns(response);
-
-
-            var result = Subject.Test("192.168.5.55", 2222, "5c770e3197e4fe763423ee7c392c25d1", "admin", "pass");
-
-
-            result.Should().Be("0.6.9");
-        }
-
-        [Test]
-        public void downloadNzb_should_use_sabRecentTvPriority_when_recentEpisode_is_true()
-        {
-            Mocker.GetMock<IConfigService>()
-                  .SetupGet(s => s.SabRecentTvPriority)
-                  .Returns(SabPriorityType.High);
-
-            Mocker.GetMock<ISabCommunicationProxy>()
-                    .Setup(s => s.DownloadNzb(It.IsAny<Stream>(), It.IsAny<String>(), It.IsAny<String>(), (int)SabPriorityType.High))
-                    .Returns(new SabAddResponse());
-
-            Subject.DownloadNzb(_remoteEpisode);
-
-            Mocker.GetMock<ISabCommunicationProxy>()
-                  .Verify(v => v.DownloadNzb(It.IsAny<Stream>(), It.IsAny<String>(), It.IsAny<String>(), (int)SabPriorityType.High), Times.Once());
-        }
-    }
-}
@@ -0,0 +1,104 @@
+using System;
+using System.IO;
+using System.Linq;
+using FizzWare.NBuilder;
+using FluentAssertions;
+using Moq;
+using NUnit.Framework;
+using NzbDrone.Common;
+using NzbDrone.Core.Download;
+using NzbDrone.Core.Download.Clients.Sabnzbd;
+using NzbDrone.Core.Download.Clients.Sabnzbd.Responses;
+using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.Test.Framework;
+using NzbDrone.Core.Tv;
+
+namespace NzbDrone.Core.Test.Download.DownloadClientTests.SabnzbdTests
+{
+    [TestFixture]
+    public class SabnzbdFixture : CoreTest<Sabnzbd>
+    {
+        private const string URL = "http://www.nzbclub.com/nzb_download.aspx?mid=1950232";
+        private const string TITLE = "My Series Name - 5x2-5x3 - My title [Bluray720p] [Proper]";
+        private RemoteEpisode _remoteEpisode;
+
+        [SetUp]
+        public void Setup()
+        {
+            _remoteEpisode = new RemoteEpisode();
+            _remoteEpisode.Release = new ReleaseInfo();
+            _remoteEpisode.Release.Title = TITLE;
+            _remoteEpisode.Release.DownloadUrl = URL;
+
+            _remoteEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
+                                                      .All()
+                                                      .With(e => e.AirDate = DateTime.Today.ToString(Episode.AIR_DATE_FORMAT))
+                                                      .Build()
+                                                      .ToList();
+
+            Subject.Definition = new DownloadClientDefinition();
+            Subject.Definition.Settings = new SabnzbdSettings
+                                          {
+                                              Host = "192.168.5.55",
+                                              Port = 2222,
+                                              ApiKey = "5c770e3197e4fe763423ee7c392c25d1",
+                                              Username = "admin",
+                                              Password = "pass",
+                                              TvCategory = "tv",
+                                              RecentTvPriority = (int)SabnzbdPriority.High
+                                          };
+        }
+
+        [Test]
+        public void GetHistory_should_return_a_list_with_items_when_the_history_has_items()
+        {
+            Mocker.GetMock<IHttpProvider>()
+                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=history&output=json&start=0&limit=0&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
+                    .Returns(ReadAllText("Files", "History.txt"));
+
+
+            var result = Subject.GetHistory();
+
+
+            result.Should().HaveCount(1);
+        }
+
+        [Test]
+        public void GetHistory_should_return_an_empty_list_when_the_queue_is_empty()
+        {
+            Mocker.GetMock<IHttpProvider>()
+                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=history&output=json&start=0&limit=0&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
+                    .Returns(ReadAllText("Files", "HistoryEmpty.txt"));
+
+
+            var result = Subject.GetHistory();
+
+
+            result.Should().BeEmpty();
+        }
+
+        [Test]
+        public void GetHistory_should_return_an_empty_list_when_there_is_an_error_getting_the_queue()
+        {
+            Mocker.GetMock<IHttpProvider>()
+                    .Setup(s => s.DownloadString("http://192.168.5.55:2222/api?mode=history&output=json&start=0&limit=0&apikey=5c770e3197e4fe763423ee7c392c25d1&ma_username=admin&ma_password=pass"))
+                    .Returns(ReadAllText("Files", "JsonError.txt"));
+
+
+            Assert.Throws<ApplicationException>(() => Subject.GetHistory(), "API Key Incorrect");
+        }
+
+        [Test]
+        public void downloadNzb_should_use_sabRecentTvPriority_when_recentEpisode_is_true()
+        {
+            Mocker.GetMock<ISabnzbdProxy>()
+                    .Setup(s => s.DownloadNzb(It.IsAny<Stream>(), It.IsAny<String>(), It.IsAny<String>(), (int)SabnzbdPriority.High, It.IsAny<SabnzbdSettings>()))
+                    .Returns(new SabnzbdAddResponse());
+
+            Subject.DownloadNzb(_remoteEpisode);
+
+            Mocker.GetMock<ISabnzbdProxy>()
+                  .Verify(v => v.DownloadNzb(It.IsAny<Stream>(), It.IsAny<String>(), It.IsAny<String>(), (int)SabnzbdPriority.High, It.IsAny<SabnzbdSettings>()), Times.Once());
+        }
+    }
+}