From 0f170e8a03bc8cc04d922377bb9aaf690b558023 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 2 May 2011 08:40:21 -0700 Subject: [PATCH] Fixed SAB getting the string value for Priority (instead of the integer value). Fixed SAB tests. Icarus appears to be deleting files from Debug\Files when running tests. --- NzbDrone.Core.Test/SabControllerTest.cs | 39 +++++++++++++++---------- NzbDrone.Core/Providers/SabProvider.cs | 18 +++++------- 2 files changed, 31 insertions(+), 26 deletions(-) diff --git a/NzbDrone.Core.Test/SabControllerTest.cs b/NzbDrone.Core.Test/SabControllerTest.cs index f84b12589..81ba760ec 100644 --- a/NzbDrone.Core.Test/SabControllerTest.cs +++ b/NzbDrone.Core.Test/SabControllerTest.cs @@ -25,26 +25,26 @@ public void AddByUrlSuccess() string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string username = "admin"; string password = "pass"; - string priority = "0"; + string priority = "Normal"; string category = "tv"; var mocker = new AutoMoqer(); var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)) + fakeConfig.Setup(c => c.SabHost) .Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)) + fakeConfig.Setup(c => c.SabPort) .Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)) + fakeConfig.Setup(c => c.SabApiKey) .Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)) + fakeConfig.Setup(c => c.SabUsername) .Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)) + fakeConfig.Setup(c => c.SabPassword) .Returns(password); - fakeConfig.Setup(c => c.GetValue("SabTvPriority", String.Empty, false)) + fakeConfig.Setup(c => c.SabTvPriority) .Returns(priority); - fakeConfig.Setup(c => c.GetValue("SabTvCategory", String.Empty, true)) + fakeConfig.Setup(c => c.SabTvCategory) .Returns(category); mocker.GetMock() @@ -71,19 +71,26 @@ public void AddByUrlError() string apikey = "5c770e3197e4fe763423ee7c392c25d1"; string username = "admin"; string password = "pass"; - string priority = "0"; + string priority = "Normal"; string category = "tv"; var mocker = new AutoMoqer(); var fakeConfig = mocker.GetMock(); - fakeConfig.Setup(c => c.GetValue("SabHost", String.Empty, false)).Returns(sabHost); - fakeConfig.Setup(c => c.GetValue("SabPort", String.Empty, false)).Returns(sabPort); - fakeConfig.Setup(c => c.GetValue("SabApiKey", String.Empty, false)).Returns(apikey); - fakeConfig.Setup(c => c.GetValue("SabUsername", String.Empty, false)).Returns(username); - fakeConfig.Setup(c => c.GetValue("SabPassword", String.Empty, false)).Returns(password); - fakeConfig.Setup(c => c.GetValue("SabTvPriority", String.Empty, false)).Returns(priority); - fakeConfig.Setup(c => c.GetValue("SabTvCategory", String.Empty, true)).Returns(category); + fakeConfig.Setup(c => c.SabHost) + .Returns(sabHost); + fakeConfig.Setup(c => c.SabPort) + .Returns(sabPort); + fakeConfig.Setup(c => c.SabApiKey) + .Returns(apikey); + fakeConfig.Setup(c => c.SabUsername) + .Returns(username); + fakeConfig.Setup(c => c.SabPassword) + .Returns(password); + fakeConfig.Setup(c => c.SabTvPriority) + .Returns(priority); + fakeConfig.Setup(c => c.SabTvCategory) + .Returns(category); mocker.GetMock() .Setup( diff --git a/NzbDrone.Core/Providers/SabProvider.cs b/NzbDrone.Core/Providers/SabProvider.cs index d58e2335e..ccd88ff3f 100644 --- a/NzbDrone.Core/Providers/SabProvider.cs +++ b/NzbDrone.Core/Providers/SabProvider.cs @@ -30,8 +30,7 @@ public virtual bool AddByUrl(string url, string title) { const string mode = "addurl"; string cat = _configProvider.SabTvCategory; - //string cat = "tv"; - string priority = _configProvider.SabTvPriority; + int priority = (int)Enum.Parse(typeof(SabnzbdPriorityType), _configProvider.SabTvPriority); string name = url.Replace("&", "%26"); string nzbName = HttpUtility.UrlEncode(title); @@ -84,9 +83,8 @@ public virtual bool AddById(string id, string title) //mode=addid&name=333333&pp=3&script=customscript.cmd&cat=Example&priority=-1 const string mode = "addid"; - string cat = _configProvider.GetValue("SabTvCategory", String.Empty, true); - //string cat = "tv"; - string priority = _configProvider.GetValue("SabTvPriority", String.Empty, false); + string cat = _configProvider.SabTvCategory; + int priority = (int)Enum.Parse(typeof(SabnzbdPriorityType), _configProvider.SabTvPriority); string nzbName = HttpUtility.UrlEncode(title); string action = string.Format("mode={0}&name={1}&priority={2}&cat={3}&nzbname={4}", mode, id, priority, cat, @@ -106,11 +104,11 @@ public virtual bool AddById(string id, string title) private string GetSabRequest(string action) { - string sabnzbdInfo = _configProvider.GetValue("SabHost", String.Empty, false) + ":" + - _configProvider.GetValue("SabPort", String.Empty, false); - string username = _configProvider.GetValue("SabUsername", String.Empty, false); - string password = _configProvider.GetValue("SabPassword", String.Empty, false); - string apiKey = _configProvider.GetValue("SabApiKey", String.Empty, false); + string sabnzbdInfo = _configProvider.SabHost + ":" + + _configProvider.SabPort; + string username = _configProvider.SabUsername; + string password = _configProvider.SabPassword; + string apiKey = _configProvider.SabApiKey; return string.Format(@"http://{0}/api?$Action&apikey={1}&ma_username={2}&ma_password={3}", sabnzbdInfo, apiKey,