Refine

user/manager_test.go

@@ -4,8 +4,6 @@ import (
 	"database/sql"
 	"fmt"
 	"net/netip"
-	"net/url"
-	"os"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -13,7 +11,8 @@ import (
 
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/bcrypt"
-	"heckel.io/ntfy/v2/postgres"
+	"heckel.io/ntfy/v2/db"
+	dbtest "heckel.io/ntfy/v2/db/test"
 	"heckel.io/ntfy/v2/util"
 )
 
@@ -34,36 +33,11 @@ func forEachBackend(t *testing.T, f func(t *testing.T, newStore newStoreFunc)) {
 		})
 	})
 	t.Run("postgres", func(t *testing.T) {
-		dsn := os.Getenv("NTFY_TEST_DATABASE_URL")
-		if dsn == "" {
-			t.Skip("NTFY_TEST_DATABASE_URL not set")
-		}
-		schema := fmt.Sprintf("test_%s", util.RandomString(10))
-		u, err := url.Parse(dsn)
-		require.Nil(t, err)
-		q := u.Query()
-		q.Set("pool_max_conns", "2")
-		u.RawQuery = q.Encode()
-		dsn = u.String()
-		setupDB, err := postgres.OpenDB(dsn)
-		require.Nil(t, err)
-		_, err = setupDB.Exec(fmt.Sprintf("CREATE SCHEMA %s", schema))
-		require.Nil(t, err)
-		require.Nil(t, setupDB.Close())
-		q.Set("search_path", schema)
-		u.RawQuery = q.Encode()
-		schemaDSN := u.String()
-		t.Cleanup(func() {
-			cleanDB, _ := postgres.OpenDB(dsn)
-			if cleanDB != nil {
-				cleanDB.Exec(fmt.Sprintf("DROP SCHEMA %s CASCADE", schema))
-				cleanDB.Close()
-			}
-		})
+		schemaDSN := dbtest.CreateTestSchema(t)
 		f(t, func() Store {
-			db, err := postgres.OpenDB(schemaDSN)
+			pool, err := db.Open(schemaDSN)
 			require.Nil(t, err)
-			store, err := NewPostgresStore(db)
+			store, err := NewPostgresStore(pool)
 			require.Nil(t, err)
 			return store
 		})