Move test stuff to a tastbase that can be inported by the servertests and the e2e tests

Ard2025 · Ard2025 · commit 630f657949fd · 2025-06-19T18:47:50.000+02:00
diff --git a/E2eTest/CursorTest.cs b/E2eTest/CursorTest.cs
diff --git a/E2eTestWebApp/E2eTestWebApp.csproj b/E2eTestWebApp/E2eTestWebApp.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Magic.IndexedDb\Magic.IndexedDb.csproj" />
+    <ProjectReference Include="..\TestBase\TestBase.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/E2eTestWebApp/TestPages/TestPageBase.razor.cs b/E2eTestWebApp/TestPages/TestPageBase.razor.cs
@@ -1,3 +1,5 @@
+using TestBase.Helpers;
+
 namespace E2eTestWebApp.TestPages;
 
 partial class TestPageBase
@@ -36,4 +38,10 @@ private void Clear()
     {
         this.output = "";
     }
+    
+    private bool RunTest<T>(string testName,
+        IEnumerable<T> indexDbResults, IEnumerable<T> correctResults) where T : class
+    {
+        return TestValidator.ValidateLists(correctResults, indexDbResults).Success;
+    }
 }
diff --git a/Magic.IndexedDb.sln b/Magic.IndexedDb.sln
@@ -15,6 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer", "TestServer\Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestServer.Client", "TestServer\TestServer.Client\TestServer.Client.csproj", "{D34C8E12-2846-4F93-B51F-D68FCC2A850F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestBase", "TestBase\TestBase.csproj", "{6F5DD4C3-CCC8-4E79-8FA1-D334DED6A5A3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -45,6 +47,10 @@ Global
 		{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D34C8E12-2846-4F93-B51F-D68FCC2A850F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F5DD4C3-CCC8-4E79-8FA1-D334DED6A5A3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F5DD4C3-CCC8-4E79-8FA1-D334DED6A5A3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F5DD4C3-CCC8-4E79-8FA1-D334DED6A5A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F5DD4C3-CCC8-4E79-8FA1-D334DED6A5A3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TestBase/Helpers/AllPaths.cs b/TestBase/Helpers/AllPaths.cs
@@ -1,6 +1,7 @@
 ﻿using System.Linq.Expressions;
+using Magic.IndexedDb;
 
-namespace Magic.IndexedDb.Testing.Helpers;
+namespace TestBase.Helpers;
 
 public class QueryTestBlueprint<T>
 {
diff --git a/TestBase/Helpers/MagicQueryPathWalker.cs b/TestBase/Helpers/MagicQueryPathWalker.cs
@@ -1,6 +1,7 @@
-﻿using Magic.IndexedDb.Interfaces;
+﻿using Magic.IndexedDb;
+using Magic.IndexedDb.Interfaces;
 
-namespace Magic.IndexedDb.Testing.Helpers;
+namespace TestBase.Helpers;
 
 internal static class MagicInMemoryExecutor
 {
diff --git a/TestBase/Helpers/TestHelper.cs b/TestBase/Helpers/TestHelper.cs
@@ -1,11 +1,11 @@
-﻿using Magic.IndexedDb.Helpers;
+﻿using System.Reflection;
+using System.Text.Json;
+using Magic.IndexedDb.Helpers;
 using Magic.IndexedDb.Models;
 using Magic.IndexedDb.SchemaAnnotations;
-using Magic.IndexedDb.Testing.Models;
-using System.Reflection;
-using System.Text.Json;
+using TestBase.Models;
 
-namespace Magic.IndexedDb.Testing.Helpers;
+namespace TestBase.Helpers;
 
 public static class TestValidator
 {
diff --git a/TestBase/Models/TestResponse.cs b/TestBase/Models/TestResponse.cs
@@ -1,4 +1,4 @@
-﻿namespace Magic.IndexedDb.Testing.Models;
+﻿namespace TestBase.Models;
 
 public class TestResponse
 {
diff --git a/TestBase/SnapshotBuilder/BuildTools.cs b/TestBase/SnapshotBuilder/BuildTools.cs
@@ -1,8 +1,9 @@
-﻿using Magic.IndexedDb.Helpers;
-using System.Reflection;
+﻿using System.Reflection;
 using System.Text.Json;
+using Magic.IndexedDb;
+using Magic.IndexedDb.Helpers;
 
-namespace Magic.IndexedDb.SnapshotBuilder;
+namespace TestBase.SnapshotBuilder;
 
 public static class BuildTools
 {
diff --git a/TestServer/TestServer/Components/Pages/CarTests.razor b/TestServer/TestServer/Components/Pages/CarTests.razor
@@ -1,7 +1,7 @@
 ﻿@page "/CarTests"
 @using Magic.IndexedDb
-@using Magic.IndexedDb.Testing.Helpers
-@using Magic.IndexedDb.Testing.Models
+@using TestBase.Helpers
+@using TestBase.Models
 @using TestWasm.Models
 @using System.Linq;
 @rendermode InteractiveServer
diff --git a/TestServer/TestServer/Components/Pages/Home.razor b/TestServer/TestServer/Components/Pages/Home.razor
@@ -1,9 +1,9 @@
 ﻿@page "/"
 @using Magic.IndexedDb
-@using Magic.IndexedDb.Testing.Helpers
-@using Magic.IndexedDb.Testing.Models
 @using TestWasm.Models
 @using System.Linq;
+@using TestBase.Helpers
+@using TestBase.Models
 @rendermode InteractiveServer
 
 @inject IMagicIndexedDb _MagicDb
diff --git a/TestServer/TestServer/TestServer.csproj b/TestServer/TestServer/TestServer.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\Magic.IndexedDb\Magic.IndexedDb.csproj" />
+    <ProjectReference Include="..\..\TestBase\TestBase.csproj" />
     <ProjectReference Include="..\TestServer.Client\TestServer.Client.csproj" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.3" />
     <PackageReference Include="MudBlazor" Version="8.7.0" />
diff --git a/TestWasm/Pages/Home.razor b/TestWasm/Pages/Home.razor
@@ -1,11 +1,11 @@
 ﻿@page "/"
 @using Magic.IndexedDb
-@using Magic.IndexedDb.Testing.Helpers
-@using Magic.IndexedDb.Testing.Models
 @using TestWasm.Models
 @using TestWasm.Repository
 @using System.Linq;
-@using TestWasm.Share;
+@using TestBase.Helpers
+@using TestBase.Models
+@using TestWasm.Share
 
 @inject IMagicIndexedDb _MagicDb
 
diff --git a/TestWasm/Share/PanelCustomTests.razor b/TestWasm/Share/PanelCustomTests.razor
@@ -1,6 +1,6 @@
 ﻿@using Magic.IndexedDb
-@using Magic.IndexedDb.Testing.Helpers
-@using Magic.IndexedDb.Testing.Models
+@using TestBase.Helpers
+@using TestBase.Models
 @using TestWasm.Models
 @inject IMagicIndexedDb _MagicDb
 
diff --git a/TestWasm/Share/PanelUnitTests.razor b/TestWasm/Share/PanelUnitTests.razor
@@ -1,7 +1,7 @@
 ﻿@using Magic.IndexedDb
 @using Magic.IndexedDb.Interfaces
-@using Magic.IndexedDb.Testing.Helpers
-@using Magic.IndexedDb.Testing.Models
+@using TestBase.Helpers
+@using TestBase.Models
 @typeparam TItem where TItem : class, IMagicTableBase, new()
 @inject IMagicIndexedDb _MagicDb
 
diff --git a/TestWasm/TestWasm.csproj b/TestWasm/TestWasm.csproj
@@ -14,6 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Magic.IndexedDb\Magic.IndexedDb.csproj" />
+    <ProjectReference Include="..\TestBase\TestBase.csproj" />
   </ItemGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+using TestBase.Helpers;`
	`2`	`+`
`1`	`3`	`namespace E2eTestWebApp.TestPages;`
`2`	`4`
`3`	`5`	`partial class TestPageBase`
`@@ -36,4 +38,10 @@ private void Clear()`
`36`	`38`	`{`
`37`	`39`	`this.output = "";`
`38`	`40`	`}`
	`41`	`+`
	`42`	`+ private bool RunTest<T>(string testName,`
	`43`	`+ IEnumerable<T> indexDbResults, IEnumerable<T> correctResults) where T : class`
	`44`	`+ {`
	`45`	`+ return TestValidator.ValidateLists(correctResults, indexDbResults).Success;`
	`46`	`+ }`
`39`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Linq.Expressions;`
	`2`	`+using Magic.IndexedDb;`
`2`	`3`
`3`		`-namespace Magic.IndexedDb.Testing.Helpers;`
	`4`	`+namespace TestBase.Helpers;`
`4`	`5`
`5`	`6`	`public class QueryTestBlueprint<T>`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-using Magic.IndexedDb.Interfaces;`
	`1`	`+using Magic.IndexedDb;`
	`2`	`+using Magic.IndexedDb.Interfaces;`
`2`	`3`
`3`		`-namespace Magic.IndexedDb.Testing.Helpers;`
	`4`	`+namespace TestBase.Helpers;`
`4`	`5`
`5`	`6`	`internal static class MagicInMemoryExecutor`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Magic.IndexedDb.Testing.Models;`
	`1`	`+namespace TestBase.Models;`
`2`	`2`
`3`	`3`	`public class TestResponse`
`4`	`4`	`{`