Move Mock into Impl

edgegamers · Aug 31, 2024 · 0485d90 · 0485d90
1 parent 756950b
commit 0485d90
Show file tree

Hide file tree

Showing 22 changed files with 50 additions and 23 deletions.
diff --git a/Gangs.sln b/Gangs.sln
@@ -6,7 +6,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsPlugin", "GangsPlugin\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GangsTest", "GangsTest\GangsTest.csproj", "{B1D1E7C7-BDF3-4238-9025-4FEB2B7DAB89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mock", "Mock\Mock.csproj", "{140E1706-30E8-4440-AAA0-56E8DD32F054}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mock", "GangsImpl\Mock\Mock.csproj", "{140E1706-30E8-4440-AAA0-56E8DD32F054}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GangsImpl", "GangsImpl", "{3AB7703F-880F-4A41-96EE-B891FA888C65}"
 EndProject

diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/.gitignore b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/.gitignore
diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/encodings.xml b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/encodings.xml
diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/indexLayout.xml b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/indexLayout.xml
diff --git a/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/vcs.xml b/GangsImpl/Mock/.idea/.idea.Mock.dir/.idea/vcs.xml
diff --git a/Mock/MemoryImpl.cs → GangsImpl/Mock/MemoryImpl.cs b/Mock/MemoryImpl.cs → GangsImpl/Mock/MemoryImpl.cs
@@ -2,7 +2,7 @@
 using GangsAPI.Services;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public static class MemoryImpl {
   public static void AddMemoryImpl(this IServiceCollection collection) {

diff --git a/Mock/Mock.csproj → GangsImpl/Mock/Mock.csproj b/Mock/Mock.csproj → GangsImpl/Mock/Mock.csproj
@@ -4,10 +4,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
-        <IsPackable>false</IsPackable>
-        <IsTestProject>true</IsTestProject>
-        <RootNamespace>GangsImpl.Memory</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
@@ -23,6 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
+        <ProjectReference Include="..\..\GangsAPI\GangsAPI.csproj" />
         <ProjectReference Include="..\GangsAPI\GangsAPI.csproj"/>
     </ItemGroup>
 

diff --git a/Mock/MockGang.cs → GangsImpl/Mock/MockGang.cs b/Mock/MockGang.cs → GangsImpl/Mock/MockGang.cs
@@ -2,7 +2,7 @@
 using GangsAPI.Data.Stat;
 using GangsAPI.Permissions;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockGang : IGang {
   public MockGang(int id, string name, ulong owner) {

diff --git a/Mock/MockGangManager.cs → GangsImpl/Mock/MockGangManager.cs b/Mock/MockGangManager.cs → GangsImpl/Mock/MockGangManager.cs
@@ -1,7 +1,7 @@
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockGangManager : IGangManager {
   private readonly HashSet<IGang> gangs = [];

diff --git a/Mock/MockGangRank.cs → GangsImpl/Mock/MockGangRank.cs b/Mock/MockGangRank.cs → GangsImpl/Mock/MockGangRank.cs
@@ -1,6 +1,6 @@
 using GangsAPI.Permissions;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockGangRank(int rank, string name,
   IGangRank.Permissions perms = 0) : IGangRank {

diff --git a/Mock/MockInstanceStatManager.cs → GangsImpl/Mock/MockInstanceStatManager.cs b/Mock/MockInstanceStatManager.cs → GangsImpl/Mock/MockInstanceStatManager.cs
@@ -1,7 +1,7 @@
 using GangsAPI.Data.Stat;
 using GangsAPI.Services;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockInstanceStatManager(IStatManager mgr)
   : IPlayerStatManager, IGangStatManager {

diff --git a/Mock/MockPlayer.cs → GangsImpl/Mock/MockPlayer.cs b/Mock/MockPlayer.cs → GangsImpl/Mock/MockPlayer.cs
@@ -2,7 +2,7 @@
 using GangsAPI.Data.Stat;
 using GangsAPI.Permissions;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockPlayer(ulong steam) : IGangPlayer {
   public ulong Steam { get; } = steam;

diff --git a/Mock/MockPlayerManager.cs → GangsImpl/Mock/MockPlayerManager.cs b/Mock/MockPlayerManager.cs → GangsImpl/Mock/MockPlayerManager.cs
@@ -1,7 +1,7 @@
 using GangsAPI.Data.Gang;
 using GangsAPI.Services;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockPlayerManager : IPlayerManager {
   private readonly Dictionary<ulong, IGangPlayer> players = new();

diff --git a/Mock/MockStat.cs → GangsImpl/Mock/MockStat.cs b/Mock/MockStat.cs → GangsImpl/Mock/MockStat.cs
@@ -1,6 +1,6 @@
 using GangsAPI.Data.Stat;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockStat(string statId, string name, string? desc) : IStat {
   public string StatId { get; } = statId;

diff --git a/Mock/MockStatManager.cs → GangsImpl/Mock/MockStatManager.cs b/Mock/MockStatManager.cs → GangsImpl/Mock/MockStatManager.cs
@@ -1,7 +1,7 @@
 using GangsAPI.Data.Stat;
 using GangsAPI.Services;
 
-namespace GangsImpl.Memory;
+namespace Mock;
 
 public class MockStatManager : IStatManager {
   private readonly HashSet<IStat> cachedStats = [], backendStats = [];

diff --git a/GangsImpl/SQLite/SQLiteStatManager.cs b/GangsImpl/SQLite/SQLiteStatManager.cs
@@ -2,7 +2,7 @@
 using GenericDB;
 using Microsoft.Data.Sqlite;
 
-namespace GangsImpl.SQLLite;
+namespace SQLite;
 
 public class SQLiteStatManager(string connectionString,
   string table = "gang_stats", bool testing = false)

diff --git a/GangsTest/GangTests/GangManagerData.cs b/GangsTest/GangTests/GangManagerData.cs
@@ -1,6 +1,6 @@
 using System.Collections;
 using GangsAPI;
-using GangsImpl.Memory;
+using Mock;
 
 namespace GangsTest.GangTests;
 

diff --git a/GangsTest/GangTests/GangManagerTests.cs b/GangsTest/GangTests/GangManagerTests.cs
@@ -1,5 +1,5 @@
 using GangsAPI.Services;
-using GangsImpl.Memory;
+using Mock;
 
 namespace GangsTest.GangTests;
 

diff --git a/GangsTest/GangTests/GangMutabilityTests.cs b/GangsTest/GangTests/GangMutabilityTests.cs
@@ -1,5 +1,5 @@
 using GangsAPI.Services;
-using GangsImpl.Memory;
+using Mock;
 
 namespace GangsTest.GangTests;
 

diff --git a/GangsTest/GangsTest.csproj b/GangsTest/GangsTest.csproj
@@ -19,7 +19,6 @@
 
     <ItemGroup>
         <Using Include="Xunit"/>
-        <!-- Disable parallelism for xunit tests -->
     </ItemGroup>
 
     <ItemGroup>
@@ -29,7 +28,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Mock\Mock.csproj"/>
+        <ProjectReference Include="..\GangsImpl\Mock\Mock.csproj"/>
         <ProjectReference Include="..\GangsImpl\SQLite\SQLite.csproj"/>
         <ProjectReference Include="..\GangsImpl\SQL\SQL.csproj"/>
     </ItemGroup>

diff --git a/GangsTest/Startup.cs b/GangsTest/Startup.cs
@@ -1,6 +1,6 @@
 using GangsAPI.Services;
-using GangsImpl.Memory;
 using Microsoft.Extensions.DependencyInjection;
+using Mock;
 
 namespace GangsTest;
 

diff --git a/GangsTest/StatTests/StatManagerData.cs b/GangsTest/StatTests/StatManagerData.cs
@@ -1,8 +1,8 @@
 using System.Collections;
 using GangsAPI;
-using GangsImpl.Memory;
-using GangsImpl.SQLLite;
+using Mock;
 using SQLImpl;
+using SQLite;
 
 namespace GangsTest.StatTests;