diff --git a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SKyHookProxySearchFixture.cs b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SKyHookProxySearchFixture.cs deleted file mode 100644 index dc0e7f319..000000000 --- a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SKyHookProxySearchFixture.cs +++ /dev/null @@ -1,147 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using FluentAssertions; -using NUnit.Framework; -using NzbDrone.Core.MediaCover; -using NzbDrone.Core.MetadataSource.SkyHook; -using NzbDrone.Core.Test.Framework; -using NzbDrone.Core.Tv; -using NzbDrone.Test.Common; -using NzbDrone.Test.Common.Categories; - -namespace NzbDrone.Core.Test.MetadataSource.SkyHook -{ - [TestFixture] - [IntegrationTest] - public class SkyHookProxySearchFixture : CoreTest - { - [SetUp] - public void Setup() - { - UseRealHttp(); - } - - [TestCase("The Simpsons", "The Simpsons")] - [TestCase("South Park", "South Park")] - [TestCase("Franklin & Bash", "Franklin & Bash")] - [TestCase("House", "House")] - [TestCase("Mr. D", "Mr. D")] - [TestCase("Rob & Big", "Rob & Big")] - [TestCase("M*A*S*H", "M*A*S*H")] - //[TestCase("imdb:tt0436992", "Doctor Who (2005)")] - [TestCase("tvdb:78804", "Doctor Who (2005)")] - [TestCase("tvdbid:78804", "Doctor Who (2005)")] - [TestCase("tvdbid: 78804 ", "Doctor Who (2005)")] - public void successful_search(string title, string expected) - { - var result = Subject.SearchForNewSeries(title); - - result.Should().NotBeEmpty(); - - result[0].Title.Should().Be(expected); - - ExceptionVerification.IgnoreWarns(); - } - - [TestCase("tvdbid:")] - [TestCase("tvdbid: 99999999999999999999")] - [TestCase("tvdbid: 0")] - [TestCase("tvdbid: -12")] - [TestCase("tvdbid:289578")] - [TestCase("adjalkwdjkalwdjklawjdlKAJD;EF")] - public void no_search_result(string term) - { - var result = Subject.SearchForNewSeries(term); - result.Should().BeEmpty(); - - ExceptionVerification.IgnoreWarns(); - } - - [TestCase(75978, "Family Guy")] - [TestCase(83462, "Castle (2009)")] - [TestCase(266189, "The Blacklist")] - public void should_be_able_to_get_series_detail(Int32 tvdbId, String title) - { - var details = Subject.GetSeriesInfo(tvdbId); - - ValidateSeries(details.Item1); - ValidateEpisodes(details.Item2); - - details.Item1.Title.Should().Be(title); - } - - [Test] - public void getting_details_of_invalid_series() - { - Assert.Throws(() => Subject.GetSeriesInfo(Int32.MaxValue)); - - ExceptionVerification.ExpectedWarns(1); - } - - [Test] - public void should_not_have_period_at_start_of_title_slug() - { - var details = Subject.GetSeriesInfo(79099); - - details.Item1.TitleSlug.Should().Be("dothack"); - } - - private void ValidateSeries(Series series) - { - series.Should().NotBeNull(); - series.Title.Should().NotBeNullOrWhiteSpace(); - series.CleanTitle.Should().Be(Parser.Parser.CleanSeriesTitle(series.Title)); - series.SortTitle.Should().Be(SeriesTitleNormalizer.Normalize(series.Title, series.TvdbId)); - series.Overview.Should().NotBeNullOrWhiteSpace(); - series.AirTime.Should().NotBeNullOrWhiteSpace(); - series.FirstAired.Should().HaveValue(); - series.FirstAired.Value.Kind.Should().Be(DateTimeKind.Utc); - series.Images.Should().NotBeEmpty(); - series.ImdbId.Should().NotBeNullOrWhiteSpace(); - series.Network.Should().NotBeNullOrWhiteSpace(); - series.Runtime.Should().BeGreaterThan(0); - series.TitleSlug.Should().NotBeNullOrWhiteSpace(); - //series.TvRageId.Should().BeGreaterThan(0); - series.TvdbId.Should().BeGreaterThan(0); - } - - private void ValidateEpisodes(List episodes) - { - episodes.Should().NotBeEmpty(); - - var episodeGroup = episodes.GroupBy(e => e.SeasonNumber.ToString("000") + e.EpisodeNumber.ToString("000")); - episodeGroup.Should().OnlyContain(c => c.Count() == 1); - - episodes.Should().Contain(c => c.SeasonNumber > 0); - episodes.Should().Contain(c => !string.IsNullOrWhiteSpace(c.Overview)); - - foreach (var episode in episodes) - { - ValidateEpisode(episode); - - //if atleast one episdoe has title it means parse it working. - episodes.Should().Contain(c => !string.IsNullOrWhiteSpace(c.Title)); - } - } - - private void ValidateEpisode(Episode episode) - { - episode.Should().NotBeNull(); - - //TODO: Is there a better way to validate that episode number or season number is greater than zero? - (episode.EpisodeNumber + episode.SeasonNumber).Should().NotBe(0); - - episode.Should().NotBeNull(); - - if (episode.AirDateUtc.HasValue) - { - episode.AirDateUtc.Value.Kind.Should().Be(DateTimeKind.Utc); - } - - episode.Images.Any(i => i.CoverType == MediaCoverTypes.Screenshot && i.Url.Contains("-940.")) - .Should() - .BeFalse(); - } - } -} diff --git a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs index be15000f9..56db1af1e 100644 --- a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs +++ b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxyFixture.cs @@ -8,7 +8,6 @@ using NzbDrone.Core.MediaCover; using NzbDrone.Core.MetadataSource.SkyHook; using NzbDrone.Core.Test.Framework; using NzbDrone.Core.Tv; -using NzbDrone.Test.Common; using NzbDrone.Test.Common.Categories; namespace NzbDrone.Core.Test.MetadataSource.SkyHook diff --git a/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs new file mode 100644 index 000000000..96d5f0db6 --- /dev/null +++ b/src/NzbDrone.Core.Test/MetadataSource/SkyHook/SkyHookProxySearchFixture.cs @@ -0,0 +1,61 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using NUnit.Framework; +using NzbDrone.Core.MediaCover; +using NzbDrone.Core.MetadataSource.SkyHook; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Tv; +using NzbDrone.Test.Common; +using NzbDrone.Test.Common.Categories; + +namespace NzbDrone.Core.Test.MetadataSource.SkyHook +{ + [TestFixture] + [IntegrationTest] + public class SkyHookProxySearchFixture : CoreTest + { + [SetUp] + public void Setup() + { + UseRealHttp(); + } + + [TestCase("The Simpsons", "The Simpsons")] + [TestCase("South Park", "South Park")] + [TestCase("Franklin & Bash", "Franklin & Bash")] + [TestCase("House", "House")] + [TestCase("Mr. D", "Mr. D")] + [TestCase("Rob & Big", "Rob & Big")] + [TestCase("M*A*S*H", "M*A*S*H")] + //[TestCase("imdb:tt0436992", "Doctor Who (2005)")] + [TestCase("tvdb:78804", "Doctor Who (2005)")] + [TestCase("tvdbid:78804", "Doctor Who (2005)")] + [TestCase("tvdbid: 78804 ", "Doctor Who (2005)")] + public void successful_search(string title, string expected) + { + var result = Subject.SearchForNewSeries(title); + + result.Should().NotBeEmpty(); + + result[0].Title.Should().Be(expected); + + ExceptionVerification.IgnoreWarns(); + } + + [TestCase("tvdbid:")] + [TestCase("tvdbid: 99999999999999999999")] + [TestCase("tvdbid: 0")] + [TestCase("tvdbid: -12")] + [TestCase("tvdbid:289578")] + [TestCase("adjalkwdjkalwdjklawjdlKAJD;EF")] + public void no_search_result(string term) + { + var result = Subject.SearchForNewSeries(term); + result.Should().BeEmpty(); + + ExceptionVerification.IgnoreWarns(); + } + } +} diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index 13a9cf5e8..68754995e 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -74,14 +74,9 @@ namespace NzbDrone.Core.MetadataSource.SkyHook { return new List { GetSeriesInfo(tvdbId).Item1 }; } - catch (Common.Http.HttpException ex) + catch (SeriesNotFoundException) { - if (ex.Response.StatusCode == HttpStatusCode.NotFound) - { - return new List(); - } - - throw; + return new List(); } }