From 46cf616a571e15e012e97941c114e291c35b8a00 Mon Sep 17 00:00:00 2001 From: TwinProduction Date: Sun, 18 Jul 2021 23:13:19 -0400 Subject: [PATCH] Rename TestStore_Insert to TestStore_SanityCheck --- storage/store/memory/memory_test.go | 13 ++++++++----- storage/store/sqlite/sqlite_test.go | 15 +++++++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/storage/store/memory/memory_test.go b/storage/store/memory/memory_test.go index 8ced03e6..26bea9eb 100644 --- a/storage/store/memory/memory_test.go +++ b/storage/store/memory/memory_test.go @@ -80,9 +80,9 @@ var ( } ) -// Note that there is a much more extensive test in /storage/store/store_test.go. +// Note that are much more extensive tests in /storage/store/store_test.go. // This test is simply an extra sanity check -func TestStore_Insert(t *testing.T) { +func TestStore_SanityCheck(t *testing.T) { store, _ := NewStore("") store.Insert(&testService, &testSuccessfulResult) if numberOfServiceStatuses := len(store.GetAllServiceStatuses(paging.NewServiceStatusParams())); numberOfServiceStatuses != 1 { @@ -93,15 +93,18 @@ func TestStore_Insert(t *testing.T) { if numberOfServiceStatuses := len(store.GetAllServiceStatuses(paging.NewServiceStatusParams())); numberOfServiceStatuses != 1 { t.Fatalf("expected 1 ServiceStatus, got %d", numberOfServiceStatuses) } - ss := store.GetServiceStatusByKey(testService.Key(), paging.NewServiceStatusParams().WithResults(1, 20).WithEvents(1, 20)) + ss := store.GetServiceStatus(testService.Group, testService.Name, paging.NewServiceStatusParams().WithResults(1, 20).WithEvents(1, 20)) if ss == nil { t.Fatalf("Store should've had key '%s', but didn't", testService.Key()) } if len(ss.Events) != 3 { - t.Fatalf("Service '%s' should've had 3 events, got %d", ss.Name, len(ss.Events)) + t.Errorf("Service '%s' should've had 3 events, got %d", ss.Name, len(ss.Events)) } if len(ss.Results) != 2 { - t.Fatalf("Service '%s' should've had 2 results, got %d", ss.Name, len(ss.Results)) + t.Errorf("Service '%s' should've had 2 results, got %d", ss.Name, len(ss.Results)) + } + if deleted := store.DeleteAllServiceStatusesNotInKeys([]string{}); deleted != 1 { + t.Errorf("%d entries should've been deleted, got %d", 1, deleted) } } diff --git a/storage/store/sqlite/sqlite_test.go b/storage/store/sqlite/sqlite_test.go index 14bf5d5d..e139a067 100644 --- a/storage/store/sqlite/sqlite_test.go +++ b/storage/store/sqlite/sqlite_test.go @@ -250,10 +250,10 @@ func TestStore_Save(t *testing.T) { } } -// Note that there is a much more extensive test in /storage/store/store_test.go. +// Note that are much more extensive tests in /storage/store/store_test.go. // This test is simply an extra sanity check -func TestStore_Insert(t *testing.T) { - store, _ := NewStore("sqlite", t.TempDir()+"/TestStore_Insert.db") +func TestStore_SanityCheck(t *testing.T) { + store, _ := NewStore("sqlite", t.TempDir()+"/TestStore_SanityCheck.db") defer store.Close() store.Insert(&testService, &testSuccessfulResult) if numberOfServiceStatuses := len(store.GetAllServiceStatuses(paging.NewServiceStatusParams())); numberOfServiceStatuses != 1 { @@ -264,15 +264,18 @@ func TestStore_Insert(t *testing.T) { if numberOfServiceStatuses := len(store.GetAllServiceStatuses(paging.NewServiceStatusParams())); numberOfServiceStatuses != 1 { t.Fatalf("expected 1 ServiceStatus, got %d", numberOfServiceStatuses) } - ss := store.GetServiceStatusByKey(testService.Key(), paging.NewServiceStatusParams().WithResults(1, 20).WithEvents(1, 20)) + ss := store.GetServiceStatus(testService.Group, testService.Name, paging.NewServiceStatusParams().WithResults(1, 20).WithEvents(1, 20)) if ss == nil { t.Fatalf("Store should've had key '%s', but didn't", testService.Key()) } if len(ss.Events) != 3 { - t.Fatalf("Service '%s' should've had 3 events, got %d", ss.Name, len(ss.Events)) + t.Errorf("Service '%s' should've had 3 events, got %d", ss.Name, len(ss.Events)) } if len(ss.Results) != 2 { - t.Fatalf("Service '%s' should've had 2 results, got %d", ss.Name, len(ss.Results)) + t.Errorf("Service '%s' should've had 2 results, got %d", ss.Name, len(ss.Results)) + } + if deleted := store.DeleteAllServiceStatusesNotInKeys([]string{}); deleted != 1 { + t.Errorf("%d entries should've been deleted, got %d", 1, deleted) } }