diff --git a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs index 32edf4dcd..90f18c388 100644 --- a/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs +++ b/NzbDrone.Core.Test/ProviderTests/DiskScanProviderTests/ImportFileFixture.cs @@ -169,15 +169,15 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests var fakeSeries = Builder.CreateNew().Build(); //Mocks + Mocker.GetMock(MockBehavior.Strict) + .Setup(e => e.IsChildOfPath(fileName, fakeSeries.Path)).Returns(false); + With50MBFile(); Mocker.GetMock() .Setup(p => p.Exists(It.IsAny())) .Returns(false); - Mocker.GetMock(MockBehavior.Strict) - .Setup(e => e.IsChildOfPath(fileName, fakeSeries.Path)).Returns(false); - Mocker.GetMock() .Setup(c => c.GetEpisodesByParseResult(It.IsAny())) .Returns(new List()); @@ -406,6 +406,8 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests const string path = @"C:\Test\Unsorted TV\30 Rock\30.rock.s01e01.pilot.mkv"; + With50MBFile(); + Mocker.GetMock().Setup(s => s.GetEpisodesByParseResult(It.IsAny())) .Returns(new List()); @@ -427,6 +429,8 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests const string path = @"C:\Test\TV\30 Rock\30.rock.s01e01.pilot.mkv"; + With50MBFile(); + Mocker.GetMock().Setup(s => s.GetEpisodesByParseResult(It.IsAny())) .Returns(new List()); diff --git a/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs b/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs index c25a83e22..c16321ca3 100644 --- a/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs +++ b/NzbDrone.Core/Providers/DecisionEngine/CustomStartDateSpecification.cs @@ -7,20 +7,8 @@ namespace NzbDrone.Core.Providers.DecisionEngine { public class CustomStartDateSpecification { - private readonly EpisodeProvider _episodeProvider; private static readonly Logger logger = LogManager.GetCurrentClassLogger(); - [Inject] - public CustomStartDateSpecification(EpisodeProvider episodeProvider) - { - _episodeProvider = episodeProvider; - } - - public CustomStartDateSpecification() - { - - } - public virtual bool IsSatisfiedBy(EpisodeParseResult subject) { if (!subject.Series.CustomStartDate.HasValue) @@ -29,9 +17,7 @@ namespace NzbDrone.Core.Providers.DecisionEngine return true; } - var episodes = _episodeProvider.GetEpisodesByParseResult(subject); - - if (episodes.Any(episode => episode.AirDate >= subject.Series.CustomStartDate.Value)) + if (subject.Episodes.Any(episode => episode.AirDate >= subject.Series.CustomStartDate.Value)) { logger.Debug("One or more episodes aired after cutoff, downloading."); return true;