From 2f8d15ed08015e58fea0842fea9591111b823a9c Mon Sep 17 00:00:00 2001
From: Luca Benini <lbenini@gmail.com>
Date: Sat, 13 Feb 2021 19:40:15 +0100
Subject: Moved test to Jellyfin.Server.Implementation.Tests as by review

Aligned code base to review comments:
	Jellyfin.Server.Implementation.Tests is the correct place
---
 .../BaseItem/BaseItemKindTests.cs                  | 62 ++++++++++++++++++++++
 tests/Jellyfin.Server.Tests/BaseItemKindTests.cs   | 62 ----------------------
 .../Jellyfin.Server.Tests.csproj                   | 48 -----------------
 3 files changed, 62 insertions(+), 110 deletions(-)
 create mode 100644 tests/Jellyfin.Server.Implementations.Tests/BaseItem/BaseItemKindTests.cs
 delete mode 100644 tests/Jellyfin.Server.Tests/BaseItemKindTests.cs
 delete mode 100644 tests/Jellyfin.Server.Tests/Jellyfin.Server.Tests.csproj

(limited to 'tests')

diff --git a/tests/Jellyfin.Server.Implementations.Tests/BaseItem/BaseItemKindTests.cs b/tests/Jellyfin.Server.Implementations.Tests/BaseItem/BaseItemKindTests.cs
new file mode 100644
index 000000000..3f56c82f4
--- /dev/null
+++ b/tests/Jellyfin.Server.Implementations.Tests/BaseItem/BaseItemKindTests.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using MediaBrowser.Controller.Entities;
+using Xunit;
+
+namespace Jellyfin.Server.Implementations.Tests.BaseItem
+{
+    public class BaseItemKindTests
+    {
+        [Theory]
+        [ClassData(typeof(GetBaseItemDescendant))]
+        public void BaseKindEnumTest(Type baseItemDescendantType)
+        {
+            var defaultConstructor = baseItemDescendantType.GetConstructor(Type.EmptyTypes);
+
+            Assert.NotNull(defaultConstructor);
+            if (defaultConstructor != null)
+            {
+                var instance = (MediaBrowser.Controller.Entities.BaseItem)defaultConstructor.Invoke(null);
+                var exception = Record.Exception(() => instance.GetBaseItemKind());
+                Assert.Null(exception);
+            }
+        }
+
+        private static bool IsProjectAssemblyName(string? name)
+        {
+            if (name == null)
+            {
+                return false;
+            }
+
+            return name.Contains("Jellyfin", StringComparison.InvariantCulture)
+                || name.Contains("Emby", StringComparison.InvariantCulture)
+                || name.Contains("MediaBrowser", StringComparison.InvariantCulture)
+                || name.Contains("RSSDP", StringComparison.InvariantCulture);
+        }
+
+        private class GetBaseItemDescendant : IEnumerable<object?[]>
+        {
+            public IEnumerator<object?[]> GetEnumerator()
+            {
+                var projectAssemblies = AppDomain.CurrentDomain.GetAssemblies()
+                    .Where(x => IsProjectAssemblyName(x.FullName));
+
+                foreach (var projectAssembly in projectAssemblies)
+                {
+                    var baseItemDescendantTypes = projectAssembly.GetTypes()
+                         .Where(targetType => targetType.IsClass && !targetType.IsAbstract && targetType.IsSubclassOf(typeof(MediaBrowser.Controller.Entities.BaseItem)));
+
+                    foreach (var descendantType in baseItemDescendantTypes)
+                    {
+                        yield return new object?[] { descendantType };
+                    }
+                }
+            }
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+    }
+}
diff --git a/tests/Jellyfin.Server.Tests/BaseItemKindTests.cs b/tests/Jellyfin.Server.Tests/BaseItemKindTests.cs
deleted file mode 100644
index 282760bf9..000000000
--- a/tests/Jellyfin.Server.Tests/BaseItemKindTests.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using MediaBrowser.Controller.Entities;
-using Xunit;
-
-namespace Jellyfin.Server.Tests
-{
-    public class BaseItemKindTests
-    {
-        [Theory]
-        [ClassData(typeof(GetBaseItemDescendant))]
-        public void BaseKindEnumTest(Type baseItemDescendantType)
-        {
-            var defaultConstructor = baseItemDescendantType.GetConstructor(Type.EmptyTypes);
-
-            Assert.NotNull(defaultConstructor);
-            if (defaultConstructor != null)
-            {
-                var instance = (BaseItem)defaultConstructor.Invoke(null);
-                var exception = Record.Exception(() => instance.GetBaseItemKind());
-                Assert.Null(exception);
-            }
-        }
-
-        private static bool IsProjectAssemblyName(string? name)
-        {
-            if (name == null)
-            {
-                return false;
-            }
-
-            return name.Contains("Jellyfin", StringComparison.InvariantCulture)
-                || name.Contains("Emby", StringComparison.InvariantCulture)
-                || name.Contains("MediaBrowser", StringComparison.InvariantCulture)
-                || name.Contains("RSSDP", StringComparison.InvariantCulture);
-        }
-
-        private class GetBaseItemDescendant : IEnumerable<object?[]>
-        {
-            public IEnumerator<object?[]> GetEnumerator()
-            {
-                var projectAssemblies = AppDomain.CurrentDomain.GetAssemblies()
-                    .Where(x => IsProjectAssemblyName(x.FullName));
-
-                foreach (var projectAssembly in projectAssemblies)
-                {
-                    var baseItemDescendantTypes = projectAssembly.GetTypes()
-                         .Where(targetType => targetType.IsClass && !targetType.IsAbstract && targetType.IsSubclassOf(typeof(BaseItem)));
-
-                    foreach (var descendantType in baseItemDescendantTypes)
-                    {
-                        yield return new object?[] { descendantType };
-                    }
-                }
-            }
-
-            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
-        }
-    }
-}
diff --git a/tests/Jellyfin.Server.Tests/Jellyfin.Server.Tests.csproj b/tests/Jellyfin.Server.Tests/Jellyfin.Server.Tests.csproj
deleted file mode 100644
index 55f600502..000000000
--- a/tests/Jellyfin.Server.Tests/Jellyfin.Server.Tests.csproj
+++ /dev/null
@@ -1,48 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
-  <PropertyGroup>
-    <ProjectGuid>{0FD15BDA-FA63-4FFF-9E6B-781F20DA88D9}</ProjectGuid>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
-    <IsPackable>false</IsPackable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Nullable>enable</Nullable>
-    <RootNamespace>Jellyfin.Server.Tests</RootNamespace>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="Test Data\**\*.*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="AutoFixture" Version="4.15.0" />
-    <PackageReference Include="AutoFixture.AutoMoq" Version="4.15.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="Moq" Version="4.16.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-    <PackageReference Include="coverlet.collector" Version="3.0.2" />
-  </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="..\..\Jellyfin.Server\Jellyfin.Server.csproj" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <CodeAnalysisRuleSet>../jellyfin-tests.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-
-</Project>
-- 
cgit v1.2.3