From b99349b18c28a1c27b5bd5df30853a3b7c689d02 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Mon, 5 Dec 2022 16:00:02 +0100
Subject: [PATCH] Use test.WithAllDatabases

---
 appservice/appservice_test.go |  2 +-
 userapi/userapi_test.go       | 55 ++++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/appservice/appservice_test.go b/appservice/appservice_test.go
index 72910d8d1..83c551fea 100644
--- a/appservice/appservice_test.go
+++ b/appservice/appservice_test.go
@@ -108,7 +108,7 @@ func TestAppserviceInternalAPI(t *testing.T) {
 	}
 
 	test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
-		base, closeBase := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
+		base, closeBase := testrig.CreateBaseDendrite(t, dbType)
 		defer closeBase()
 
 		// Create a dummy application service
diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go
index 60dd730fd..8a19af195 100644
--- a/userapi/userapi_test.go
+++ b/userapi/userapi_test.go
@@ -27,14 +27,13 @@ import (
 	"golang.org/x/crypto/bcrypt"
 
 	"github.com/matrix-org/dendrite/internal/httputil"
+	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/test"
 	"github.com/matrix-org/dendrite/test/testrig"
 	"github.com/matrix-org/dendrite/userapi"
-	"github.com/matrix-org/dendrite/userapi/inthttp"
-
-	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/dendrite/userapi/api"
 	"github.com/matrix-org/dendrite/userapi/internal"
+	"github.com/matrix-org/dendrite/userapi/inthttp"
 	"github.com/matrix-org/dendrite/userapi/storage"
 )
 
@@ -79,19 +78,6 @@ func MustMakeInternalAPI(t *testing.T, opts apiTestOpts, dbType test.DBType) (ap
 func TestQueryProfile(t *testing.T) {
 	aliceAvatarURL := "mxc://example.com/alice"
 	aliceDisplayName := "Alice"
-	// only one DBType, since userapi.AddInternalRoutes complains about multiple prometheus counters added
-	userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, test.DBTypeSQLite)
-	defer close()
-	_, err := accountDB.CreateAccount(context.TODO(), "alice", serverName, "foobar", "", api.AccountTypeUser)
-	if err != nil {
-		t.Fatalf("failed to make account: %s", err)
-	}
-	if _, _, err := accountDB.SetAvatarURL(context.TODO(), "alice", serverName, aliceAvatarURL); err != nil {
-		t.Fatalf("failed to set avatar url: %s", err)
-	}
-	if _, _, err := accountDB.SetDisplayName(context.TODO(), "alice", serverName, aliceDisplayName); err != nil {
-		t.Fatalf("failed to set display name: %s", err)
-	}
 
 	testCases := []struct {
 		req     api.QueryProfileRequest
@@ -142,19 +128,34 @@ func TestQueryProfile(t *testing.T) {
 		}
 	}
 
-	t.Run("HTTP API", func(t *testing.T) {
-		router := mux.NewRouter().PathPrefix(httputil.InternalPathPrefix).Subrouter()
-		userapi.AddInternalRoutes(router, userAPI, false)
-		apiURL, cancel := test.ListenAndServe(t, router, false)
-		defer cancel()
-		httpAPI, err := inthttp.NewUserAPIClient(apiURL, &http.Client{})
+	test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
+		userAPI, accountDB, close := MustMakeInternalAPI(t, apiTestOpts{}, dbType)
+		defer close()
+		_, err := accountDB.CreateAccount(context.TODO(), "alice", serverName, "foobar", "", api.AccountTypeUser)
 		if err != nil {
-			t.Fatalf("failed to create HTTP client")
+			t.Fatalf("failed to make account: %s", err)
 		}
-		runCases(httpAPI, true)
-	})
-	t.Run("Monolith", func(t *testing.T) {
-		runCases(userAPI, false)
+		if _, _, err := accountDB.SetAvatarURL(context.TODO(), "alice", serverName, aliceAvatarURL); err != nil {
+			t.Fatalf("failed to set avatar url: %s", err)
+		}
+		if _, _, err := accountDB.SetDisplayName(context.TODO(), "alice", serverName, aliceDisplayName); err != nil {
+			t.Fatalf("failed to set display name: %s", err)
+		}
+
+		t.Run("HTTP API", func(t *testing.T) {
+			router := mux.NewRouter().PathPrefix(httputil.InternalPathPrefix).Subrouter()
+			userapi.AddInternalRoutes(router, userAPI, false)
+			apiURL, cancel := test.ListenAndServe(t, router, false)
+			defer cancel()
+			httpAPI, err := inthttp.NewUserAPIClient(apiURL, &http.Client{})
+			if err != nil {
+				t.Fatalf("failed to create HTTP client")
+			}
+			runCases(httpAPI, true)
+		})
+		t.Run("Monolith", func(t *testing.T) {
+			runCases(userAPI, false)
+		})
 	})
 }