From c0e8a3e55ae6ff9b6e9d3ad6e9d1988efc176efc Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Sun, 22 Apr 2018 12:40:11 -0700 Subject: [PATCH] Fix tests in CleanFilenameFixture --- .../OrganizerTests/CleanFilenameFixture.cs | 30 +++++++++++++++++++ .../OrganizerTests/CleanFixture.cs | 18 ----------- .../FileNameBuilderTests/TitleTheFixture.cs | 4 +-- 3 files changed, 31 insertions(+), 21 deletions(-) create mode 100644 src/NzbDrone.Core.Test/OrganizerTests/CleanFilenameFixture.cs delete mode 100644 src/NzbDrone.Core.Test/OrganizerTests/CleanFixture.cs diff --git a/src/NzbDrone.Core.Test/OrganizerTests/CleanFilenameFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/CleanFilenameFixture.cs new file mode 100644 index 000000000..ef4e4b535 --- /dev/null +++ b/src/NzbDrone.Core.Test/OrganizerTests/CleanFilenameFixture.cs @@ -0,0 +1,30 @@ +using FluentAssertions; +using NUnit.Framework; +using NzbDrone.Core.Organizer; +using NzbDrone.Core.Test.Framework; + +namespace NzbDrone.Core.Test.OrganizerTests +{ + [TestFixture] + public class CleanFilenameFixture : CoreTest + { + [TestCase("Law & Order: Criminal Intent - S10E07 - Icarus [HDTV-720p]", "Law & Order - Criminal Intent - S10E07 - Icarus [HDTV-720p]")] + public void should_replaace_invalid_characters(string name, string expectedName) + { + FileNameBuilder.CleanFileName(name).Should().Be(expectedName); + } + + [TestCase(".hack s01e01", "hack s01e01")] + public void should_remove_periods_from_start(string name, string expectedName) + { + FileNameBuilder.CleanFileName(name).Should().Be(expectedName); + } + + [TestCase(" Series Title - S01E01 - Episode Title", "Series Title - S01E01 - Episode Title")] + [TestCase("Series Title - S01E01 - Episode Title ", "Series Title - S01E01 - Episode Title")] + public void should_remove_spaces_from_start_and_end(string name, string expectedName) + { + FileNameBuilder.CleanFileName(name).Should().Be(expectedName); + } + } +} diff --git a/src/NzbDrone.Core.Test/OrganizerTests/CleanFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/CleanFixture.cs deleted file mode 100644 index 084123c52..000000000 --- a/src/NzbDrone.Core.Test/OrganizerTests/CleanFixture.cs +++ /dev/null @@ -1,18 +0,0 @@ -using FluentAssertions; -using NUnit.Framework; -using NzbDrone.Core.Organizer; -using NzbDrone.Core.Test.Framework; - -namespace NzbDrone.Core.Test.OrganizerTests -{ - [TestFixture] - public class CleanFixture : CoreTest - { - [TestCase("Law & Order: Criminal Intent - S10E07 - Icarus [HDTV-720p]", - "Law & Order- Criminal Intent - S10E07 - Icarus [HDTV-720p]")] - public void CleanFileName(string name, string expectedName) - { - FileNameBuilder.CleanFileName(name).Should().Be(expectedName); - } - } -} diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs index f6654e144..20f85760f 100644 --- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs +++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/TitleTheFixture.cs @@ -80,9 +80,7 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests [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 (A&E)")] - [TestCase("The Climax: I (Almost) Got Away With It (2016)", "Climax- I (Almost) Got Away With It, The (2016)")] - - //[TestCase("", "")] + [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 name, string expected) { _author.Name = name;