From 8475cc8075759f9a21553b9152e6a36abdb54337 Mon Sep 17 00:00:00 2001 From: Michael Lynch Date: Sat, 11 Jan 2025 12:48:50 -0500 Subject: [PATCH] Consistently use name dataStore for mock database (#653) --- handlers/upload_test.go | 20 ++++++++++---------- store/sqlite/entries_test.go | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/handlers/upload_test.go b/handlers/upload_test.go index 7db4cb6e..2fc3dcfe 100644 --- a/handlers/upload_test.go +++ b/handlers/upload_test.go @@ -242,12 +242,12 @@ func TestEntryPut(t *testing.T) { }, } { t.Run(tt.description, func(t *testing.T) { - store := test_sqlite.New() + dataStore := test_sqlite.New() originalData := "dummy original data" metadata := originalEntry metadata.Size = mustParseFileSize(len(originalData)) - store.InsertEntry(strings.NewReader((originalData)), metadata) - s := handlers.New(mockAuthenticator{}, &store, nilSpaceChecker, nilGarbageCollector, handlers.NewClock()) + dataStore.InsertEntry(strings.NewReader((originalData)), metadata) + s := handlers.New(mockAuthenticator{}, &dataStore, nilSpaceChecker, nilGarbageCollector, handlers.NewClock()) req, err := http.NewRequest("PUT", "/api/entry/"+tt.targetID, strings.NewReader(tt.payload)) if err != nil { @@ -263,7 +263,7 @@ func TestEntryPut(t *testing.T) { t.Fatalf("status=%d, want=%d", got, want) } - entry, err := store.GetEntryMetadata(picoshare.EntryID(originalEntry.ID)) + entry, err := dataStore.GetEntryMetadata(picoshare.EntryID(originalEntry.ID)) if err != nil { t.Fatalf("failed to get expected entry %v from data store: %v", originalEntry.ID, err) } @@ -448,20 +448,20 @@ func TestGuestUpload(t *testing.T) { }, } { t.Run(tt.description, func(t *testing.T) { - store := test_sqlite.New() - if err := store.InsertGuestLink(tt.guestLinkInStore); err != nil { + dataStore := test_sqlite.New() + if err := dataStore.InsertGuestLink(tt.guestLinkInStore); err != nil { t.Fatalf("failed to insert dummy guest link: %v", err) } for _, entry := range tt.entriesInStore { data := "dummy data" entry.UploadMetadata.Size = mustParseFileSize(len(data)) - if err := store.InsertEntry(strings.NewReader(data), entry.UploadMetadata); err != nil { + if err := dataStore.InsertEntry(strings.NewReader(data), entry.UploadMetadata); err != nil { t.Fatalf("failed to insert dummy entry: %v", err) } } c := mockClock{tt.currentTime} - s := handlers.New(authenticator, &store, nilSpaceChecker, nilGarbageCollector, c) + s := handlers.New(authenticator, &dataStore, nilSpaceChecker, nilGarbageCollector, c) filename := "dummyimage.png" contents := "dummy bytes" @@ -498,7 +498,7 @@ func TestGuestUpload(t *testing.T) { t.Fatalf("response is not valid JSON: %v", body) } - entry, err := store.GetEntryMetadata(picoshare.EntryID(response.ID)) + entry, err := dataStore.GetEntryMetadata(picoshare.EntryID(response.ID)) if err != nil { t.Fatalf("failed to get expected entry %v from data store: %v", response.ID, err) } @@ -511,7 +511,7 @@ func TestGuestUpload(t *testing.T) { t.Errorf("file expiration=%v, want=%v", got, want) } - entryFile, err := store.ReadEntryFile(entry.ID) + entryFile, err := dataStore.ReadEntryFile(entry.ID) if err != nil { t.Fatalf("failed to read entry file for %v: %v", entry.ID, err) } diff --git a/store/sqlite/entries_test.go b/store/sqlite/entries_test.go index 7b5dd725..9fee8f79 100644 --- a/store/sqlite/entries_test.go +++ b/store/sqlite/entries_test.go @@ -13,10 +13,10 @@ import ( func TestInsertDeleteSingleEntry(t *testing.T) { chunkSize := uint64(5) - db := test_sqlite.NewWithChunkSize(chunkSize) + dataStore := test_sqlite.NewWithChunkSize(chunkSize) input := "hello, world!" - if err := db.InsertEntry(bytes.NewBufferString(input), picoshare.UploadMetadata{ + if err := dataStore.InsertEntry(bytes.NewBufferString(input), picoshare.UploadMetadata{ ID: picoshare.EntryID("dummy-id"), Filename: "dummy-file.txt", Expires: mustParseExpirationTime("2040-01-01T00:00:00Z"), @@ -25,7 +25,7 @@ func TestInsertDeleteSingleEntry(t *testing.T) { t.Fatalf("failed to insert file into sqlite: %v", err) } - entryFile, err := db.ReadEntryFile("dummy-id") + entryFile, err := dataStore.ReadEntryFile("dummy-id") if err != nil { t.Fatalf("failed to get entry from DB: %v", err) } @@ -39,7 +39,7 @@ func TestInsertDeleteSingleEntry(t *testing.T) { log.Fatalf("unexpected file contents: got %v, want %v", got, want) } - meta, err := db.GetEntriesMetadata() + meta, err := dataStore.GetEntriesMetadata() if err != nil { t.Fatalf("failed to get entry metadata: %v", err) } @@ -61,12 +61,12 @@ func TestInsertDeleteSingleEntry(t *testing.T) { t.Fatalf("unexpected filename: got %v, want %v", meta[0].Filename, expectedFilename) } - err = db.DeleteEntry(picoshare.EntryID("dummy-id")) + err = dataStore.DeleteEntry(picoshare.EntryID("dummy-id")) if err != nil { t.Fatalf("failed to delete entry: %v", err) } - meta, err = db.GetEntriesMetadata() + meta, err = dataStore.GetEntriesMetadata() if err != nil { t.Fatalf("failed to get entry metadata: %v", err) }