From 81a01aac407875c766a545f6bb2e906e6ec05985 Mon Sep 17 00:00:00 2001 From: Krystian Chmura Date: Sun, 12 May 2024 13:51:25 +0200 Subject: [PATCH] review feedback * skip tests on windows * move db consts at the top of the file * print connection string for debugging * verify future (ideal) status codes&messages instead of the current wrong stuff --- rogueserver_test.go | 51 ++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/rogueserver_test.go b/rogueserver_test.go index 42b9374..03e23a3 100644 --- a/rogueserver_test.go +++ b/rogueserver_test.go @@ -11,6 +11,7 @@ import ( "net/http" "net/http/httptest" "net/url" + "runtime" "strings" "testing" @@ -20,11 +21,22 @@ import ( "github.com/testcontainers/testcontainers-go/modules/mariadb" ) +const ( + dbImage = "mariadb:11" + dbName = "pokeroguedb" + dbUsername = "pokerogue" + dbPassword = "pokerogue" +) + func TestRogueServer(t *testing.T) { if testing.Short() { t.Skip("skipping test in short mode") } + if runtime.GOOS == "windows" { + t.Skip("testcontainers-go does not support windows") + } + setupDB(t) apiURL := runServer(t) @@ -35,12 +47,12 @@ func TestRogueServer(t *testing.T) { t.Run("/account/register", func(t *testing.T) { t.Run("invalid username", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/register", nil, url.Values{"username": {""}, "password": {"password"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "invalid username\n") + resp.assertStringResponse(t, http.StatusBadRequest, "invalid username\n") }) t.Run("invalid password", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/register", nil, url.Values{"username": {"username"}, "password": {"1"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "invalid password\n") + resp.assertStringResponse(t, http.StatusBadRequest, "invalid password\n") }) t.Run("register", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/register", nil, url.Values{"username": {username}, "password": {oldPassword}}) @@ -48,30 +60,29 @@ func TestRogueServer(t *testing.T) { }) t.Run("fail when register called for already registered user", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/register", nil, url.Values{"username": {username}, "password": {oldPassword}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "failed to add account record: Error 1062 (23000): Duplicate entry 'user1234' for key 'username'\n") + resp.assertStringResponse(t, http.StatusConflict, `username "username" already taken`) }) - }) var token string t.Run("/account/login", func(t *testing.T) { t.Run("invalid username", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/login", nil, url.Values{"username": {""}, "password": {"password"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "invalid username\n") + resp.assertStringResponse(t, http.StatusBadRequest, "invalid username\n") }) t.Run("invalid password", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/login", nil, url.Values{"username": {"username"}, "password": {"1"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "invalid password\n") + resp.assertStringResponse(t, http.StatusBadRequest, "invalid password\n") }) t.Run("user do not exist", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/login", nil, url.Values{"username": {"notexist"}, "password": {"123456"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "account doesn't exist\n") + resp.assertStringResponse(t, http.StatusNotFound, "account doesn't exist\n") }) t.Run("bad password", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/login", nil, url.Values{"username": {username}, "password": {"badpassword"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "password doesn't match\n") + resp.assertStringResponse(t, http.StatusUnauthorized, "password doesn't match\n") }) t.Run("login successfully", func(t *testing.T) { @@ -113,12 +124,12 @@ func TestRogueServer(t *testing.T) { }) t.Run("success", func(t *testing.T) { resp := getHTTP(t, apiURL, "/account/logout", authHeader(token)) - resp.assertStatusCode(t, http.StatusOK) + resp.assertStatusCode(t, http.StatusNoContent) }) t.Run("do nothing on second logout", func(t *testing.T) { resp := getHTTP(t, apiURL, "/account/logout", authHeader(token)) - resp.assertStatusCode(t, http.StatusOK) + resp.assertStatusCode(t, http.StatusNoContent) }) }) @@ -135,7 +146,7 @@ func TestRogueServer(t *testing.T) { t.Run("fail on unlogged token", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/changepw", authHeader(token), url.Values{"password": {newPassword}}) - resp.assertStringResponse(t, http.StatusBadRequest, "failed to validate token: sql: no rows in result set\n") + resp.assertStringResponse(t, http.StatusUnauthorized, "bad token") }) t.Run("login successfully once again", func(t *testing.T) { @@ -149,12 +160,12 @@ func TestRogueServer(t *testing.T) { t.Run("bad password", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/changepw", authHeader(token), url.Values{"password": {"123"}}) - resp.assertStringResponse(t, http.StatusInternalServerError, "invalid password\n") + resp.assertStringResponse(t, http.StatusBadRequest, "invalid password\n") }) t.Run("success", func(t *testing.T) { resp := postHttpForm(t, apiURL, "/account/changepw", authHeader(token), url.Values{"password": {newPassword}}) - resp.assertStatusCode(t, http.StatusOK) + resp.assertStatusCode(t, http.StatusNoContent) }) }) }) @@ -259,15 +270,11 @@ func setupDB(t *testing.T) { t.Helper() ctx := context.Background() - const dbName = "pokeroguedb" - const username = "pokerogue" - const password = "pokerogue" - c, err := mariadb.RunContainer(ctx, - testcontainers.WithImage("mariadb:11"), + testcontainers.WithImage(dbImage), mariadb.WithDatabase(dbName), - mariadb.WithUsername(username), - mariadb.WithPassword(password), + mariadb.WithUsername(dbUsername), + mariadb.WithPassword(dbPassword), ) require.NoError(t, err) @@ -280,6 +287,8 @@ func setupDB(t *testing.T) { host, err := c.Host(ctx) require.NoError(t, err) - err = db.Init(username, password, "tcp", net.JoinHostPort(host, port.Port()), dbName) + err = db.Init(dbUsername, dbPassword, "tcp", net.JoinHostPort(host, port.Port()), dbName) require.NoError(t, err) + + t.Logf("connection string to db for debugging (valid until tests are running): %s", c.MustConnectionString(ctx)) }