Lower test warnings, better testing semantics, more test utils

Author: LucDeCaf

Tests/PowerSync/PowerSync.Common.Tests/Client/PowerSyncDatabaseTests.cs

@@ -47,49 +47,51 @@ private record CountResult(long count);
 
     private class AssetResult
     {
-        public string id { get; set; }
-        public string description { get; set; }
+        public string id { get; set; } = "";
+        public string description { get; set; } = "";
         public string? make { get; set; }
     }
 
     [Fact]
     public async Task QueryWithoutParams()
     {
-        var name = "Test User";
-        var age = 30;
+        var id = Guid.NewGuid().ToString();
+        var description = "some desc";
+        var make = "some make";
 
         await db.Execute(
             "INSERT INTO assets(id, description, make) VALUES(?, ?, ?)",
-            [Guid.NewGuid().ToString(), name, age.ToString()]
+            [id, description, make]
         );
 
         var result = await db.GetAll<AssetResult>("SELECT id, description, make FROM assets");
 
         Assert.Single(result);
         var row = result.First();
-        Assert.Equal(name, row.description);
-        Assert.Equal(age.ToString(), row.make);
+        Assert.Equal(id, row.id);
+        Assert.Equal(description, row.description);
+        Assert.Equal(make, row.make);
     }
 
     [Fact]
     public async Task QueryWithParams()
     {
         var id = Guid.NewGuid().ToString();
-        var name = "Test User";
-        var age = 30;
+        var description = "some desc";
+        var make = "some make";
 
         await db.Execute(
             "INSERT INTO assets(id, description, make) VALUES(?, ?, ?)",
-            [id, name, age.ToString()]
+            [id, description, make]
         );
 
         var result = await db.GetAll<AssetResult>("SELECT id, description, make FROM assets WHERE id = ?", [id]);
 
         Assert.Single(result);
         var row = result.First();
         Assert.Equal(id, row.id);
-        Assert.Equal(name, row.description);
-        Assert.Equal(age.ToString(), row.make);
+        Assert.Equal(description, row.description);
+        Assert.Equal(make, row.make);
     }
 
     [Fact]
@@ -113,26 +115,26 @@ await db.Execute(
     }
 
     [Fact]
-    public async Task QueriesRunOnAnotherThread()
+    public async Task QueriesDoNotBlockCaller()
     {
-        int preCallThreadId = Environment.CurrentManagedThreadId;
-        await db.GetAll("select * from assets");
-        int postCallThreadId = Environment.CurrentManagedThreadId;
+        var writeTask = db.WriteLock(async ctx =>
+        {
+            // Simulate slow query
+            await Task.Delay(200);
+        });
 
-        Assert.NotEqual(preCallThreadId, postCallThreadId);
+        Assert.False(writeTask.IsCompleted, "Write task with 200ms delay completed synchronously instead of yielding");
+        await writeTask;
     }
 
     [Fact]
     public async Task FailedInsert()
     {
-        var name = "Test User";
-        var age = 30;
-
         var exception = await Assert.ThrowsAsync<SqliteException>(async () =>
         {
             await db.Execute(
                 "INSERT INTO assetsfail (id, description, make) VALUES(?, ?, ?)",
-                [Guid.NewGuid().ToString(), name, age.ToString()]
+                [Guid.NewGuid().ToString(), "some desc", "some make"]
             );
         });
 
@@ -598,20 +600,14 @@ public async Task Watch_Cancelled()
         Assert.True(await sem.WaitAsync(100));
         Assert.Equal(1, callCount);
 
-        await db.Execute(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [Guid.NewGuid().ToString(), "some desc", "some make"]
-        );
+        await TestUtils.InsertRandomAsset(db);
 
         Assert.True(await sem.WaitAsync(100));
         Assert.Equal(2, callCount);
 
         testCts.Cancel();
 
-        await db.Execute(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [Guid.NewGuid().ToString(), "some desc", "some make"]
-        );
+        await TestUtils.InsertRandomAsset(db);
 
         // This is failing
         Assert.False(await sem.WaitAsync(100));
@@ -644,20 +640,14 @@ void RunQuery(CancellationTokenSource cts, SemaphoreSlim sem)
         RunQuery(ctsAlwaysRunning, semAlwaysRunning);
         RunQuery(ctsCancelled, semCancelled);
 
-        await db.Execute(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [Guid.NewGuid().ToString(), "some desc", "some make"]
-        );
+        await TestUtils.InsertRandomAsset(db);
         await Task.WhenAll(semAlwaysRunning.WaitAsync(), semCancelled.WaitAsync());
         Assert.Equal(2, callCount);
 
         // Close one query
         ctsCancelled.Cancel();
 
-        await db.Execute(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [Guid.NewGuid().ToString(), "some desc", "some make"]
-        );
+        await TestUtils.InsertRandomAsset(db);
 
         // Ensure nothing received from cancelled result
         Assert.False(await semCancelled.WaitAsync(100));
@@ -668,10 +658,7 @@ await db.Execute(
         // Sanity check
         ctsAlwaysRunning.Cancel();
 
-        await db.Execute(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [Guid.NewGuid().ToString(), "some desc", "some make"]
-        );
+        await TestUtils.InsertRandomAsset(db);
 
         Assert.False(await semAlwaysRunning.WaitAsync(100));
         Assert.False(await semCancelled.WaitAsync(100));
@@ -718,10 +705,7 @@ public async Task Watch_SchemaReset()
 
             for (int i = 0; i < 3; i++)
             {
-                await db.Execute(
-                    "insert into assets(id, description, make) values (?, ?, ?)",
-                    [Guid.NewGuid().ToString(), "some desc", "some make"]
-                );
+                await TestUtils.InsertRandomAsset(db);
                 Assert.True(await sem.WaitAsync(100));
                 Assert.Equal(i + 1, lastCount);
             }
@@ -774,7 +758,7 @@ public async Task Attributes_ColumnAliasing()
             var createdAt = DateTimeOffset.Now;
 
             await db.Execute(
-                "INSERT INTO todos(id, description, completed, created_at, list_id) VALUES(?, ?, ?, ?, uuid())",
+                "INSERT INTO todos (id, description, completed, created_at) VALUES (?, ?, ?, ?)",
                 [id, description, completed, createdAt]
             );
 
@@ -811,14 +795,7 @@ public async Task IndexesCreatedOnTable()
     public async Task Watch_TriggerImmediately_True()
     {
         // Insert some data
-        await db.ExecuteBatch(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-            ]
-        );
+        await TestUtils.InsertRandomAssets(db, 3);
 
         var listener = db.Watch<CountResult>(
             "SELECT COUNT(*) AS count FROM assets",
@@ -851,14 +828,7 @@ public async Task Watch_TriggerImmediately_False()
         Assert.Equal(timeout, await Task.WhenAny(moveNext, timeout));
 
         // Trigger the watch to run
-        await db.ExecuteBatch(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-            ]
-        );
+        await TestUtils.InsertRandomAssets(db, 3);
 
         timeout = Task.Delay(500);
         Assert.NotEqual(timeout, await Task.WhenAny(moveNext, timeout));
@@ -880,21 +850,15 @@ public async Task Watch_CancelsOnTokenCancellation()
             null,
             new() { Signal = cts.Token, TriggerImmediately = false });
 
+        // Sem == received result
+        // TCS == received cancellation
         _ = Task.Run(async () =>
         {
             await foreach (var _ in listener) { sem.Release(); }
             tcs.TrySetResult(true);
         });
 
-        await db.ExecuteBatch(
-            "insert into assets(id, description, make) values (?, ?, ?)",
-            [
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-                [Guid.NewGuid().ToString(), "some desc", "some make"],
-            ]
-        );
-
+        await TestUtils.InsertRandomAssets(db, 3);
         Assert.True(await sem.WaitAsync(200));
 
         cts.Cancel();

Tests/PowerSync/PowerSync.Common.Tests/Models/List.cs

@@ -7,14 +7,14 @@ namespace PowerSync.Common.Tests.Models;
 public class List
 {
     [Column("id")]
-    public string ListId { get; set; }
+    public string ListId { get; set; } = "";
 
     [Column("created_at")]
     public DateTime CreatedAt { get; set; }
 
     [Column("name")]
-    public string Name { get; set; }
+    public string Name { get; set; } = "";
 
     [Column("owner_id")]
-    public string OwnerId { get; set; }
+    public string OwnerId { get; set; } = "";
 }

Tests/PowerSync/PowerSync.Common.Tests/Models/Todo.cs

@@ -10,10 +10,10 @@ namespace PowerSync.Common.Tests.Models;
 public class Todo
 {
     [Column("id")]
-    public string TodoId { get; set; }
+    public string TodoId { get; set; } = "";
 
     [Column("list_id")]
-    public string ListId { get; set; }
+    public string ListId { get; set; } = "";
 
     [Column("created_at")]
     public DateTime CreatedAt { get; set; }
@@ -22,10 +22,10 @@ public class Todo
     public DateTime? CompletedAt { get; set; }
 
     [Column("description")]
-    public string Description { get; set; }
+    public string Description { get; set; } = "";
 
     [Column("created_by")]
-    public string CreatedBy { get; set; }
+    public string CreatedBy { get; set; } = "";
 
     [Column("completed_by")]
     public string? CompletedBy { get; set; }

Tests/PowerSync/PowerSync.Common.Tests/Utils/TestUtils.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
+using PowerSync.Common.Client;
 
 namespace PowerSync.Common.Tests.Utils;
 
@@ -44,4 +45,30 @@ public static async Task WaitForAsync(Func<Task<bool>> condition, TimeSpan? time
         }
         throw new TimeoutException("Condition not met within timeout");
     }
+
+    public static async Task<string> InsertRandomAsset(PowerSyncDatabase db)
+    {
+        var id = Guid.NewGuid().ToString();
+        await db.Execute(
+            "insert into assets(id, description, make) values (?, ?, ?)",
+            [id, "some desc", "some make"]
+        );
+        return id;
+    }
+
+    public static async Task<string[]> InsertRandomAssets(PowerSyncDatabase db, int assetCount)
+    {
+        var ids = Enumerable
+            .Range(0, assetCount)
+            .Select(_ => Guid.NewGuid().ToString())
+            .ToArray();
+        var parameters = ids
+            .Select<string, object?[]>(id => [id, "some desc", "some make"])
+            .ToArray();
+        await db.ExecuteBatch(
+            "insert into assets(id, description, make) values (?, ?, ?)",
+            parameters
+        );
+        return ids;
+    }
 }