Merge pull request #52 from yueyinqiu/tests

fix unit tests

Author: magiccodingman

E2eTest/SingleRecordBasicTest.cs

@@ -24,13 +24,13 @@ public async Task AddTest()
             [
                 {
                     "id":12,
-                    "Normal":"Norm",
+                    "normal":"Norm",
                     "Renamed":"R",
                     "Index":"I",
                     "UniqueIndex":"633a97d2-0c92-4c68-883b-364f94ad6030",
-                    "Enum":0,
-                    "Nested":{"Value":1234},
-                    "LargeNumber":9007199254740991
+                    "enum":0,
+                    "nested":{"value":1234},
+                    "largeNumber":9007199254740991
                 }
             ]
             """, records);
@@ -67,13 +67,13 @@ public async Task UpdateTest()
             [
                 {
                     "id":12,
-                    "Normal":"Updated",
+                    "normal":"Updated",
                     "Renamed":"R",
                     "Index":"I",
                     "UniqueIndex":"633a97d2-0c92-4c68-883b-364f94ad6030",
-                    "Enum":0,
-                    "Nested":{"Value":1234},
-                    "LargeNumber":9007199254740991
+                    "enum":0,
+                    "nested":{"value":1234},
+                    "largeNumber":9007199254740991
                 }
             ]
             """, records);
@@ -103,7 +103,7 @@ public async Task GetAllTest()
                 "Id":12,
                 "Normal":"Norm",
                 "ShouldBeRenamed":"R",
-                "Ignored":true,
+                "Ignored":false,
                 "Index":"I",
                 "UniqueIndex":"633a97d2-0c92-4c68-883b-364f94ad6030",
                 "Enum":0,

E2eTestWebApp/TestPages/SingleRecordBasicTestPage.cs

@@ -12,7 +12,10 @@ namespace E2eTestWebApp.TestPages;
 [Route("/SingleRecordBasicTest")]
 public class SingleRecordBasicTestPage(IMagicDbFactory magic) : TestPageBase
 {
-    private record NestedItem(int Value);
+    private class NestedItem
+    {
+        public int Value { get; set; }
+    }
 
     [MagicTable("Records", null)]
     private class Record
@@ -49,7 +52,7 @@ private class Record
         Index = "I",
         UniqueIndex = Guid.Parse("633A97D2-0C92-4C68-883B-364F94AD6030"),
         Enum = DayOfWeek.Sunday,
-        Nested = new(1234),
+        Nested = new() { Value = 1234 },
         LargeNumber = 9007199254740991
     };
 

Magic.IndexedDb/Factories/MagicDbFactory.cs

@@ -6,47 +6,65 @@ namespace Magic.IndexedDb.Factories
 {
     public class MagicDbFactory : IMagicDbFactory, IAsyncDisposable
     {
-        readonly Task<IJSObjectReference> _jsRuntime;
+        Lazy<Task<IJSObjectReference>>? _jsRuntime;
         readonly IServiceProvider _serviceProvider;
-        readonly IDictionary<string, IndexedDbManager> _databases = new Dictionary<string, IndexedDbManager>();
+        readonly Dictionary<string, IndexedDbManager> _databases = new();
 
         public MagicDbFactory(IServiceProvider serviceProvider, IJSRuntime jSRuntime)
         {
             _serviceProvider = serviceProvider;
-            this._jsRuntime = jSRuntime.InvokeAsync<IJSObjectReference>(
+            this._jsRuntime = new(() => jSRuntime.InvokeAsync<IJSObjectReference>(
                 "import",
-                "./_content/Magic.IndexedDb/magicDB.js").AsTask();
+                "./_content/Magic.IndexedDb/magicDB.js").AsTask());
         }
         public async ValueTask DisposeAsync()
         {
-            var js = await _jsRuntime;
+            var js = _jsRuntime;
+            _jsRuntime = null;
+
+            if (js is null || !js.IsValueCreated)
+                return;
+
+            IJSObjectReference module;
             try
             {
-                var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-                await js.InvokeVoidAsync(IndexedDbFunctions.CLOSE_ALL, timeout.Token);
+                module = await js.Value;
             }
             catch
             {
-                // do nothing here
+                return;
+            }
+
+            try
+            {
+                var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+                await module.InvokeVoidAsync(IndexedDbFunctions.CLOSE_ALL, timeout.Token);
+            }
+            finally
+            {
+                await module.DisposeAsync();
             }
-            await js.DisposeAsync();
         }
 
         public async ValueTask<IndexedDbManager> OpenAsync(
             DbStore dbStore, bool force = false, 
             CancellationToken cancellationToken = default)
         {
+            ObjectDisposedException.ThrowIf(_jsRuntime is null, this);
+
             if (force || !_databases.ContainsKey(dbStore.Name))
             {
                 var db = await IndexedDbManager.CreateAndOpenAsync(
-                    dbStore, await _jsRuntime, cancellationToken);
+                    dbStore, await _jsRuntime.Value, cancellationToken);
                 _databases[dbStore.Name] = db;
             }
             return _databases[dbStore.Name];
         }
 
         public IndexedDbManager Get(string dbName)
         {
+            ObjectDisposedException.ThrowIf(_jsRuntime is null, this);
+
             if (_databases.TryGetValue(dbName, out var db))
                 return db;
             throw new MagicException(

TestWasm/Models/Person.cs

@@ -3,9 +3,16 @@
 
 namespace TestWasm.Models
 {
+    public class Nested
+    {
+        public string Value { get; set; } = "abc";
+    }
+
     [MagicTable("Person", DbNames.Client)]
     public class Person
     {
+        public Nested Nested { get; set; } = new Nested();
+
         [MagicPrimaryKey("id")]
         public int _Id { get; set; }