From e72e924c4032d38e326423f21f22135ed8f53fe9 Mon Sep 17 00:00:00 2001
From: jvyden <jvyden@jvyden.xyz>
Date: Thu, 28 Jul 2022 16:15:46 -0400
Subject: [PATCH] Remove PL.Tests dependency on all server projects

Should allow slightly faster parallelized builds.
---
 .../ProjectLighthouse.Tests.GameApiTests.csproj             | 1 +
 .../Tests/AuthenticationTests.cs                            | 3 ++-
 ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs | 3 ++-
 ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs    | 3 ++-
 ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs     | 3 ++-
 ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs   | 3 ++-
 .../ProjectLighthouse.Tests.WebsiteTests.csproj             | 1 +
 ProjectLighthouse.Tests/LighthouseServerTest.cs             | 6 ++----
 ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj      | 3 ---
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
index a1a4cfad..3c4dfda8 100644
--- a/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
+++ b/ProjectLighthouse.Tests.GameApiTests/ProjectLighthouse.Tests.GameApiTests.csproj
@@ -27,6 +27,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\ProjectLighthouse.Servers.GameServer\ProjectLighthouse.Servers.GameServer.csproj" />
         <ProjectReference Include="..\ProjectLighthouse.Tests\ProjectLighthouse.Tests.csproj" />
         <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj" />
     </ItemGroup>
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs
index 70fcf8bc..b81102d5 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/AuthenticationTests.cs
@@ -4,12 +4,13 @@ using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.Configuration;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Tests;
 using Xunit;
 
 namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
-public class AuthenticationTests : LighthouseServerTest
+public class AuthenticationTests : LighthouseServerTest<GameServerTestStartup>
 {
     [Fact]
     public async Task ShouldReturnErrorOnNoPostData()
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs
index ef3fd8dd..7959c255 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/DatabaseTests.cs
@@ -3,12 +3,13 @@ using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Tests;
 using Xunit;
 
 namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
-public class DatabaseTests : LighthouseServerTest
+public class DatabaseTests : LighthouseServerTest<GameServerTestStartup>
 {
     [DatabaseFact]
     public async Task CanCreateUserTwice()
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs
index 4bcf3324..f79bf007 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/MatchTests.cs
@@ -5,12 +5,13 @@ using System.Threading;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Tests;
 using Xunit;
 
 namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
-public class MatchTests : LighthouseServerTest
+public class MatchTests : LighthouseServerTest<GameServerTestStartup>
 {
     private static readonly SemaphoreSlim semaphore = new(1, 1);
 
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs
index f9d96442..7ff8326d 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/SlotTests.cs
@@ -6,12 +6,13 @@ using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.Levels;
 using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.PlayerData.Profiles;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Tests;
 using Xunit;
 
 namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
-public class SlotTests : LighthouseServerTest
+public class SlotTests : LighthouseServerTest<GameServerTestStartup>
 {
     [DatabaseFact]
     public async Task ShouldOnlyShowUsersLevels()
diff --git a/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs b/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs
index ddfa5043..8787ba4d 100644
--- a/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs
+++ b/ProjectLighthouse.Tests.GameApiTests/Tests/UploadTests.cs
@@ -4,12 +4,13 @@ using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using LBPUnion.ProjectLighthouse.PlayerData;
+using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
 using LBPUnion.ProjectLighthouse.Tests;
 using Xunit;
 
 namespace ProjectLighthouse.Tests.GameApiTests.Tests;
 
-public class UploadTests : LighthouseServerTest
+public class UploadTests : LighthouseServerTest<GameServerTestStartup>
 {
     public UploadTests()
     {
diff --git a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj
index be7ef808..3c950839 100644
--- a/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj
+++ b/ProjectLighthouse.Tests.WebsiteTests/ProjectLighthouse.Tests.WebsiteTests.csproj
@@ -29,6 +29,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\ProjectLighthouse.Servers.Website\ProjectLighthouse.Servers.Website.csproj" />
         <ProjectReference Include="..\ProjectLighthouse.Tests\ProjectLighthouse.Tests.csproj" />
         <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj" />
     </ItemGroup>
diff --git a/ProjectLighthouse.Tests/LighthouseServerTest.cs b/ProjectLighthouse.Tests/LighthouseServerTest.cs
index bd18d63d..cb3df9f1 100644
--- a/ProjectLighthouse.Tests/LighthouseServerTest.cs
+++ b/ProjectLighthouse.Tests/LighthouseServerTest.cs
@@ -7,8 +7,6 @@ using System.Xml.Serialization;
 using LBPUnion.ProjectLighthouse.Helpers;
 using LBPUnion.ProjectLighthouse.PlayerData;
 using LBPUnion.ProjectLighthouse.Serialization;
-using LBPUnion.ProjectLighthouse.Servers.GameServer.Startup;
-using LBPUnion.ProjectLighthouse.Types;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.EntityFrameworkCore;
@@ -16,14 +14,14 @@ using Microsoft.EntityFrameworkCore;
 namespace LBPUnion.ProjectLighthouse.Tests;
 
 [SuppressMessage("ReSharper", "UnusedMember.Global")]
-public class LighthouseServerTest
+public class LighthouseServerTest<TStartup> where TStartup : class
 {
     public readonly HttpClient Client;
     public readonly TestServer Server;
 
     public LighthouseServerTest()
     {
-        this.Server = new TestServer(new WebHostBuilder().UseStartup<GameServerTestStartup>());
+        this.Server = new TestServer(new WebHostBuilder().UseStartup<TStartup>());
         this.Client = this.Server.CreateClient();
     }
     public async Task<HttpResponseMessage> AuthenticateResponse(int number = -1, bool createUser = true)
diff --git a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
index 7b85a6a0..b0f43b1c 100644
--- a/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
+++ b/ProjectLighthouse.Tests/ProjectLighthouse.Tests.csproj
@@ -35,9 +35,6 @@
         <Content Include="ExampleFiles\**">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
-        <ProjectReference Include="..\ProjectLighthouse.Servers.API\ProjectLighthouse.Servers.API.csproj" />
-        <ProjectReference Include="..\ProjectLighthouse.Servers.GameServer\ProjectLighthouse.Servers.GameServer.csproj" />
-        <ProjectReference Include="..\ProjectLighthouse.Servers.Website\ProjectLighthouse.Servers.Website.csproj" />
         <ProjectReference Include="..\ProjectLighthouse\ProjectLighthouse.csproj" />
     </ItemGroup>
 </Project>