mirror/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr synced 2024-12-27 02:07:41 +00:00
Code Issues Releases Wiki Activity

fixed broken episode status tests

Browse source
This commit is contained in:
kay.one 2011-06-01 18:16:17 -07:00
parent 22c24f7419
commit 56169b515f
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
NzbDrone.Core.Test/EpisodeStatusTest.cs
View file

@ -17,7 +17,6 @@ namespace NzbDrone.Core.Test
[Row(1, false, false, EpisodeStatusType.NotAired)] [Row(1, false, false, EpisodeStatusType.NotAired)]
[Row(-2, false, false, EpisodeStatusType.Missing)] [Row(-2, false, false, EpisodeStatusType.Missing)]
[Row(1, true, false, EpisodeStatusType.Ready)] [Row(1, true, false, EpisodeStatusType.Ready)]
[Row(1, true, true, EpisodeStatusType.Ignored)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Ignored)]
public void no_grab_date(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status) public void no_grab_date(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
{ {
@ -43,7 +42,6 @@ namespace NzbDrone.Core.Test
[Row(1, false, false, EpisodeStatusType.NotAired)] [Row(1, false, false, EpisodeStatusType.NotAired)]
[Row(-2, false, false, EpisodeStatusType.Missing)] [Row(-2, false, false, EpisodeStatusType.Missing)]
[Row(1, true, false, EpisodeStatusType.Ready)] [Row(1, true, false, EpisodeStatusType.Ready)]
[Row(1, true, true, EpisodeStatusType.Ignored)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Ignored)]
public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored, public void old_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
EpisodeStatusType status) EpisodeStatusType status)
@ -70,8 +68,8 @@ namespace NzbDrone.Core.Test
[Row(1, false, false, EpisodeStatusType.Downloading)] [Row(1, false, false, EpisodeStatusType.Downloading)]
[Row(-2, false, false, EpisodeStatusType.Downloading)] [Row(-2, false, false, EpisodeStatusType.Downloading)]
[Row(1, true, false, EpisodeStatusType.Downloading)] [Row(1, true, false, EpisodeStatusType.Downloading)]
[Row(1, true, true, EpisodeStatusType.Ignored)] [Row(1, true, true, EpisodeStatusType.Downloading)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Downloading)]
public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored, public void recent_grab_date(int offsetDays, bool hasEpisodes, bool ignored,
EpisodeStatusType status) EpisodeStatusType status)
{ {
@ -95,8 +93,6 @@ namespace NzbDrone.Core.Test
[Test] [Test]
[Row(1, false, false, EpisodeStatusType.Ignored)] [Row(1, false, false, EpisodeStatusType.Ignored)]
[Row(-2, false, false, EpisodeStatusType.Ignored)] [Row(-2, false, false, EpisodeStatusType.Ignored)]
[Row(1, true, false, EpisodeStatusType.Ignored)]
[Row(1, true, true, EpisodeStatusType.Ignored)]
[Row(1, false, true, EpisodeStatusType.Ignored)] [Row(1, false, true, EpisodeStatusType.Ignored)]
public void skipped_season(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status) public void skipped_season(int offsetDays, bool hasEpisodes, bool ignored, EpisodeStatusType status)
{ {
@ -104,8 +100,10 @@ namespace NzbDrone.Core.Test
.With(e => e.AirDate = DateTime.Now.AddDays(offsetDays)) .With(e => e.AirDate = DateTime.Now.AddDays(offsetDays))
.With(e => e.Ignored = ignored) .With(e => e.Ignored = ignored)
.With(e => e.EpisodeFileId = 0) .With(e => e.EpisodeFileId = 0)
.With(e => e.GrabDate = null)
.With(e => e.Season = Builder<Season>.CreateNew() .With(e => e.Season = Builder<Season>.CreateNew()
.With(s => s.Monitored == false).Build()) .With(s => s.Monitored == false).Build())
.Build(); .Build();
if (hasEpisodes) if (hasEpisodes)
@ -124,12 +122,12 @@ namespace NzbDrone.Core.Test
.With(e => e.AirDate = DateTime.Now.AddYears(-200)) .With(e => e.AirDate = DateTime.Now.AddYears(-200))
.With(e => e.Ignored = false) .With(e => e.Ignored = false)
.With(e => e.EpisodeFileId = 0) .With(e => e.EpisodeFileId = 0)
.With(e=>e.GrabDate =null) .With(e => e.GrabDate = null)
.With(e => e.Season = Builder<Season>.CreateNew() .With(e => e.Season = Builder<Season>.CreateNew()
.With(s => s.Monitored = true).Build()) .With(s => s.Monitored = true).Build())
.Build(); .Build();
Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status); Assert.AreEqual(EpisodeStatusType.NotAired, episode.Status);
} }
} }

12
NzbDrone.Core/Repository/Episode.cs
View file

@ -49,17 +49,17 @@ namespace NzbDrone.Core.Repository
{ {
get get
{ {
if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
var season = Season;
if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now) if (GrabDate != null && GrabDate.Value.AddDays(1) >= DateTime.Now)
{ {
return EpisodeStatusType.Downloading; return EpisodeStatusType.Downloading;
} }
if (EpisodeFileId != 0) return EpisodeStatusType.Ready;
var season = Season;
if (Ignored || (season != null && !season.Monitored)) return EpisodeStatusType.Ignored;
if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date) if (AirDate.Date.Year > 1900 && DateTime.Now.Date >= AirDate.Date)
{ {
return EpisodeStatusType.Missing; return EpisodeStatusType.Missing;