Refactor tests again: forEachBackend

message/store_postgres_test.go

@@ -1,93 +0,0 @@
-package message_test
-
-import (
-	"testing"
-
-	dbtest "heckel.io/ntfy/v2/db/test"
-	"heckel.io/ntfy/v2/message"
-
-	"github.com/stretchr/testify/require"
-)
-
-func newTestPostgresStore(t *testing.T) message.Store {
-	testDB := dbtest.CreateTestPostgres(t)
-	store, err := message.NewPostgresStore(testDB, 0, 0)
-	require.Nil(t, err)
-	return store
-}
-
-func TestPostgresStore_Messages(t *testing.T) {
-	testCacheMessages(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessagesLock(t *testing.T) {
-	testCacheMessagesLock(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessagesScheduled(t *testing.T) {
-	testCacheMessagesScheduled(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_Topics(t *testing.T) {
-	testCacheTopics(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessagesTagsPrioAndTitle(t *testing.T) {
-	testCacheMessagesTagsPrioAndTitle(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessagesSinceID(t *testing.T) {
-	testCacheMessagesSinceID(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_Prune(t *testing.T) {
-	testCachePrune(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_Attachments(t *testing.T) {
-	testCacheAttachments(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_AttachmentsExpired(t *testing.T) {
-	testCacheAttachmentsExpired(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_Sender(t *testing.T) {
-	testSender(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_DeleteScheduledBySequenceID(t *testing.T) {
-	testDeleteScheduledBySequenceID(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessageByID(t *testing.T) {
-	testMessageByID(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MarkPublished(t *testing.T) {
-	testMarkPublished(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_ExpireMessages(t *testing.T) {
-	testExpireMessages(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MarkAttachmentsDeleted(t *testing.T) {
-	testMarkAttachmentsDeleted(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_Stats(t *testing.T) {
-	testStats(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_AddMessages(t *testing.T) {
-	testAddMessages(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessagesDue(t *testing.T) {
-	testMessagesDue(t, newTestPostgresStore(t))
-}
-
-func TestPostgresStore_MessageFieldRoundTrip(t *testing.T) {
-	testMessageFieldRoundTrip(t, newTestPostgresStore(t))
-}

message/store_sqlite_test.go

@@ -13,158 +13,6 @@ import (
 	"heckel.io/ntfy/v2/model"
 )
 
-func TestSqliteStore_Messages(t *testing.T) {
-	testCacheMessages(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_Messages(t *testing.T) {
-	testCacheMessages(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessagesLock(t *testing.T) {
-	testCacheMessagesLock(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessagesLock(t *testing.T) {
-	testCacheMessagesLock(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessagesScheduled(t *testing.T) {
-	testCacheMessagesScheduled(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessagesScheduled(t *testing.T) {
-	testCacheMessagesScheduled(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_Topics(t *testing.T) {
-	testCacheTopics(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_Topics(t *testing.T) {
-	testCacheTopics(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessagesTagsPrioAndTitle(t *testing.T) {
-	testCacheMessagesTagsPrioAndTitle(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessagesTagsPrioAndTitle(t *testing.T) {
-	testCacheMessagesTagsPrioAndTitle(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessagesSinceID(t *testing.T) {
-	testCacheMessagesSinceID(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessagesSinceID(t *testing.T) {
-	testCacheMessagesSinceID(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_Prune(t *testing.T) {
-	testCachePrune(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_Prune(t *testing.T) {
-	testCachePrune(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_Attachments(t *testing.T) {
-	testCacheAttachments(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_Attachments(t *testing.T) {
-	testCacheAttachments(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_AttachmentsExpired(t *testing.T) {
-	testCacheAttachmentsExpired(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_AttachmentsExpired(t *testing.T) {
-	testCacheAttachmentsExpired(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_Sender(t *testing.T) {
-	testSender(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_Sender(t *testing.T) {
-	testSender(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_DeleteScheduledBySequenceID(t *testing.T) {
-	testDeleteScheduledBySequenceID(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_DeleteScheduledBySequenceID(t *testing.T) {
-	testDeleteScheduledBySequenceID(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessageByID(t *testing.T) {
-	testMessageByID(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessageByID(t *testing.T) {
-	testMessageByID(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MarkPublished(t *testing.T) {
-	testMarkPublished(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MarkPublished(t *testing.T) {
-	testMarkPublished(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_ExpireMessages(t *testing.T) {
-	testExpireMessages(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_ExpireMessages(t *testing.T) {
-	testExpireMessages(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MarkAttachmentsDeleted(t *testing.T) {
-	testMarkAttachmentsDeleted(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MarkAttachmentsDeleted(t *testing.T) {
-	testMarkAttachmentsDeleted(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_Stats(t *testing.T) {
-	testStats(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_Stats(t *testing.T) {
-	testStats(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_AddMessages(t *testing.T) {
-	testAddMessages(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_AddMessages(t *testing.T) {
-	testAddMessages(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessagesDue(t *testing.T) {
-	testMessagesDue(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessagesDue(t *testing.T) {
-	testMessagesDue(t, newMemTestStore(t))
-}
-
-func TestSqliteStore_MessageFieldRoundTrip(t *testing.T) {
-	testMessageFieldRoundTrip(t, newSqliteTestStore(t))
-}
-
-func TestMemStore_MessageFieldRoundTrip(t *testing.T) {
-	testMessageFieldRoundTrip(t, newMemTestStore(t))
-}
-
 func TestSqliteStore_Migration_From0(t *testing.T) {
 	filename := newSqliteTestStoreFile(t)
 	db, err := sql.Open("sqlite3", filename)
@@ -419,14 +267,6 @@ func TestNopStore(t *testing.T) {
 	require.Empty(t, topics)
 }
 
-func newSqliteTestStore(t *testing.T) message.Store {
-	filename := filepath.Join(t.TempDir(), "cache.db")
-	s, err := message.NewSQLiteStore(filename, "", time.Hour, 0, 0, false)
-	require.Nil(t, err)
-	t.Cleanup(func() { s.Close() })
-	return s
-}
-
 func newSqliteTestStoreFile(t *testing.T) string {
 	return filepath.Join(t.TempDir(), "cache.db")
 }
@@ -438,13 +278,6 @@ func newSqliteTestStoreFromFile(t *testing.T, filename, startupQueries string) m
 	return s
 }
 
-func newMemTestStore(t *testing.T) message.Store {
-	s, err := message.NewMemStore()
-	require.Nil(t, err)
-	t.Cleanup(func() { s.Close() })
-	return s
-}
-
 func checkSqliteSchemaVersion(t *testing.T, filename string) {
 	db, err := sql.Open("sqlite3", filename)
 	require.Nil(t, err)