fix and remove a few more tests

4 files changed, 19 insertions, 32 deletions

diff --git a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
index eb69d915c..a79e2cf61 100644
--- a/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Music/MultiDiscAlbumTests.cs
@@ -10,18 +10,27 @@ namespace Jellyfin.Naming.Tests.Music
         public void TestMultiDiscAlbums()
         {
             Assert.False(IsMultiDiscAlbumFolder(@"blah blah"));
-            Assert.False(IsMultiDiscAlbumFolder(@"d:/music\weezer/03 Pinkerton"));
-            Assert.False(IsMultiDiscAlbumFolder(@"d:/music/michael jackson/Bad (2012 Remaster)"));
+            Assert.False(IsMultiDiscAlbumFolder(@"D:/music/weezer/03 Pinkerton"));
+            Assert.False(IsMultiDiscAlbumFolder(@"D:/music/michael jackson/Bad (2012 Remaster)"));
 
             Assert.True(IsMultiDiscAlbumFolder(@"cd1"));
-            Assert.True(IsMultiDiscAlbumFolder(@"disc1"));
-            Assert.True(IsMultiDiscAlbumFolder(@"disk1"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disc18"));
+            Assert.True(IsMultiDiscAlbumFolder(@"disk10"));
+            Assert.True(IsMultiDiscAlbumFolder(@"vol7"));
+            Assert.True(IsMultiDiscAlbumFolder(@"volume1"));
 
-            // Add a space
             Assert.True(IsMultiDiscAlbumFolder(@"cd 1"));
             Assert.True(IsMultiDiscAlbumFolder(@"disc 1"));
             Assert.True(IsMultiDiscAlbumFolder(@"disk 1"));
 
+            Assert.False(IsMultiDiscAlbumFolder(@"disk"));
+            Assert.False(IsMultiDiscAlbumFolder(@"disk ·"));
+            Assert.False(IsMultiDiscAlbumFolder(@"disk a"));
+
+            Assert.False(IsMultiDiscAlbumFolder(@"disk volume"));
+            Assert.False(IsMultiDiscAlbumFolder(@"disc disc"));
+            Assert.False(IsMultiDiscAlbumFolder(@"disk disc 6"));
+
             Assert.True(IsMultiDiscAlbumFolder(@"cd  - 1"));
             Assert.True(IsMultiDiscAlbumFolder(@"disc- 1"));
             Assert.True(IsMultiDiscAlbumFolder(@"disk - 1"));
@@ -38,7 +47,7 @@ namespace Jellyfin.Naming.Tests.Music
         [Fact]
         public void TestMultiDiscAlbums1()
         {
-            Assert.False(IsMultiDiscAlbumFolder(@"[1985] Oppurtunities (Let's make lots of money) (1985)"));
+            Assert.False(IsMultiDiscAlbumFolder(@"[1985] Opportunities (Let's make lots of money) (1985)"));
         }
 
         [Fact]
diff --git a/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs b/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs
index e8f14cdc4..41da889c2 100644
--- a/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Subtitles/SubtitleParserTests.cs
@@ -22,7 +22,6 @@ namespace Jellyfin.Naming.Tests.Subtitles
             Test("The Skin I Live In (2011).eng.forced.srt", "eng", false, true);
             Test("The Skin I Live In (2011).eng.foreign.srt", "eng", false, true);
             Test("The Skin I Live In (2011).eng.default.foreign.srt", "eng", true, true);
-
             Test("The Skin I Live In (2011).default.foreign.eng.srt", "eng", true, true);
         }
 
diff --git a/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs
index 1ae637281..837b23455 100644
--- a/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs
+++ b/tests/Jellyfin.Naming.Tests/TV/EpisodeNumberTests.cs
@@ -61,21 +61,6 @@ namespace Jellyfin.Naming.Tests.TV
         }
 
         [Fact]
-        public void TestEpisodeNumber50()
-        {
-            // This convention is not currently supported, just adding in case we want to look at it in the future
-            Assert.Equal(1, GetEpisodeNumberFromFile(@"2016/Season s2016e1.mp4"));
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestEpisodeNumber51()
-        {
-            // This convention is not currently supported, just adding in case we want to look at it in the future
-            Assert.Equal(1, GetEpisodeNumberFromFile(@"2016/Season 2016x1.mp4"));
-        }
-
-        [Fact]
         public void TestEpisodeNumber52()
         {
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode - 16.avi"));
@@ -84,29 +69,25 @@ namespace Jellyfin.Naming.Tests.TV
         [Fact]
         public void TestEpisodeNumber53()
         {
-            // This is not supported. Expected to fail, although it would be a good one to add support for.
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16.avi"));
         }
 
         [Fact]
         public void TestEpisodeNumber54()
         {
-            // This is not supported. Expected to fail, although it would be a good one to add support for.
             Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Episode 16 - Some Title.avi"));
         }
 
-        // [Fact]
+        [Fact]
         public void TestEpisodeNumber55()
         {
-            // This is not supported. Expected to fail, although it would be a good one to add support for.
-            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16.avi"));
+            Assert.NotEqual(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16.avi"));
         }
 
-        // [Fact]
+        [Fact]
         public void TestEpisodeNumber56()
         {
-            // This is not supported. Expected to fail, although it would be a good one to add support for.
-            Assert.Equal(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16 - Some Title.avi"));
+            Assert.NotEqual(16, GetEpisodeNumberFromFile(@"Season 2/Season 3 Episode 16 - Some Title.avi"));
         }
 
         [Fact]
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
index bb2afea16..f62d3dcbc 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
+++ b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
@@ -2,9 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
-
         <IsPackable>false</IsPackable>
-
         <RootNamespace>Jellyfin.Server.Implementations.Tests</RootNamespace>
     </PropertyGroup>