Merge remote-tracking branch 'upstream/api-migration' into api-dlna-server

4 files changed, 108 insertions, 18 deletions

diff --git a/tests/Jellyfin.Server.Implementations.Tests/HttpServer/ResponseFilterTests.cs b/tests/Jellyfin.Server.Implementations.Tests/HttpServer/ResponseFilterTests.cs
new file mode 100644
index 0000000000..39bd94b598
--- /dev/null
+++ b/tests/Jellyfin.Server.Implementations.Tests/HttpServer/ResponseFilterTests.cs
@@ -0,0 +1,18 @@
+using Emby.Server.Implementations.HttpServer;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.HttpServer
+{
+    public class ResponseFilterTests
+    {
+        [Theory]
+        [InlineData(null, null)]
+        [InlineData("", "")]
+        [InlineData("This is a clean string.", "This is a clean string.")]
+        [InlineData("This isn't \n\ra clean string.", "This isn't a clean string.")]
+        public void RemoveControlCharacters_ValidArgs_Correct(string? input, string? result)
+        {
+            Assert.Equal(result, ResponseFilter.RemoveControlCharacters(input));
+        }
+    }
+}
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 b7865439c7..03187f4b9c 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
+++ b/tests/Jellyfin.Server.Implementations.Tests/Jellyfin.Server.Implementations.Tests.csproj
@@ -1,24 +1,41 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-      <TargetFramework>netcoreapp3.1</TargetFramework>
-      <IsPackable>false</IsPackable>
-      <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-      <Nullable>enable</Nullable>
-      <RootNamespace>Jellyfin.Server.Implementations.Tests</RootNamespace>
-    </PropertyGroup>
+  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
+  <PropertyGroup>
+    <ProjectGuid>{2E3A1B4B-4225-4AAA-8B29-0181A84E7AEE}</ProjectGuid>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Include="AutoFixture" Version="4.11.0" />
-      <PackageReference Include="AutoFixture.AutoMoq" Version="4.11.0" />
-      <PackageReference Include="Moq" Version="4.13.1" />
-      <PackageReference Include="xunit" Version="2.4.1" />
-      <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
-      <PackageReference Include="coverlet.collector" Version="1.2.1" />
-    </ItemGroup>
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Nullable>enable</Nullable>
+    <RootNamespace>Jellyfin.Server.Implementations.Tests</RootNamespace>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <ProjectReference Include="..\..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="AutoFixture" Version="4.13.0" />
+    <PackageReference Include="AutoFixture.AutoMoq" Version="4.12.0" />
+    <PackageReference Include="Moq" Version="4.14.5" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="coverlet.collector" Version="1.3.0" />
+  </ItemGroup>
+
+  <!-- Code Analyzers -->
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="All" />
+    <PackageReference Include="SerilogAnalyzer" Version="0.15.0" PrivateAssets="All" />
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
+    <PackageReference Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" PrivateAssets="All" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
 
 </Project>
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/IgnorePatternsTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/IgnorePatternsTests.cs
new file mode 100644
index 0000000000..c145ddc9d7
--- /dev/null
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/IgnorePatternsTests.cs
@@ -0,0 +1,28 @@
+using Emby.Server.Implementations.Library;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.Library
+{
+    public class IgnorePatternsTests
+    {
+        [Theory]
+        [InlineData("/media/small.jpg", true)]
+        [InlineData("/media/albumart.jpg", true)]
+        [InlineData("/media/movie.sample.mp4", true)]
+        [InlineData("/media/movies/#Recycle/test.txt", true)]
+        [InlineData("/media/movies/#recycle/", true)]
+        [InlineData("/media/movies/#recycle", true)]
+        [InlineData("thumbs.db", true)]
+        [InlineData(@"C:\media\movies\movie.avi", false)]
+        [InlineData("/media/.hiddendir/file.mp4", true)]
+        [InlineData("/media/dir/.hiddenfile.mp4", true)]
+        [InlineData("/volume1/video/Series/@eaDir", true)]
+        [InlineData("/volume1/video/Series/@eaDir/file.txt", true)]
+        [InlineData("/directory/@Recycle", true)]
+        [InlineData("/directory/@Recycle/file.mp3", true)]
+        public void PathIgnored(string path, bool expected)
+        {
+            Assert.Equal(expected, IgnorePatterns.ShouldIgnore(path));
+        }
+    }
+}
diff --git a/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
new file mode 100644
index 0000000000..c771f5f4ae
--- /dev/null
+++ b/tests/Jellyfin.Server.Implementations.Tests/Library/PathExtensionsTests.cs
@@ -0,0 +1,27 @@
+using System;
+using Emby.Server.Implementations.Library;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.Library
+{
+    public class PathExtensionsTests
+    {
+        [Theory]
+        [InlineData("Superman: Red Son [imdbid=tt10985510]", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son - tt10985510", "imdbid", "tt10985510")]
+        [InlineData("Superman: Red Son", "imdbid", null)]
+        public void GetAttributeValue_ValidArgs_Correct(string input, string attribute, string? expectedResult)
+        {
+            Assert.Equal(expectedResult, PathExtensions.GetAttributeValue(input, attribute));
+        }
+
+        [Theory]
+        [InlineData("", "")]
+        [InlineData("Superman: Red Son [imdbid=tt10985510]", "")]
+        [InlineData("", "imdbid")]
+        public void GetAttributeValue_EmptyString_ThrowsArgumentException(string input, string attribute)
+        {
+            Assert.Throws<ArgumentException>(() => PathExtensions.GetAttributeValue(input, attribute));
+        }
+    }
+}