1 files changed, 36 insertions, 124 deletions
diff --git a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
index cd90ac236..fde06c5a1 100644
--- a/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
+++ b/tests/Jellyfin.Naming.Tests/Video/CleanStringTests.cs
@@ -1,133 +1,45 @@
 using System;
-using System.Globalization;
+using Emby.Naming.Common;
+using Emby.Naming.Video;
 using Xunit;
 
 namespace Jellyfin.Naming.Tests.Video
 {
-    public class CleanStringTests : BaseVideoTest
+    public sealed class CleanStringTests
     {
-        // FIXME
-        // [Fact]
-        public void TestCleanString()
-        {
-            Test("Super movie 480p.mp4", "Super movie");
-            Test("Super movie 480p 2001.mp4", "Super movie");
-            Test("Super movie [480p].mp4", "Super movie");
-            Test("480 Super movie [tmdbid=12345].mp4", "480 Super movie");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestCleanString1()
-        {
-            Test("Super movie(2009).mp4", "Super movie(2009).mp4");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestCleanString2()
-        {
-            Test("Run lola run (lola rennt) (2009).mp4", "Run lola run (lola rennt) (2009).mp4");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestStringWithoutDate()
-        {
-            Test(@"American.Psycho.mkv", "American.Psycho.mkv");
-            Test(@"American Psycho.mkv", "American Psycho.mkv");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestNameWithBrackets()
-        {
-            Test(@"[rec].mkv", "[rec].mkv");
-        }
-
-        // FIXME
-        // [Fact]
-        public void Test4k()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.4k.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestUltraHd()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.UltraHD.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestUHd()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.UHD.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestHDR()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.HDR.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestHDC()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestHDC1()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon-HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestBDrip()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.BDrip.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestBDripHDC()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.BDrip-HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestMulti()
-        {
-            Test("Crouching.Tiger.Hidden.Dragon.4K.UltraHD.HDR.BDrip-HDC.mkv", "Crouching.Tiger.Hidden.Dragon");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestLeadingBraces()
-        {
-            // Not actually supported, just reported by a user
-            Test("[0004] - After The Sunset.el.mkv", "After The Sunset");
-        }
-
-        // FIXME
-        // [Fact]
-        public void TestTrailingBraces()
-        {
-            Test("After The Sunset - [0004].mkv", "After The Sunset");
-        }
-
-        private void Test(string input, string expectedName)
-        {
-            var result = GetParser().CleanString(input).ToString();
-
-            Assert.Equal(expectedName, result, true);
+        private readonly NamingOptions _namingOptions = new NamingOptions();
+
+        [Theory]
+        [InlineData("Super movie 480p.mp4", "Super movie")]
+        [InlineData("Super movie 480p 2001.mp4", "Super movie")]
+        [InlineData("Super movie [480p].mp4", "Super movie")]
+        [InlineData("480 Super movie [tmdbid=12345].mp4", "480 Super movie")]
+        [InlineData("Super movie(2009).mp4", "Super movie(2009).mp4")]
+        [InlineData("Run lola run (lola rennt) (2009).mp4", "Run lola run (lola rennt) (2009).mp4")]
+        [InlineData(@"American.Psycho.mkv", "American.Psycho.mkv")]
+        [InlineData(@"American Psycho.mkv", "American Psycho.mkv")]
+        [InlineData(@"[rec].mkv", "[rec].mkv")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.4k.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.UltraHD.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.UHD.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.HDR.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.HDC.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon-HDC.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.BDrip.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.BDrip-HDC.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        [InlineData("Crouching.Tiger.Hidden.Dragon.4K.UltraHD.HDR.BDrip-HDC.mkv", "Crouching.Tiger.Hidden.Dragon")]
+        // FIXME: [InlineData("After The Sunset - [0004].mkv", "After The Sunset")]
+        public void CleanStringTest(string input, string expectedName)
+        {
+            if (new VideoResolver(_namingOptions).TryCleanString(input, out ReadOnlySpan<char> newName))
+            {
+                // TODO: compare spans when XUnit supports it
+                Assert.Equal(expectedName, newName.ToString());
+            }
+            else
+            {
+                Assert.Equal(expectedName, input);
+            }
         }
     }
 }