Moving test data and repos to testbase

Ard2025 · Ard2025 · commit 68ef79729965 · 2025-06-19T19:03:16.000+02:00
diff --git a/E2eTest/OpenTest.cs b/E2eTest/OpenTest.cs
@@ -1,6 +1,6 @@
 ﻿using E2eTest.Entities;
 using E2eTest.Extensions;
-using E2eTestWebApp.Models;
+using TestBase.Models;
 using E2eTestWebApp.TestPages;
 using Magic.IndexedDb;
 
diff --git a/E2eTestWebApp/E2eTestWebApp.csproj b/E2eTestWebApp/E2eTestWebApp.csproj
@@ -11,4 +11,13 @@
     <ProjectReference Include="..\TestBase\TestBase.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <_ContentIncludedByDefault Remove="Pages\Error.razor" />
+    <_ContentIncludedByDefault Remove="Pages\Home.razor" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Data\" />
+  </ItemGroup>
+
 </Project>
diff --git a/E2eTestWebApp/Models/Person.cs b/E2eTestWebApp/Models/Person.cs
diff --git a/E2eTestWebApp/Pages/Error.razor b/E2eTestWebApp/Pages/Error.razor
diff --git a/E2eTestWebApp/Pages/Home.razor b/E2eTestWebApp/Pages/Home.razor
diff --git a/E2eTestWebApp/Repository/IndexDbContext.cs b/E2eTestWebApp/Repository/IndexDbContext.cs
diff --git a/E2eTestWebApp/TestPages/CursorTestPage.cs b/E2eTestWebApp/TestPages/CursorTestPage.cs
@@ -2,7 +2,7 @@
 using Magic.IndexedDb.Helpers;
 using Microsoft.AspNetCore.Components;
 using System.Text.Json;
-using E2eTestWebApp.Models;
+using TestBase.Models;
 
 namespace E2eTestWebApp.TestPages;
 
diff --git a/E2eTestWebApp/TestPages/OpenTestPage.cs b/E2eTestWebApp/TestPages/OpenTestPage.cs
@@ -1,7 +1,8 @@
-using E2eTestWebApp.Models;
-using E2eTestWebApp.Repository;
+using TestBase.Models;
+using TestBase.Repository;
 using Magic.IndexedDb;
 using Microsoft.AspNetCore.Components;
+using TestBase.Repository;
 
 namespace E2eTestWebApp.TestPages;
 
diff --git a/E2eTestWebApp/TestPages/SingleRecordBasicTestPage.cs b/E2eTestWebApp/TestPages/SingleRecordBasicTestPage.cs
@@ -3,7 +3,7 @@
 using Microsoft.AspNetCore.Components;
 using Magic.IndexedDb.SchemaAnnotations;
 using System.Text.Json;
-using E2eTestWebApp.Models;
+using TestBase.Models;
 
 namespace E2eTestWebApp.TestPages;
 
diff --git a/E2eTestWebApp/TestPages/WhereTestPage.cs b/E2eTestWebApp/TestPages/WhereTestPage.cs
@@ -2,7 +2,7 @@
 using Magic.IndexedDb.Helpers;
 using Microsoft.AspNetCore.Components;
 using System.Text.Json;
-using E2eTestWebApp.Models;
+using TestBase.Models;
 
 namespace E2eTestWebApp.TestPages;
 
diff --git a/TestBase/Data/PersonData.cs b/TestBase/Data/PersonData.cs
@@ -1,6 +1,6 @@
-﻿using E2eTestWebApp.Models;
+﻿using TestBase.Models;
 
-namespace E2eTestWebApp.Data;
+namespace TestBase.Data;
 
 public static class PersonData
 {
diff --git a/TestBase/Models/Car.cs b/TestBase/Models/Car.cs
@@ -1,7 +1,7 @@
 ﻿using Magic.IndexedDb;
-using TestWasm.Repository;
+using TestBase.Repository;
 
-namespace TestWasm.Models;
+namespace TestBase.Models;
 
 public class Car : MagicTableTool<Car>, IMagicTable<Person.DbSets>
 {
diff --git a/TestBase/Models/DbNames.cs b/TestBase/Models/DbNames.cs
@@ -1,4 +1,4 @@
-﻿namespace TestWasm.Models;
+﻿namespace TestBase.Models;
 
 public static class DbNames
 {
diff --git a/TestBase/Models/Person.cs b/TestBase/Models/Person.cs
@@ -1,29 +1,30 @@
 ﻿using Magic.IndexedDb;
-
 using Magic.IndexedDb.SchemaAnnotations;
-using TestWasm.Repository;
-using static TestWasm.Models.Person;
+using TestBase.Repository;
+using static TestBase.Models.Person;
 
-namespace TestWasm.Models;
+namespace TestBase.Models;
 
 public class Nested
 {
     public string Value { get; set; } = "abc";
 }
 
 
-public class Person : MagicTableTool<Person>, IMagicTable<DbSets>
+public class Person : MagicTableTool<Person>, IMagicTable<Person.DbSets>
 {
     public List<IMagicCompoundIndex> GetCompoundIndexes() =>
         new List<IMagicCompoundIndex>() {
             CreateCompoundIndex(x => x.TestIntStable2, x => x.Name)
         };
 
+    // When using this, the e2e fails, but the Testserver succeeds
     public IMagicCompoundKey GetKeys() =>
         CreateCompoundKey(x => x.TestIntStable2, x => x.TestIntStable);
 
-    //public IMagicCompoundKey GetKeys() =>
-    //    CreatePrimaryKey(x => x._Id, true);
+    // When using this, the e2e succeeds, but the Testserver fails
+    /*public IMagicCompoundKey GetKeys() =>
+        CreatePrimaryKey(x => x._Id, true);*/
 
     public string GetTableName() => "Person";
     public IndexedDbSet GetDefaultDatabase() => IndexDbContext.Client;
diff --git a/TestBase/Repository/IndexDbContext.cs b/TestBase/Repository/IndexDbContext.cs
@@ -1,7 +1,7 @@
 ﻿using Magic.IndexedDb;
 using Magic.IndexedDb.Interfaces;
 
-namespace TestWasm.Repository;
+namespace TestBase.Repository;
 
 public class IndexDbContext : IMagicRepository
 {
diff --git a/TestServer/TestServer/Components/Pages/CarTests.razor b/TestServer/TestServer/Components/Pages/CarTests.razor
@@ -2,7 +2,6 @@
 @using Magic.IndexedDb
 @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,6 +1,5 @@
 ﻿@page "/"
 @using Magic.IndexedDb
-@using TestWasm.Models
 @using System.Linq;
 @using TestBase.Helpers
 @using TestBase.Models
diff --git a/TestWasm/Pages/Home.razor b/TestWasm/Pages/Home.razor
@@ -6,6 +6,7 @@
 @using TestBase.Helpers
 @using TestBase.Models
 @using TestWasm.Share
+@using Person = TestWasm.Models.Person
 
 @inject IMagicIndexedDb _MagicDb
 
diff --git a/TestWasm/Share/PanelCustomTests.razor b/TestWasm/Share/PanelCustomTests.razor
@@ -2,6 +2,7 @@
 @using TestBase.Helpers
 @using TestBase.Models
 @using TestWasm.Models
+@using Person = TestWasm.Models.Person
 @inject IMagicIndexedDb _MagicDb
 
 <MudExpansionPanel>
