Improve test robustness and error handling

ocean · ocean · commit 34938b96c1d1 · 2026-01-11T16:46:11.000+11:00
cursor_streaming_large_test.exs:
- Add error handling to fetch_all_ids_acc, fetch_all_cursor_rows_acc,
  and count_batches to report failures clearly instead of CaseClauseError
- Wrap insert_rows in try/after to ensure prepared statement cleanup on error
- Fix on_exit to use conn_id instead of potentially stale state

pool_load_test.exs:
- Capture updated state from handle_execute and use conn_id in on_exit
  for reliable connection cleanup
diff --git a/test/cursor_streaming_large_test.exs b/test/cursor_streaming_large_test.exs
@@ -8,6 +8,7 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
 
   setup do
     {:ok, state} = EctoLibSql.connect(database: ":memory:")
+    conn_id = state.conn_id
 
     # Create a test table for large data
     {:ok, _, _, state} =
@@ -27,7 +28,8 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
       )
 
     on_exit(fn ->
-      EctoLibSql.disconnect([], state)
+      # Use conn_id to ensure we disconnect the correct connection
+      EctoLibSql.disconnect([], %{conn_id: conn_id})
     end)
 
     {:ok, state: state}
@@ -687,7 +689,7 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
         "INSERT INTO large_data (id, batch_id, sequence, value) VALUES (?, ?, ?, ?)"
       )
 
-    state =
+    try do
       Enum.reduce(start_id..end_id, state, fn id, acc_state ->
         value = "value_#{id}_batch_#{batch_id}"
 
@@ -701,10 +703,10 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
 
         acc_state
       end)
-
-    # Clean up prepared statement
-    :ok = EctoLibSql.Native.close_stmt(stmt)
-    state
+    after
+      # Always clean up prepared statement, even on error
+      EctoLibSql.Native.close_stmt(stmt)
+    end
   end
 
   defp fetch_all_rows(state, cursor, query, opts) do
@@ -751,6 +753,9 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
       {:halt, result, _state} ->
         ids = Enum.map(result.rows, fn [id] -> id end)
         [ids | acc]
+
+      {:error, reason, _state} ->
+        flunk("Cursor fetch failed in fetch_all_ids_acc: #{inspect(reason)}")
     end
   end
 
@@ -770,6 +775,9 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
 
       {:halt, result, _state} ->
         [result.rows | acc]
+
+      {:error, reason, _state} ->
+        flunk("Cursor fetch failed in fetch_all_cursor_rows_acc: #{inspect(reason)}")
     end
   end
 
@@ -797,6 +805,9 @@ defmodule EctoLibSql.CursorStreamingLargeTest do
 
       {:halt, _result, _state} ->
         1
+
+      {:error, reason, _state} ->
+        flunk("Cursor fetch failed in count_batches: #{inspect(reason)}")
     end
   end
 end
diff --git a/test/pool_load_test.exs b/test/pool_load_test.exs
@@ -22,16 +22,19 @@ defmodule EctoLibSql.PoolLoadTest do
     # Create test table
     {:ok, state} = EctoLibSql.connect(database: test_db)
 
-    {:ok, _query, _result, _state} =
+    {:ok, _query, _result, state} =
       EctoLibSql.handle_execute(
         "CREATE TABLE test_data (id INTEGER PRIMARY KEY AUTOINCREMENT, value TEXT, duration INTEGER)",
         [],
         [],
         state
       )
 
+    # Capture conn_id for reliable cleanup
+    conn_id = state.conn_id
+
     on_exit(fn ->
-      EctoLibSql.disconnect([], state)
+      EctoLibSql.disconnect([], %{conn_id: conn_id})
       EctoLibSql.TestHelpers.cleanup_db_files(test_db)
     end)
 
