mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed indexer service, broken test

This commit is contained in:
kay.one 2013-05-02 21:37:08 -07:00
parent 385edbf464
commit 5c08e423a5
5 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NzbDrone.Common.Test/ProcessProviderTests.cs
View File

@ -1,6 +1,4 @@
 using System;
using System;
using System.ComponentModel; using System.ComponentModel;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;

18
NzbDrone.Core.Test/IndexerTests/IndexerServiceFixture.cs
View File

@ -18,21 +18,21 @@ namespace NzbDrone.Core.Test.IndexerTests
{ {
public class IndexerServiceFixture : DbTest<IndexerService, IndexerDefinition> public class IndexerServiceFixture : DbTest<IndexerService, IndexerDefinition>
{ {
private List<Func<IIndexer>> _indexers; private List<IIndexer> _indexers;
[SetUp] [SetUp]
public void Setup() public void Setup()
{ {
_indexers = new List<Func<IIndexer>>(); _indexers = new List<IIndexer>();
_indexers.Add(() => new Newznab()); _indexers.Add(new Newznab());
_indexers.Add(() => new Nzbsrus()); _indexers.Add(new Nzbsrus());
_indexers.Add(() => new NzbClub()); _indexers.Add(new NzbClub());
_indexers.Add(() => new NzbIndex()); _indexers.Add(new NzbIndex());
_indexers.Add(() => new Omgwtfnzbs()); _indexers.Add(new Omgwtfnzbs());
_indexers.Add(() => new Wombles()); _indexers.Add(new Wombles());
Mocker.SetConstant<IEnumerable<Func<IIndexer>>>(_indexers); Mocker.SetConstant<IEnumerable<IIndexer>>(_indexers);
} }

7
NzbDrone.Core.Test/IndexerTests/IntegrationTests/NzbClubIntegrationTests.cs
View File

@ -19,9 +19,12 @@ namespace NzbDrone.Core.Test.IndexerTests.IntegrationTests
result.Should().NotBeEmpty(); result.Should().NotBeEmpty();
result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title)); result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.Title));
result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbInfoUrl));
result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbUrl)); result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbUrl));
result.Should().OnlyContain(c => c.Size > 0);
//TODO: uncomment these after moving to restsharp for rss
//result.Should().OnlyContain(c => !string.IsNullOrWhiteSpace(c.NzbInfoUrl));
//result.Should().OnlyContain(c => c.Size > 0);
} }
} }

11
NzbDrone.Core/Indexers/IndexerService.cs
View File

@ -28,9 +28,9 @@ namespace NzbDrone.Core.Indexers
private readonly IIndexerRepository _indexerRepository; private readonly IIndexerRepository _indexerRepository;
private readonly Logger _logger; private readonly Logger _logger;
private readonly List<Func<IIndexer>> _indexers; private readonly List<IIndexer> _indexers;
public IndexerService(IIndexerRepository indexerRepository, IEnumerable<Func<IIndexer>> indexers, Logger logger) public IndexerService(IIndexerRepository indexerRepository, IEnumerable<IIndexer> indexers, Logger logger)
{ {
_indexerRepository = indexerRepository; _indexerRepository = indexerRepository;
_logger = logger; _logger = logger;
@ -75,7 +75,10 @@ namespace NzbDrone.Core.Indexers
private IIndexer GetInstance(IndexerDefinition indexerDefinition) private IIndexer GetInstance(IndexerDefinition indexerDefinition)
{ {
var instance = _indexers.Single(c => c().GetType().Name.Equals(indexerDefinition.Implementation, StringComparison.InvariantCultureIgnoreCase))(); var type = _indexers.Single(c => c.GetType().Name.Equals(indexerDefinition.Implementation, StringComparison.InvariantCultureIgnoreCase)).GetType();
var instance = (IIndexer)Activator.CreateInstance(type);
instance.InstanceDefinition = indexerDefinition; instance.InstanceDefinition = indexerDefinition;
return instance; return instance;
} }
@ -86,7 +89,7 @@ namespace NzbDrone.Core.Indexers
if (!All().Any()) if (!All().Any())
{ {
var definitions = _indexers.SelectMany(indexer => indexer().DefaultDefinitions); var definitions = _indexers.SelectMany(indexer => indexer.DefaultDefinitions);
_indexerRepository.InsertMany(definitions.ToList()); _indexerRepository.InsertMany(definitions.ToList());
} }
} }

5
NzbDrone.Integration.Test/ReleaseIntegrationTest.cs
View File

@ -22,10 +22,11 @@ namespace NzbDrone.Integration.Test
{ {
releaseResource.Age.Should().BeGreaterOrEqualTo(-1); releaseResource.Age.Should().BeGreaterOrEqualTo(-1);
releaseResource.Title.Should().NotBeBlank(); releaseResource.Title.Should().NotBeBlank();
releaseResource.NzbInfoUrl.Should().NotBeBlank();
releaseResource.NzbUrl.Should().NotBeBlank(); releaseResource.NzbUrl.Should().NotBeBlank();
releaseResource.SeriesTitle.Should().NotBeBlank(); releaseResource.SeriesTitle.Should().NotBeBlank();
releaseResource.Size.Should().BeGreaterThan(0); //TODO: uncomment these after moving to restsharp for rss
//releaseResource.NzbInfoUrl.Should().NotBeBlank();
//releaseResource.Size.Should().BeGreaterThan(0);
return true; return true;
} }