self-hosted/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2024-12-14 11:23:42 +02:00
Code Issues Releases Activity

Naming config fixed, with integration tests

Browse Source
This commit is contained in:
Mark McDowall 2013-08-27 17:16:24 -07:00
parent 1e3a308917
commit dd37713a10
7 changed files with 52 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
NzbDrone.Api/Config/NamingModule.cs
View File

@ -22,10 +22,9 @@ public NamingModule(INamingConfigService namingConfigService, IBuildFileNames bu
_namingConfigService = namingConfigService;
_buildFileNames = buildFileNames;
GetResourceSingle = GetNamingConfig;
GetResourceById = GetNamingConfig;
UpdateResource = UpdateNamingConfig;
Get["/samples"] = x => GetExamples(this.Bind<NamingConfigResource>());
SharedValidator.RuleFor(c => c.MultiEpisodeStyle).InclusiveBetween(0, 3);
@ -35,7 +34,7 @@ public NamingModule(INamingConfigService namingConfigService, IBuildFileNames bu
private void UpdateNamingConfig(NamingConfigResource resource)
{
GetNewId<NamingConfig>(_namingConfigService.Save, resource);
_namingConfigService.Save(resource.InjectTo<NamingConfig>());
}
private NamingConfigResource GetNamingConfig()
@ -43,6 +42,11 @@ private NamingConfigResource GetNamingConfig()
return _namingConfigService.GetConfig().InjectTo<NamingConfigResource>();
}
private NamingConfigResource GetNamingConfig(int id)
{
return GetNamingConfig();
}
private JsonResponse<NamingSampleResource> GetExamples(NamingConfigResource config)
{
var nameSpec = config.InjectTo<NamingConfig>();

2
NzbDrone.Api/NzbDroneRestModule.cs
View File

@ -21,7 +21,6 @@ protected NzbDroneRestModule(string resource)
PutValidator.RuleFor(r => r.Id).ValidId();
}
protected int GetNewId<TModel>(Func<TModel, TModel> function, TResource resource) where TModel : ModelBase, new()
{
var model = resource.InjectTo<TModel>();
@ -35,7 +34,6 @@ protected NzbDroneRestModule(string resource)
return modelList.InjectTo<List<TResource>>();
}
protected PagingResource<TResource> ApplyToPage<TModel>(Func<PagingSpec<TModel>, PagingSpec<TModel>> function, PagingSpec<TModel> pagingSpec) where TModel : ModelBase, new()
{
pagingSpec = function(pagingSpec);

6
NzbDrone.Integration.Test/Client/ClientBase.cs
View File

@ -55,6 +55,12 @@ public TResource Get(int id, HttpStatusCode statusCode = HttpStatusCode.OK)
return Get<TResource>(request, statusCode);
}
public TResource GetSingle(HttpStatusCode statusCode = HttpStatusCode.OK)
{
var request = BuildRequest();
return Get<TResource>(request, statusCode);
}
public void Delete(int id)
{
var request = BuildRequest(id.ToString());

2
NzbDrone.Integration.Test/CommandIntegerationTests.cs
View File

@ -11,7 +11,5 @@ public void should_be_able_to_run_rss_sync()
{
Commands.Post(new CommandResource {Command = "rsssync"});
}
}
}

7
NzbDrone.Integration.Test/IntegrationTest.cs
View File

@ -3,7 +3,7 @@
using NLog.Targets;
using NUnit.Framework;
using NzbDrone.Api.Commands;
using NzbDrone.Api.Episodes;
using NzbDrone.Api.Config;
using NzbDrone.Api.RootFolders;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Integration.Test.Client;
@ -25,10 +25,10 @@ public abstract class IntegrationTest
protected IndexerClient Indexers;
protected EpisodeClient Episodes;
protected SeasonClient Seasons;
protected ClientBase<NamingConfigResource> NamingConfig;
private NzbDroneRunner _runner;
public IntegrationTest()
{
new StartupArguments();
@ -42,7 +42,6 @@ public IntegrationTest()
[SetUp]
public void SmokeTestSetup()
{
_runner = new NzbDroneRunner();
_runner.KillAll();
@ -51,7 +50,6 @@ public void SmokeTestSetup()
_runner.Start();
}
private void InitRestClients()
{
RestClient = new RestClient("http://localhost:8989/api");
@ -62,6 +60,7 @@ private void InitRestClients()
Indexers = new IndexerClient(RestClient);
Episodes = new EpisodeClient(RestClient);
Seasons = new SeasonClient(RestClient);
NamingConfig = new ClientBase<NamingConfigResource>(RestClient, "config/naming");
}
[TearDown]

35
NzbDrone.Integration.Test/NamingConfigTests.cs Normal file
View File

@ -0,0 +1,35 @@
using System;
using System.IO;
using FluentAssertions;
using NUnit.Framework;
namespace NzbDrone.Integration.Test
{
[TestFixture]
public class NamingConfigTests : IntegrationTest
{
[Test]
public void should_be_able_to_get()
{
NamingConfig.GetSingle().Should().NotBeNull();
}
[Test]
public void should_be_able_to_get_by_id()
{
var config = NamingConfig.GetSingle();
NamingConfig.Get(config.Id).Should().NotBeNull();
NamingConfig.Get(config.Id).Id.Should().Be(config.Id);
}
[Test]
public void should_be_able_to_update()
{
var config = NamingConfig.GetSingle();
config.RenameEpisodes = false;
NamingConfig.Put(config).RenameEpisodes.Should().BeFalse();
}
}
}

1
NzbDrone.Integration.Test/NzbDrone.Integration.Test.csproj
View File

@ -99,6 +99,7 @@
<Compile Include="Client\ReleaseClient.cs" />
<Compile Include="Client\SeriesClient.cs" />
<Compile Include="CommandIntegerationTests.cs" />
<Compile Include="NamingConfigTests.cs" />
<Compile Include="SeasonIntegrationTests.cs" />
<Compile Include="EpisodeIntegrationTests.cs" />
<Compile Include="IndexerIntegrationFixture.cs" />