From ca3ef6bec40184932bf97d297e0d7f98bdfd105c Mon Sep 17 00:00:00 2001 From: Gregor Best <gbe@unobtanium.de> Date: Wed, 2 Feb 2022 21:59:48 +0100 Subject: [PATCH] clean up test --- handler-index_test.go | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/handler-index_test.go b/handler-index_test.go index e980b05..688962b 100644 --- a/handler-index_test.go +++ b/handler-index_test.go @@ -8,7 +8,8 @@ import ( "testing" "git.c3pb.de/gbe/invinoveritas/log" - "git.c3pb.de/gbe/invinoveritas/vino" + "git.c3pb.de/gbe/invinoveritas/storage" + "git.c3pb.de/gbe/invinoveritas/storage/query" ) type testLogger struct { @@ -20,24 +21,6 @@ func (tl testLogger) Log(vals ...interface{}) error { return nil } -type dummyStorage struct{} - -func (d dummyStorage) Store(ctx context.Context, v *vino.Vino) error { - return nil -} - -func (d dummyStorage) StoreComment(ctx context.Context, v *vino.Vino, txt string) error { - return nil -} - -func (d dummyStorage) DeleteComment(ctx context.Context, id int) error { - return nil -} - -func (d dummyStorage) DeleteVino(ctx context.Context, id int) error { - return nil -} - func TestHandler_Index_Add(t *testing.T) { w := httptest.NewRecorder() @@ -47,10 +30,18 @@ func TestHandler_Index_Add(t *testing.T) { r := httptest.NewRequest("POST", "/add", strings.NewReader(data.Encode())) r.Header.Set("Content-Type", "application/x-www-form-urlencoded") - var h Handler - logger := testLogger{t} + db, err := storage.Open(context.Background(), ":memory:", logger) + if err != nil { + t.Fatal("unexpected error:", err) + } + defer db.Close() + + h := Handler{ + Q: query.New(db), + } + hdlr := log.Request(h.index(), logger) hdlr.ServeHTTP(w, r) -- GitLab