From 1fbabe0000c1e9cdcb237afc2dd10a7109f8540a Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Wed, 22 Dec 2021 22:33:50 -0500
Subject: [PATCH] Split normal tests from game api tests

---
 .../AuthenticationTests.cs                    |  5 ++-
 .../DatabaseTests.cs                          |  6 ++-
 .../MatchTests.cs                             |  5 ++-
 ...rojectLighthouse.Tests.GameApiTests.csproj | 41 +++++++++++++++++++
 .../SlotTests.cs                              |  6 ++-
 .../UploadTests.cs                            |  5 ++-
 .../{Tests => }/FileTypeTests.cs              |  0
 ...hthouseTest.cs => LighthouseServerTest.cs} |  4 +-
 .../ProjectLighthouse.Tests.csproj            |  2 +-
 .../{Tests => }/SerializerTests.cs            |  2 +-
 ProjectLighthouse.sln                         | 12 ++++++
 11 files changed, 74 insertions(+), 14 deletions(-)
 rename {ProjectLighthouse.Tests/Tests => ProjectLighthouse.Tests.GameApiTests}/AuthenticationTests.cs (94%)
 rename {ProjectLighthouse.Tests/Tests => ProjectLighthouse.Tests.GameApiTests}/DatabaseTests.cs (81%)
 rename {ProjectLighthouse.Tests/Tests => ProjectLighthouse.Tests.GameApiTests}/MatchTests.cs (93%)
 create mode 100644 ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
 rename {ProjectLighthouse.Tests/Tests => ProjectLighthouse.Tests.GameApiTests}/SlotTests.cs (94%)
 rename {ProjectLighthouse.Tests/Tests => ProjectLighthouse.Tests.GameApiTests}/UploadTests.cs (93%)
 rename ProjectLighthouse.Tests/{Tests => }/FileTypeTests.cs (100%)
 rename ProjectLighthouse.Tests/{LighthouseTest.cs => LighthouseServerTest.cs} (98%)
 rename ProjectLighthouse.Tests/{Tests => }/SerializerTests.cs (96%)

diff --git a/ProjectLighthouse.Tests/Tests/AuthenticationTests.cs b/ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs
similarity index 94%
rename from ProjectLighthouse.Tests/Tests/AuthenticationTests.cs
rename to ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs
index d7f5fd19..05f0c413 100644
--- a/ProjectLighthouse.Tests/Tests/AuthenticationTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/AuthenticationTests.cs
@@ -1,13 +1,14 @@
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse.Tests;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Settings;
 using Xunit;
 
-namespace LBPUnion.ProjectLighthouse.Tests
+namespace ProjectLighthouse.Tests.GameApiTests
 {
-    public class AuthenticationTests : LighthouseTest
+    public class AuthenticationTests : LighthouseServerTest
     {
         [Fact]
         public async Task ShouldReturnErrorOnNoPostData()
diff --git a/ProjectLighthouse.Tests/Tests/DatabaseTests.cs b/ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs
similarity index 81%
rename from ProjectLighthouse.Tests/Tests/DatabaseTests.cs
rename to ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs
index 19416bcb..ccaa758b 100644
--- a/ProjectLighthouse.Tests/Tests/DatabaseTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/DatabaseTests.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Tests;
 using LBPUnion.ProjectLighthouse.Types;
 using Xunit;
 
-namespace LBPUnion.ProjectLighthouse.Tests
+namespace ProjectLighthouse.Tests.GameApiTests
 {
-    public class DatabaseTests : LighthouseTest
+    public class DatabaseTests : LighthouseServerTest
     {
         [DatabaseFact]
         public async Task CanCreateUserTwice()
diff --git a/ProjectLighthouse.Tests/Tests/MatchTests.cs b/ProjectLighthouse.Tests.GameApiTests/MatchTests.cs
similarity index 93%
rename from ProjectLighthouse.Tests/Tests/MatchTests.cs
rename to ProjectLighthouse.Tests.GameApiTests/MatchTests.cs
index 721dc941..c7e83feb 100644
--- a/ProjectLighthouse.Tests/Tests/MatchTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/MatchTests.cs
@@ -4,12 +4,13 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Tests;
 using LBPUnion.ProjectLighthouse.Types;
 using Xunit;
 
-namespace LBPUnion.ProjectLighthouse.Tests
+namespace ProjectLighthouse.Tests.GameApiTests
 {
-    public class MatchTests : LighthouseTest
+    public class MatchTests : LighthouseServerTest
     {
         private static readonly SemaphoreSlim semaphore = new(1, 1);
 
diff --git a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
new file mode 100644
index 00000000..4a5850d3
--- /dev/null
+++ b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0"/>
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0"/>
+        <PackageReference Include="xunit" Version="2.4.1"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\ProjectLighthouse.Tests\ProjectLighthouse.Tests.csproj"/>
+        <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Content Include="..\ProjectLighthouse.Tests\ExampleFiles\**">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+        <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj"/>
+    </ItemGroup>
+
+</Project>
diff --git a/ProjectLighthouse.Tests/Tests/SlotTests.cs b/ProjectLighthouse.Tests.GameApiTests/SlotTests.cs
similarity index 94%
rename from ProjectLighthouse.Tests/Tests/SlotTests.cs
rename to ProjectLighthouse.Tests.GameApiTests/SlotTests.cs
index 4eef03b6..568a9ed4 100644
--- a/ProjectLighthouse.Tests/Tests/SlotTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/SlotTests.cs
@@ -1,15 +1,17 @@
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
+using LBPUnion.ProjectLighthouse.Tests;
 using LBPUnion.ProjectLighthouse.Types;
 using LBPUnion.ProjectLighthouse.Types.Levels;
 using LBPUnion.ProjectLighthouse.Types.Profiles;
 using Xunit;
 
-namespace LBPUnion.ProjectLighthouse.Tests
+namespace ProjectLighthouse.Tests.GameApiTests
 {
-    public class SlotTests : LighthouseTest
+    public class SlotTests : LighthouseServerTest
     {
         [DatabaseFact]
         public async Task ShouldOnlyShowUsersLevels()
diff --git a/ProjectLighthouse.Tests/Tests/UploadTests.cs b/ProjectLighthouse.Tests.GameApiTests/UploadTests.cs
similarity index 93%
rename from ProjectLighthouse.Tests/Tests/UploadTests.cs
rename to ProjectLighthouse.Tests.GameApiTests/UploadTests.cs
index 8c7f0bd5..faac8aa9 100644
--- a/ProjectLighthouse.Tests/Tests/UploadTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/UploadTests.cs
@@ -3,11 +3,12 @@ using System.IO;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
+using LBPUnion.ProjectLighthouse.Tests;
 using Xunit;
 
-namespace LBPUnion.ProjectLighthouse.Tests
+namespace ProjectLighthouse.Tests.GameApiTests
 {
-    public class UploadTests : LighthouseTest
+    public class UploadTests : LighthouseServerTest
     {
         public UploadTests()
         {
diff --git a/ProjectLighthouse.Tests/Tests/FileTypeTests.cs b/ProjectLighthouse.Tests/FileTypeTests.cs
similarity index 100%
rename from ProjectLighthouse.Tests/Tests/FileTypeTests.cs
rename to ProjectLighthouse.Tests/FileTypeTests.cs
diff --git a/ProjectLighthouse.Tests/LighthouseTest.cs b/ProjectLighthouse.Tests/LighthouseServerTest.cs
similarity index 98%
rename from ProjectLighthouse.Tests/LighthouseTest.cs
rename to ProjectLighthouse.Tests/LighthouseServerTest.cs
index dd96dbf0..0a02da01 100644
--- a/ProjectLighthouse.Tests/LighthouseTest.cs
+++ b/ProjectLighthouse.Tests/LighthouseServerTest.cs
@@ -14,12 +14,12 @@ using Microsoft.EntityFrameworkCore;
 namespace LBPUnion.ProjectLighthouse.Tests
 {
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
-    public class LighthouseTest
+    public class LighthouseServerTest
     {
         public readonly HttpClient Client;
         public readonly TestServer Server;
 
-        public LighthouseTest()
+        public LighthouseServerTest()
         {
             this.Server = new TestServer(new WebHostBuilder().UseStartup<TestStartup>());
 
diff --git a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
index 0f656960..91fa33ee 100644
--- a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
+++ b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
@@ -32,9 +32,9 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj"/>
         <Content Include="ExampleFiles\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
+        <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj"/>
     </ItemGroup>
 </Project>
diff --git a/ProjectLighthouse.Tests/Tests/SerializerTests.cs b/ProjectLighthouse.Tests/SerializerTests.cs
similarity index 96%
rename from ProjectLighthouse.Tests/Tests/SerializerTests.cs
rename to ProjectLighthouse.Tests/SerializerTests.cs
index 2c8af05e..39a12ce4 100644
--- a/ProjectLighthouse.Tests/Tests/SerializerTests.cs
+++ b/ProjectLighthouse.Tests/SerializerTests.cs
@@ -4,7 +4,7 @@ using Xunit;
 
 namespace LBPUnion.ProjectLighthouse.Tests
 {
-    public class SerializerTests : LighthouseTest
+    public class SerializerTests
     {
         [Fact]
         public void BlankElementWorks()
diff --git a/ProjectLighthouse.sln b/ProjectLighthouse.sln
index 96db324b..745241a4 100644
--- a/ProjectLighthouse.sln
+++ b/ProjectLighthouse.sln
@@ -4,6 +4,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse", "Projec
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Tests", "ProjectLighthouse.Tests\ProjectLighthouse.Tests.csproj", "{AFC74569-B289-4ACC-B21C-313A3A62C017}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{D360C08E-EA47-43AC-A566-FDF413442980}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProjectLighthouse.Tests.GameApiTests", "ProjectLighthouse.Tests.GameApiTests\ProjectLighthouse.Tests.GameApiTests.csproj", "{200EED99-FE3E-45C6-A51E-76ED9819CA2B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,5 +22,13 @@ Global
 		{AFC74569-B289-4ACC-B21C-313A3A62C017}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFC74569-B289-4ACC-B21C-313A3A62C017}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AFC74569-B289-4ACC-B21C-313A3A62C017}.Release|Any CPU.Build.0 = Release|Any CPU
+		{200EED99-FE3E-45C6-A51E-76ED9819CA2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{200EED99-FE3E-45C6-A51E-76ED9819CA2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{200EED99-FE3E-45C6-A51E-76ED9819CA2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{200EED99-FE3E-45C6-A51E-76ED9819CA2B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{AFC74569-B289-4ACC-B21C-313A3A62C017} = {D360C08E-EA47-43AC-A566-FDF413442980}
+		{200EED99-FE3E-45C6-A51E-76ED9819CA2B} = {D360C08E-EA47-43AC-A566-FDF413442980}
 	EndGlobalSection
 EndGlobal