Fixed broken tests from merge

This commit is contained in:
Mark McDowall 2012-10-20 17:19:30 -07:00
parent 5bbe310af5
commit 73e82c2f69
2 changed files with 8 additions and 18 deletions

View File

@ -169,15 +169,15 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
var fakeSeries = Builder<Series>.CreateNew().Build(); var fakeSeries = Builder<Series>.CreateNew().Build();
//Mocks //Mocks
Mocker.GetMock<DiskProvider>(MockBehavior.Strict)
.Setup(e => e.IsChildOfPath(fileName, fakeSeries.Path)).Returns(false);
With50MBFile(); With50MBFile();
Mocker.GetMock<MediaFileProvider>() Mocker.GetMock<MediaFileProvider>()
.Setup(p => p.Exists(It.IsAny<String>())) .Setup(p => p.Exists(It.IsAny<String>()))
.Returns(false); .Returns(false);
Mocker.GetMock<DiskProvider>(MockBehavior.Strict)
.Setup(e => e.IsChildOfPath(fileName, fakeSeries.Path)).Returns(false);
Mocker.GetMock<EpisodeProvider>() Mocker.GetMock<EpisodeProvider>()
.Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())) .Setup(c => c.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
.Returns(new List<Episode>()); .Returns(new List<Episode>());
@ -406,6 +406,8 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
const string path = @"C:\Test\Unsorted TV\30 Rock\30.rock.s01e01.pilot.mkv"; const string path = @"C:\Test\Unsorted TV\30 Rock\30.rock.s01e01.pilot.mkv";
With50MBFile();
Mocker.GetMock<EpisodeProvider>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())) Mocker.GetMock<EpisodeProvider>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
.Returns(new List<Episode>()); .Returns(new List<Episode>());
@ -427,6 +429,8 @@ namespace NzbDrone.Core.Test.ProviderTests.DiskScanProviderTests
const string path = @"C:\Test\TV\30 Rock\30.rock.s01e01.pilot.mkv"; const string path = @"C:\Test\TV\30 Rock\30.rock.s01e01.pilot.mkv";
With50MBFile();
Mocker.GetMock<EpisodeProvider>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>())) Mocker.GetMock<EpisodeProvider>().Setup(s => s.GetEpisodesByParseResult(It.IsAny<EpisodeParseResult>()))
.Returns(new List<Episode>()); .Returns(new List<Episode>());

View File

@ -7,20 +7,8 @@ namespace NzbDrone.Core.Providers.DecisionEngine
{ {
public class CustomStartDateSpecification public class CustomStartDateSpecification
{ {
private readonly EpisodeProvider _episodeProvider;
private static readonly Logger logger = LogManager.GetCurrentClassLogger(); private static readonly Logger logger = LogManager.GetCurrentClassLogger();
[Inject]
public CustomStartDateSpecification(EpisodeProvider episodeProvider)
{
_episodeProvider = episodeProvider;
}
public CustomStartDateSpecification()
{
}
public virtual bool IsSatisfiedBy(EpisodeParseResult subject) public virtual bool IsSatisfiedBy(EpisodeParseResult subject)
{ {
if (!subject.Series.CustomStartDate.HasValue) if (!subject.Series.CustomStartDate.HasValue)
@ -29,9 +17,7 @@ namespace NzbDrone.Core.Providers.DecisionEngine
return true; return true;
} }
var episodes = _episodeProvider.GetEpisodesByParseResult(subject); if (subject.Episodes.Any(episode => episode.AirDate >= subject.Series.CustomStartDate.Value))
if (episodes.Any(episode => episode.AirDate >= subject.Series.CustomStartDate.Value))
{ {
logger.Debug("One or more episodes aired after cutoff, downloading."); logger.Debug("One or more episodes aired after cutoff, downloading.");
return true; return true;