From 0781cd871eda00e97c5a0beb6aa7b41bcd5ed4b4 Mon Sep 17 00:00:00 2001 From: John O'Keefe Date: Fri, 6 Feb 2026 17:07:12 -0500 Subject: [PATCH] test: update kobo and media test signatures - Remove handler parameter from test function calls - Update test signatures to match new setupTestServer return values - Fix compilation errors after test helper refactoring - Maintain test functionality for kobo and media endpoints --- cmd/server/tests/kobo_test.go | 10 +++++----- cmd/server/tests/media_bulk_test.go | 24 ++++++++++++------------ cmd/server/tests/media_item_isbn_test.go | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmd/server/tests/kobo_test.go b/cmd/server/tests/kobo_test.go index cd7f310..01b8482 100644 --- a/cmd/server/tests/kobo_test.go +++ b/cmd/server/tests/kobo_test.go @@ -17,7 +17,7 @@ func TestKoboInitialization(t *testing.T) { t.Skip("Skipping integration test in short mode") } - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer closeTestServer(t, ts, db) token := loginTestUser(t, ts, db) @@ -42,7 +42,7 @@ func TestKoboLibrarySync(t *testing.T) { t.Skip("Skipping integration test in short mode") } - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer closeTestServer(t, ts, db) token := loginTestUser(t, ts, db) @@ -66,7 +66,7 @@ func TestKoboMarkupSync(t *testing.T) { t.Skip("Skipping integration test in short mode") } - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer closeTestServer(t, ts, db) token := loginTestUser(t, ts, db) @@ -122,7 +122,7 @@ func TestKoboBookmarkSync(t *testing.T) { t.Skip("Skipping integration test in short mode") } - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer closeTestServer(t, ts, db) token := loginTestUser(t, ts, db) @@ -163,7 +163,7 @@ func TestKoboAnalyticsGettests(t *testing.T) { t.Skip("Skipping integration test in short mode") } - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer closeTestServer(t, ts, db) token := loginTestUser(t, ts, db) diff --git a/cmd/server/tests/media_bulk_test.go b/cmd/server/tests/media_bulk_test.go index c4c30b8..c3b792c 100644 --- a/cmd/server/tests/media_bulk_test.go +++ b/cmd/server/tests/media_bulk_test.go @@ -14,7 +14,7 @@ import ( // TestMediaBulkOperations tests bulk media operations func TestMediaBulkOperations(t *testing.T) { t.Run("BulkDeleteBooks_WithoutAuth", func(t *testing.T) { - ts, _, _, _ := setupTestServer(t) + ts, _, _ := setupTestServer(t) defer ts.Close() req := map[string]interface{}{ @@ -34,7 +34,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkDeleteBooks_EmptyBookIDs", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -57,7 +57,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkDeleteBooks_InvalidBookIDs", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -88,7 +88,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkDeleteBooks_WithValidBooks", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -123,7 +123,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkDeleteBooks_InvalidRequestBody", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -142,7 +142,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_WithoutAuth", func(t *testing.T) { - ts, _, _, _ := setupTestServer(t) + ts, _, _ := setupTestServer(t) defer ts.Close() req := map[string]interface{}{ @@ -165,7 +165,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_EmptyBookIDs", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -191,7 +191,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_InvalidBookIDs", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -225,7 +225,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_UpdateTags", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -262,7 +262,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_UpdateReadingStatus", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -296,7 +296,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_UpdateMultipleFields", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -332,7 +332,7 @@ func TestMediaBulkOperations(t *testing.T) { }) t.Run("BulkUpdateBooks_InvalidRequestBody", func(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) diff --git a/cmd/server/tests/media_item_isbn_test.go b/cmd/server/tests/media_item_isbn_test.go index 815e4e3..f5a7aec 100644 --- a/cmd/server/tests/media_item_isbn_test.go +++ b/cmd/server/tests/media_item_isbn_test.go @@ -42,7 +42,7 @@ func createTestLibrary(t *testing.T, ts *httptest.Server, token, name string) st // TestMediaItemISBNNormalization tests ISBN normalization with media-items endpoint func TestMediaItemISBNNormalization(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() // Create an ebook library first @@ -131,7 +131,7 @@ func TestMediaItemISBNNormalization(t *testing.T) { // TestMediaItemISBNEdgeCases tests ISBN edge cases func TestMediaItemISBNEdgeCases(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -216,7 +216,7 @@ func TestMediaItemISBNEdgeCases(t *testing.T) { // TestMediaItemsPagination tests pagination with media-items endpoint func TestMediaItemsPagination(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -323,7 +323,7 @@ func TestMediaItemsPagination(t *testing.T) { // TestMediaItemLibraryRequirement tests that media items require a library func TestMediaItemLibraryRequirement(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db) @@ -386,7 +386,7 @@ func TestMediaItemLibraryRequirement(t *testing.T) { // TestUpdateMediaItemISBN tests updating media-item ISBN func TestUpdateMediaItemISBN(t *testing.T) { - ts, db, _, _ := setupTestServer(t) + ts, db, _ := setupTestServer(t) defer ts.Close() token := loginTestUser(t, ts, db)