-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
New: Add additional CleanTitle tokens and re-order options
Closes #6066
- Loading branch information
Showing
5 changed files
with
287 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
86 changes: 86 additions & 0 deletions
86
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleTheFixture.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using FizzWare.NBuilder; | ||
using FluentAssertions; | ||
using NUnit.Framework; | ||
using NzbDrone.Core.CustomFormats; | ||
using NzbDrone.Core.MediaFiles; | ||
using NzbDrone.Core.Organizer; | ||
using NzbDrone.Core.Qualities; | ||
using NzbDrone.Core.Test.Framework; | ||
using NzbDrone.Core.Tv; | ||
|
||
namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests | ||
{ | ||
[TestFixture] | ||
public class CleanTitleTheFixture : CoreTest<FileNameBuilder> | ||
{ | ||
private Series _series; | ||
private Episode _episode; | ||
private EpisodeFile _episodeFile; | ||
private NamingConfig _namingConfig; | ||
|
||
[SetUp] | ||
public void Setup() | ||
{ | ||
_series = Builder<Series> | ||
.CreateNew() | ||
.Build(); | ||
|
||
_episode = Builder<Episode>.CreateNew() | ||
.With(e => e.Title = "City Sushi") | ||
.With(e => e.SeasonNumber = 15) | ||
.With(e => e.EpisodeNumber = 6) | ||
.With(e => e.AbsoluteEpisodeNumber = 100) | ||
.Build(); | ||
|
||
_episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" }; | ||
|
||
_namingConfig = NamingConfig.Default; | ||
_namingConfig.RenameEpisodes = true; | ||
|
||
Mocker.GetMock<INamingConfigService>() | ||
.Setup(c => c.GetConfig()).Returns(_namingConfig); | ||
|
||
Mocker.GetMock<IQualityDefinitionService>() | ||
.Setup(v => v.Get(Moq.It.IsAny<Quality>())) | ||
.Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v)); | ||
|
||
Mocker.GetMock<ICustomFormatService>() | ||
.Setup(v => v.All()) | ||
.Returns(new List<CustomFormat>()); | ||
} | ||
|
||
[TestCase("The Mist", "Mist, The")] | ||
[TestCase("A Place to Call Home", "Place to Call Home, A")] | ||
[TestCase("An Adventure in Space and Time", "Adventure in Space and Time, An")] | ||
[TestCase("The Flash (2010)", "Flash, The 2010")] | ||
[TestCase("A League Of Their Own (AU)", "League Of Their Own, A AU")] | ||
[TestCase("The Fixer (ZH) (2015)", "Fixer, The ZH 2015")] | ||
[TestCase("The Sixth Sense 2 (Thai)", "Sixth Sense 2, The Thai")] | ||
[TestCase("The Amazing Race (Latin America)", "Amazing Race, The Latin America")] | ||
[TestCase("The Rat Pack (A&E)", "Rat Pack, The AandE")] | ||
[TestCase("The Climax: I (Almost) Got Away With It (2016)", "Climax I Almost Got Away With It, The 2016")] | ||
public void should_get_expected_title_back(string title, string expected) | ||
{ | ||
_series.Title = title; | ||
_namingConfig.StandardEpisodeFormat = "{Series CleanTitleThe}"; | ||
|
||
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) | ||
.Should().Be(expected); | ||
} | ||
|
||
[TestCase("A")] | ||
[TestCase("Anne")] | ||
[TestCase("Theodore")] | ||
[TestCase("3%")] | ||
public void should_not_change_title(string title) | ||
{ | ||
_series.Title = title; | ||
_namingConfig.StandardEpisodeFormat = "{Series CleanTitleThe}"; | ||
|
||
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) | ||
.Should().Be(title); | ||
} | ||
} | ||
} |
79 changes: 79 additions & 0 deletions
79
...NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleTheWithoutYearFixture.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using FizzWare.NBuilder; | ||
using FluentAssertions; | ||
using NUnit.Framework; | ||
using NzbDrone.Core.CustomFormats; | ||
using NzbDrone.Core.MediaFiles; | ||
using NzbDrone.Core.Organizer; | ||
using NzbDrone.Core.Qualities; | ||
using NzbDrone.Core.Test.Framework; | ||
using NzbDrone.Core.Tv; | ||
|
||
namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests | ||
{ | ||
[TestFixture] | ||
public class CleanTitleTheWithoutYearFixture : CoreTest<FileNameBuilder> | ||
{ | ||
private Series _series; | ||
private Episode _episode; | ||
private EpisodeFile _episodeFile; | ||
private NamingConfig _namingConfig; | ||
|
||
[SetUp] | ||
public void Setup() | ||
{ | ||
_series = Builder<Series> | ||
.CreateNew() | ||
.Build(); | ||
|
||
_episode = Builder<Episode>.CreateNew() | ||
.With(e => e.Title = "City Sushi") | ||
.With(e => e.SeasonNumber = 15) | ||
.With(e => e.EpisodeNumber = 6) | ||
.With(e => e.AbsoluteEpisodeNumber = 100) | ||
.Build(); | ||
|
||
_episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" }; | ||
|
||
_namingConfig = NamingConfig.Default; | ||
_namingConfig.RenameEpisodes = true; | ||
|
||
Mocker.GetMock<INamingConfigService>() | ||
.Setup(c => c.GetConfig()).Returns(_namingConfig); | ||
|
||
Mocker.GetMock<IQualityDefinitionService>() | ||
.Setup(v => v.Get(Moq.It.IsAny<Quality>())) | ||
.Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v)); | ||
|
||
Mocker.GetMock<ICustomFormatService>() | ||
.Setup(v => v.All()) | ||
.Returns(new List<CustomFormat>()); | ||
} | ||
|
||
[TestCase("The Mist", 2018, "Mist, The")] | ||
[TestCase("The Rat Pack (A&E)", 1999, "Rat Pack, The AandE")] | ||
[TestCase("The Climax: I (Almost) Got Away With It (2016)", 2016, "Climax I Almost Got Away With It, The")] | ||
[TestCase("A", 2017, "A")] | ||
public void should_get_expected_title_back(string title, int year, string expected) | ||
{ | ||
_series.Title = title; | ||
_series.Year = year; | ||
_namingConfig.StandardEpisodeFormat = "{Series CleanTitleTheWithoutYear}"; | ||
|
||
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) | ||
.Should().Be(expected); | ||
} | ||
|
||
[Test] | ||
public void should_not_include_0_for_year() | ||
{ | ||
_series.Title = "The Alienist"; | ||
_series.Year = 0; | ||
_namingConfig.StandardEpisodeFormat = "{Series CleanTitleTheWithoutYear}"; | ||
|
||
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) | ||
.Should().Be("Alienist, The"); | ||
} | ||
} | ||
} |
81 changes: 81 additions & 0 deletions
81
src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/CleanTitleTheYearFixture.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,81 @@ | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using FizzWare.NBuilder; | ||
using FluentAssertions; | ||
using NUnit.Framework; | ||
using NzbDrone.Core.CustomFormats; | ||
using NzbDrone.Core.MediaFiles; | ||
using NzbDrone.Core.Organizer; | ||
using NzbDrone.Core.Qualities; | ||
using NzbDrone.Core.Test.Framework; | ||
using NzbDrone.Core.Tv; | ||
|
||
namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests | ||
{ | ||
[TestFixture] | ||
public class CleanTitleTheYearFixture : CoreTest<FileNameBuilder> | ||
{ | ||
private Series _series; | ||
private Episode _episode; | ||
private EpisodeFile _episodeFile; | ||
private NamingConfig _namingConfig; | ||
|
||
[SetUp] | ||
public void Setup() | ||
{ | ||
_series = Builder<Series> | ||
.CreateNew() | ||
.Build(); | ||
|
||
_episode = Builder<Episode>.CreateNew() | ||
.With(e => e.Title = "City Sushi") | ||
.With(e => e.SeasonNumber = 15) | ||
.With(e => e.EpisodeNumber = 6) | ||
.With(e => e.AbsoluteEpisodeNumber = 100) | ||
.Build(); | ||
|
||
_episodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p), ReleaseGroup = "SonarrTest" }; | ||
|
||
_namingConfig = NamingConfig.Default; | ||
_namingConfig.RenameEpisodes = true; | ||
|
||
Mocker.GetMock<INamingConfigService>() | ||
.Setup(c => c.GetConfig()).Returns(_namingConfig); | ||
|
||
Mocker.GetMock<IQualityDefinitionService>() | ||
.Setup(v => v.Get(Moq.It.IsAny<Quality>())) | ||
.Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v)); | ||
|
||
Mocker.GetMock<ICustomFormatService>() | ||
.Setup(v => v.All()) | ||
.Returns(new List<CustomFormat>()); | ||
} | ||
|
||
[TestCase("The Mist", 2018, "Mist, The 2018")] | ||
[TestCase("The Rat Pack (A&E)", 1999, "Rat Pack, The AandE 1999")] | ||
[TestCase("The Climax: I (Almost) Got Away With It (2016)", 2016, "Climax I Almost Got Away With It, The 2016")] | ||
[TestCase("The Climax: I (Almost) Got Away With It (2016)", 0, "Climax I Almost Got Away With It, The 2016")] | ||
[TestCase("The Climax: I (Almost) Got Away With It", 0, "Climax I Almost Got Away With It, The")] | ||
[TestCase("A", 2017, "A 2017")] | ||
public void should_get_expected_title_back(string title, int year, string expected) | ||
{ | ||
_series.Title = title; | ||
_series.Year = year; | ||
_namingConfig.StandardEpisodeFormat = "{Series CleanTitleTheYear}"; | ||
|
||
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) | ||
.Should().Be(expected); | ||
} | ||
|
||
[Test] | ||
public void should_not_include_0_for_year() | ||
{ | ||
_series.Title = "The Alienist"; | ||
_series.Year = 0; | ||
_namingConfig.StandardEpisodeFormat = "{Series TitleTheYear}"; | ||
|
||
Subject.BuildFileName(new List<Episode> { _episode }, _series, _episodeFile) | ||
.Should().Be("Alienist, The"); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters