diff --git a/IISExpress/AppServer/applicationhost.config b/IISExpress/AppServer/applicationhost.config
index 617c6762a..458aeedbb 100644
--- a/IISExpress/AppServer/applicationhost.config
+++ b/IISExpress/AppServer/applicationhost.config
@@ -145,7 +145,7 @@
-
+
diff --git a/NzbDrone.Core.Test/IndexerTests.cs b/NzbDrone.Core.Test/IndexerTests.cs
index 30aea11b5..69670f5b2 100644
--- a/NzbDrone.Core.Test/IndexerTests.cs
+++ b/NzbDrone.Core.Test/IndexerTests.cs
@@ -21,7 +21,7 @@ namespace NzbDrone.Core.Test
// ReSharper disable InconsistentNaming
public class IndexerTests : TestBase
{
-
+
[TestCase("nzbsorg.xml", 0)]
[TestCase("nzbsrus.xml", 6)]
[TestCase("newzbin.xml", 1)]
@@ -60,16 +60,20 @@ namespace NzbDrone.Core.Test
public void newzbin_rss_fetch()
{
var mocker = new AutoMoqer();
-
- mocker.GetMock()
- .Setup(h => h.DownloadStream(It.IsAny(), It.IsAny()))
- .Returns(File.OpenRead(".\\Files\\Rss\\newzbin.xml"));
-
+ mocker.Resolve();
var fakeSettings = Builder.CreateNew().Build();
mocker.GetMock()
.Setup(c => c.GetSettings(It.IsAny()))
.Returns(fakeSettings);
+ mocker.GetMock()
+ .SetupGet(c => c.NewzbinUsername)
+ .Returns("nzbdrone");
+
+ mocker.GetMock()
+ .SetupGet(c => c.NewzbinPassword)
+ .Returns("smartar39865");
+
var newzbinProvider = mocker.Resolve();
var parseResults = newzbinProvider.FetchRss();
@@ -84,11 +88,10 @@ namespace NzbDrone.Core.Test
parseResults.Should().OnlyContain(s => s.Indexer == newzbinProvider.Name);
parseResults.Should().OnlyContain(s => !String.IsNullOrEmpty(s.NzbTitle));
-
- ExceptionVerification.ExcpectedWarns(1);
+ ExceptionVerification.IgnoreWarns();
}
-
+
[TestCase("Adventure.Inc.S03E19.DVDRip.XviD-OSiTV", 3, 19, QualityTypes.DVD)]
public void custome_parser_partial_success(string title, int season, int episode, QualityTypes quality)
{
@@ -179,8 +182,8 @@ namespace NzbDrone.Core.Test
result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(23));
}
- [TestCase("simpsons",21,23)]
- [TestCase("Hawaii Five-0", 1, 5)]
+ [TestCase("simpsons", 21, 23)]
+ [TestCase("Hawaii Five-0 2010", 1, 5)]
public void newzbin_search_returns_valid_results(string title, int season, int episode)
{
var mocker = new AutoMoqer();
@@ -198,7 +201,7 @@ namespace NzbDrone.Core.Test
var result = mocker.Resolve().FetchEpisode(title, season, episode);
result.Should().NotBeEmpty();
- result.Should().OnlyContain(r => r.CleanTitle == title);
+ result.Should().OnlyContain(r => r.CleanTitle == Parser.NormalizeTitle(title));
result.Should().OnlyContain(r => r.SeasonNumber == season);
result.Should().OnlyContain(r => r.EpisodeNumbers.Contains(episode));
}
diff --git a/NzbDrone.Core.Test/RootDirProviderTest.cs b/NzbDrone.Core.Test/RootDirProviderTest.cs
index b529b1fde..9d2efce7a 100644
--- a/NzbDrone.Core.Test/RootDirProviderTest.cs
+++ b/NzbDrone.Core.Test/RootDirProviderTest.cs
@@ -60,26 +60,6 @@ namespace NzbDrone.Core.Test
}
- [TestCase("D:\\TV Shows\\")]
- [TestCase("//server//folder")]
- public void UpdateRootDir(string newPath)
- {
- //Setup
- var mocker = new AutoMoqer();
- mocker.SetConstant(MockLib.GetEmptyDatabase());
-
-
- //Act
- var rootDirProvider = mocker.Resolve();
- rootDirProvider.Add(new RootDir { Path = @"C:\TV" });
- rootDirProvider.Update(new RootDir { Id = 1, Path = newPath });
-
- //Assert
- var rootDirs = rootDirProvider.GetAll();
- rootDirs.Should().HaveCount(1);
- newPath.Should().Be(rootDirs.First().Path);
- }
-
[Test]
public void RemoveRootDir()
{
@@ -152,14 +132,5 @@ namespace NzbDrone.Core.Test
mocker.Resolve().Add(new RootDir { Id = 0, Path = path });
}
- [TestCase("")]
- [TestCase(null)]
- [TestCase("BAD PATH")]
- [ExpectedException(typeof(ArgumentException))]
- public void invalid_folder_path_throws_on_update(string path)
- {
- var mocker = new AutoMoqer();
- mocker.Resolve().Update(new RootDir { Id = 2, Path = path });
- }
}
}
\ No newline at end of file
diff --git a/NzbDrone.Core.Test/SeriesProviderTest.cs b/NzbDrone.Core.Test/SeriesProviderTest.cs
index f04eae442..2e553989a 100644
--- a/NzbDrone.Core.Test/SeriesProviderTest.cs
+++ b/NzbDrone.Core.Test/SeriesProviderTest.cs
@@ -10,8 +10,6 @@ using NzbDrone.Core.Providers.Core;
using NzbDrone.Core.Repository;
using NzbDrone.Core.Repository.Quality;
using NzbDrone.Core.Test.Framework;
-using PetaPoco;
-using TvdbLib.Data;
// ReSharper disable InconsistentNaming
namespace NzbDrone.Core.Test
diff --git a/NzbDrone.Core.Test/TvDbProviderTest.cs b/NzbDrone.Core.Test/TvDbProviderTest.cs
index 8b35335c4..8d5374482 100644
--- a/NzbDrone.Core.Test/TvDbProviderTest.cs
+++ b/NzbDrone.Core.Test/TvDbProviderTest.cs
@@ -85,16 +85,17 @@ namespace NzbDrone.Core.Test
}
//assert
- seasonsNumbers.Should().HaveCount(8);
+ seasonsNumbers.Should().HaveCount(7);
seasons[1].Should().HaveCount(23);
seasons[2].Should().HaveCount(19);
seasons[3].Should().HaveCount(16);
seasons[4].Should().HaveCount(20);
seasons[5].Should().HaveCount(18);
+ seasons[6].Should().HaveCount(19);
foreach (var season in seasons)
{
- season.Value.Should().OnlyHaveUniqueItems();
+ season.Value.Should().OnlyHaveUniqueItems("Season {0}", season.Key);
}
//Make sure no episode number is skipped
diff --git a/NzbDrone.Core/Datastore/CustomeMapper.cs b/NzbDrone.Core/Datastore/CustomeMapper.cs
index e938aabdb..14979cbe4 100644
--- a/NzbDrone.Core/Datastore/CustomeMapper.cs
+++ b/NzbDrone.Core/Datastore/CustomeMapper.cs
@@ -1,17 +1,18 @@
using System;
+using System.Reflection;
using PetaPoco;
namespace NzbDrone.Core.Datastore
{
public class CustomeMapper : DefaultMapper
{
- public override Func