From f0b6aa0d6efc338edd0a2521fc98756ad796f449 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Thu, 19 Dec 2024 23:42:19 +0100 Subject: [PATCH] Setup test logging --- server/internal/app/config_test.go | 2 ++ server/internal/auth/jwt_test.go | 1 + server/internal/auth/middleware.go | 1 - server/internal/auth/middleware_test.go | 1 + server/internal/auth/session_test.go | 1 + server/internal/context/context_test.go | 1 + server/internal/context/middleware_test.go | 1 + server/internal/db/migrations_test.go | 2 ++ server/internal/db/sessions_test.go | 1 + server/internal/db/system_test.go | 1 + server/internal/db/users_test.go | 1 + server/internal/db/workspaces_test.go | 6 +++--- server/internal/handlers/auth_handlers.go | 5 ----- server/internal/handlers/integration_test.go | 2 ++ server/internal/secrets/secrets_test.go | 1 + server/internal/storage/files_test.go | 2 ++ server/internal/storage/filesystem_test.go | 2 ++ server/internal/storage/git_test.go | 1 + server/internal/storage/workspace_test.go | 1 + server/internal/testenv/testenv.go | 9 +++++++++ 20 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 server/internal/testenv/testenv.go diff --git a/server/internal/app/config_test.go b/server/internal/app/config_test.go index 71ae11f..cbf1a8b 100644 --- a/server/internal/app/config_test.go +++ b/server/internal/app/config_test.go @@ -5,6 +5,8 @@ import ( "os" "testing" "time" + + _ "novamd/internal/testenv" ) func TestDefaultConfig(t *testing.T) { diff --git a/server/internal/auth/jwt_test.go b/server/internal/auth/jwt_test.go index 57b9e7e..55e1d44 100644 --- a/server/internal/auth/jwt_test.go +++ b/server/internal/auth/jwt_test.go @@ -6,6 +6,7 @@ import ( "time" "novamd/internal/auth" + _ "novamd/internal/testenv" ) func TestNewJWTService(t *testing.T) { diff --git a/server/internal/auth/middleware.go b/server/internal/auth/middleware.go index e9fe458..617eb62 100644 --- a/server/internal/auth/middleware.go +++ b/server/internal/auth/middleware.go @@ -141,7 +141,6 @@ func (m *Middleware) RequireWorkspaceAccess(next http.Handler) http.Handler { "handler", "RequireWorkspaceAccess", "clientIP", r.RemoteAddr, "userId", ctx.UserID, - "workspaceId", ctx.Workspace.ID, ) // If no workspace in context, allow the request diff --git a/server/internal/auth/middleware_test.go b/server/internal/auth/middleware_test.go index 3bac129..f9a1f6e 100644 --- a/server/internal/auth/middleware_test.go +++ b/server/internal/auth/middleware_test.go @@ -11,6 +11,7 @@ import ( "novamd/internal/auth" "novamd/internal/context" "novamd/internal/models" + _ "novamd/internal/testenv" ) // Mock SessionManager diff --git a/server/internal/auth/session_test.go b/server/internal/auth/session_test.go index 91410fb..8efc14d 100644 --- a/server/internal/auth/session_test.go +++ b/server/internal/auth/session_test.go @@ -8,6 +8,7 @@ import ( "novamd/internal/auth" "novamd/internal/models" + _ "novamd/internal/testenv" ) // Mock SessionStore diff --git a/server/internal/context/context_test.go b/server/internal/context/context_test.go index 8a0d947..3f06d2f 100644 --- a/server/internal/context/context_test.go +++ b/server/internal/context/context_test.go @@ -7,6 +7,7 @@ import ( "testing" "novamd/internal/context" + _ "novamd/internal/testenv" ) func TestGetRequestContext(t *testing.T) { diff --git a/server/internal/context/middleware_test.go b/server/internal/context/middleware_test.go index f57a230..c97969a 100644 --- a/server/internal/context/middleware_test.go +++ b/server/internal/context/middleware_test.go @@ -9,6 +9,7 @@ import ( "novamd/internal/context" "novamd/internal/models" + _ "novamd/internal/testenv" ) // MockDB implements the minimal database interface needed for testing diff --git a/server/internal/db/migrations_test.go b/server/internal/db/migrations_test.go index 7272793..a40da56 100644 --- a/server/internal/db/migrations_test.go +++ b/server/internal/db/migrations_test.go @@ -5,6 +5,8 @@ import ( "novamd/internal/db" + _ "novamd/internal/testenv" + _ "github.com/mattn/go-sqlite3" ) diff --git a/server/internal/db/sessions_test.go b/server/internal/db/sessions_test.go index f5f87eb..b86a58d 100644 --- a/server/internal/db/sessions_test.go +++ b/server/internal/db/sessions_test.go @@ -7,6 +7,7 @@ import ( "novamd/internal/db" "novamd/internal/models" + _ "novamd/internal/testenv" "github.com/google/uuid" ) diff --git a/server/internal/db/system_test.go b/server/internal/db/system_test.go index 2e2ca03..fa1fa83 100644 --- a/server/internal/db/system_test.go +++ b/server/internal/db/system_test.go @@ -9,6 +9,7 @@ import ( "novamd/internal/db" "novamd/internal/models" + _ "novamd/internal/testenv" "github.com/google/uuid" ) diff --git a/server/internal/db/users_test.go b/server/internal/db/users_test.go index e0683ea..c5df793 100644 --- a/server/internal/db/users_test.go +++ b/server/internal/db/users_test.go @@ -6,6 +6,7 @@ import ( "novamd/internal/db" "novamd/internal/models" + _ "novamd/internal/testenv" ) func TestUserOperations(t *testing.T) { diff --git a/server/internal/db/workspaces_test.go b/server/internal/db/workspaces_test.go index 722c7a1..bcbffe7 100644 --- a/server/internal/db/workspaces_test.go +++ b/server/internal/db/workspaces_test.go @@ -1,12 +1,12 @@ package db_test import ( - "database/sql" "strings" "testing" "novamd/internal/db" "novamd/internal/models" + _ "novamd/internal/testenv" ) func TestWorkspaceOperations(t *testing.T) { @@ -385,8 +385,8 @@ func TestWorkspaceOperations(t *testing.T) { // Verify workspace is gone _, err = database.GetWorkspaceByID(workspace.ID) - if err != sql.ErrNoRows { - t.Errorf("expected sql.ErrNoRows, got %v", err) + if !strings.Contains(err.Error(), "workspace not found") { + t.Errorf("expected workspace not found, got %v", err) } }) } diff --git a/server/internal/handlers/auth_handlers.go b/server/internal/handlers/auth_handlers.go index e5861f6..19f38f2 100644 --- a/server/internal/handlers/auth_handlers.go +++ b/server/internal/handlers/auth_handlers.go @@ -199,13 +199,8 @@ func (h *Handler) Logout(authManager auth.SessionManager, cookieService auth.Coo // @Router /auth/refresh [post] func (h *Handler) RefreshToken(authManager auth.SessionManager, cookieService auth.CookieManager) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { - ctx, ok := context.GetRequestContext(w, r) - if !ok { - return - } log := getAuthLogger().With( "handler", "RefreshToken", - "userID", ctx.UserID, "clientIP", r.RemoteAddr, ) diff --git a/server/internal/handlers/integration_test.go b/server/internal/handlers/integration_test.go index 5e91a9d..1cb7f18 100644 --- a/server/internal/handlers/integration_test.go +++ b/server/internal/handlers/integration_test.go @@ -21,6 +21,8 @@ import ( "novamd/internal/models" "novamd/internal/secrets" "novamd/internal/storage" + + _ "novamd/internal/testenv" ) // testHarness encapsulates all the dependencies needed for testing diff --git a/server/internal/secrets/secrets_test.go b/server/internal/secrets/secrets_test.go index f1db818..58b2dc0 100644 --- a/server/internal/secrets/secrets_test.go +++ b/server/internal/secrets/secrets_test.go @@ -6,6 +6,7 @@ import ( "testing" "novamd/internal/secrets" + _ "novamd/internal/testenv" ) func TestValidateKey(t *testing.T) { diff --git a/server/internal/storage/files_test.go b/server/internal/storage/files_test.go index d5bf20b..ef36597 100644 --- a/server/internal/storage/files_test.go +++ b/server/internal/storage/files_test.go @@ -5,6 +5,8 @@ import ( "novamd/internal/storage" "path/filepath" "testing" + + _ "novamd/internal/testenv" ) // TestFileNode ensures FileNode structs are created correctly diff --git a/server/internal/storage/filesystem_test.go b/server/internal/storage/filesystem_test.go index a109198..c19e727 100644 --- a/server/internal/storage/filesystem_test.go +++ b/server/internal/storage/filesystem_test.go @@ -5,6 +5,8 @@ import ( "io/fs" "path/filepath" "time" + + _ "novamd/internal/testenv" ) type mockDirEntry struct { diff --git a/server/internal/storage/git_test.go b/server/internal/storage/git_test.go index f852616..49ba53d 100644 --- a/server/internal/storage/git_test.go +++ b/server/internal/storage/git_test.go @@ -6,6 +6,7 @@ import ( "novamd/internal/git" "novamd/internal/storage" + _ "novamd/internal/testenv" ) // MockGitClient implements git.Client interface for testing diff --git a/server/internal/storage/workspace_test.go b/server/internal/storage/workspace_test.go index 2fc11b2..636b0ab 100644 --- a/server/internal/storage/workspace_test.go +++ b/server/internal/storage/workspace_test.go @@ -7,6 +7,7 @@ import ( "testing" "novamd/internal/storage" + _ "novamd/internal/testenv" ) func TestValidatePath(t *testing.T) { diff --git a/server/internal/testenv/testenv.go b/server/internal/testenv/testenv.go new file mode 100644 index 0000000..06c7c37 --- /dev/null +++ b/server/internal/testenv/testenv.go @@ -0,0 +1,9 @@ +// Package testenv provides a setup for testing the application. +package testenv + +import "novamd/internal/logging" + +func init() { + // Initialize the logger + logging.Setup(logging.ERROR) +}