Updated tests

Author: djthorpe

sys/sqlite3/connex.go

@@ -51,6 +51,7 @@ import "C"
 
 import (
 	"errors"
+	"io"
 	"reflect"
 	"sync"
 	"time"
@@ -377,10 +378,10 @@ func (c *ConnEx) ExecEx(q string, fn ExecFunc, v ...interface{}) error {
 		// Result loop
 		for {
 			row, err := r.Next(t...)
-			if err != nil {
-				return err
-			} else if row == nil {
+			if errors.Is(err, io.EOF) || row == nil {
 				break
+			} else if err != nil {
+				return err
 			} else if fn != nil {
 				if fn(stringSliceFromInterface(row, v), n) {
 					// Set abort transaction on next iteration

sys/sqlite3/function_test.go

@@ -1,7 +1,9 @@
 package sqlite3_test
 
 import (
+	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"testing"
@@ -44,10 +46,10 @@ func Test_Func_001(t *testing.T) {
 	t.Log(r)
 	for {
 		row, err := r.Next()
-		if err != nil {
-			t.Error(err)
+		if errors.Is(err, io.EOF) {
 			break
-		} else if row == nil {
+		} else if err != nil {
+			t.Error(err)
 			break
 		}
 		t.Log(row)

sys/sqlite3/sqliteex_test.go

@@ -2,7 +2,9 @@ package sqlite3_test
 
 import (
 	"context"
+	"errors"
 	"fmt"
+	"io"
 	"os"
 	"path/filepath"
 	"testing"
@@ -44,10 +46,10 @@ func Test_SQLiteEx_001(t *testing.T) {
 		}
 		t.Log(r)
 		for {
-			if row, err := r.Next(); err != nil {
-				t.Error(err)
+			if row, err := r.Next(); errors.Is(err, io.EOF) {
 				break
-			} else if row == nil {
+			} else if err != nil {
+				t.Error(err)
 				break
 			} else {
 				t.Log(row)
@@ -73,9 +75,12 @@ func Test_SQLiteEx_002(t *testing.T) {
 	defer cancel()
 	if err := db.SetProgressHandler(1000, func() bool {
 		t.Log("Long running query...")
+		if ctx.Err() != nil {
+			t.Log(" got err=", ctx.Err())
+		}
 		return ctx.Err() != nil
 	}); err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	// Add busy handler with context timeout
@@ -100,23 +105,28 @@ func Test_SQLiteEx_002(t *testing.T) {
 		t.Fatal(err)
 	}
 	defer st.Close()
-	r, err := st.Exec(0, 99999999)
+	r, err := st.Exec(0, int64(99999999))
 	if err != nil && err != sqlite3.SQLITE_INTERRUPT {
 		t.Fatal("Error returned:", err)
-	}
-	if r == nil {
+	} else if err == sqlite3.SQLITE_INTERRUPT {
+		t.Log("Query result interrupted")
+	} else if r == nil {
 		t.Fatal("Unexpected nil return")
 	}
-	t.Log(r)
-	for {
-		row, err := r.Next()
-		if err != nil {
-			t.Fatal(err)
-			break
-		} else if row == nil {
-			break
+	if r != nil {
+		for {
+			row, err := r.Next()
+			if errors.Is(err, io.EOF) {
+				break
+			} else if err != nil {
+				t.Fatal(err)
+				break
+			} else if row == nil {
+				t.Error("Unexpected nil return")
+				break
+			}
+			t.Log(row)
 		}
-		t.Log(row)
 	}
 }