From 3cea815fe1e70d845b5e4495c7486c0f59c66cb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= Date: Thu, 24 Sep 2020 11:14:03 +0200 Subject: [PATCH] Use truncAndCreate when available in store tests --- store/tests/messaging_channels_test.go | 3 +-- store/tests/messaging_flags_test.go | 3 +-- store/tests/messaging_mentions_test.go | 3 +-- store/tests/messaging_messages_test.go | 3 +-- store/tests/reminders_test.go | 1 - store/tests/roles_test.go | 2 -- store/tests/settings_test.go | 1 - store/tests/users_test.go | 7 ------- 8 files changed, 4 insertions(+), 19 deletions(-) diff --git a/store/tests/messaging_channels_test.go b/store/tests/messaging_channels_test.go index 9c5da0dcf..6463ebfd3 100644 --- a/store/tests/messaging_channels_test.go +++ b/store/tests/messaging_channels_test.go @@ -44,8 +44,7 @@ func testMessagingChannels(t *testing.T, s store.MessagingChannels) { }) t.Run("lookup by ID", func(t *testing.T) { - messagingChannel := makeNew("look up by id") - req.NoError(s.CreateMessagingChannel(ctx, messagingChannel)) + req, messagingChannel := truncAndCreate(t) fetched, err := s.LookupMessagingChannelByID(ctx, messagingChannel.ID) req.NoError(err) req.Equal(messagingChannel.Name, fetched.Name) diff --git a/store/tests/messaging_flags_test.go b/store/tests/messaging_flags_test.go index a8a6b1094..aef49814e 100644 --- a/store/tests/messaging_flags_test.go +++ b/store/tests/messaging_flags_test.go @@ -50,8 +50,7 @@ func testMessagingFlags(t *testing.T, s store.MessagingFlags) { }) t.Run("lookup by ID", func(t *testing.T) { - messagingFlag := makeNew("look-up-by-id") - req.NoError(s.CreateMessagingFlag(ctx, messagingFlag)) + req, messagingFlag := truncAndCreate(t) fetched, err := s.LookupMessagingFlagByID(ctx, messagingFlag.ID) req.NoError(err) req.Equal(messagingFlag.Flag, fetched.Flag) diff --git a/store/tests/messaging_mentions_test.go b/store/tests/messaging_mentions_test.go index 089c83d3d..a02173925 100644 --- a/store/tests/messaging_mentions_test.go +++ b/store/tests/messaging_mentions_test.go @@ -49,8 +49,7 @@ func testMessagingMentions(t *testing.T, s store.MessagingMentions) { }) t.Run("lookup by ID", func(t *testing.T) { - messagingMention := makeNew("look-up-by-id") - req.NoError(s.CreateMessagingMention(ctx, messagingMention)) + req, messagingMention := truncAndCreate(t) fetched, err := s.LookupMessagingMentionByID(ctx, messagingMention.ID) req.NoError(err) req.Equal(messagingMention.ID, fetched.ID) diff --git a/store/tests/messaging_messages_test.go b/store/tests/messaging_messages_test.go index 5442cc2b2..ace9432e4 100644 --- a/store/tests/messaging_messages_test.go +++ b/store/tests/messaging_messages_test.go @@ -47,8 +47,7 @@ func testMessagingMessages(t *testing.T, s store.MessagingMessages) { }) t.Run("lookup by ID", func(t *testing.T) { - messagingMessage := makeNew("look up by id") - req.NoError(s.CreateMessagingMessage(ctx, messagingMessage)) + req, messagingMessage := truncAndCreate(t) fetched, err := s.LookupMessagingMessageByID(ctx, messagingMessage.ID) req.NoError(err) req.Equal(messagingMessage.Message, fetched.Message) diff --git a/store/tests/reminders_test.go b/store/tests/reminders_test.go index b0a148bf1..e8703fa11 100644 --- a/store/tests/reminders_test.go +++ b/store/tests/reminders_test.go @@ -60,7 +60,6 @@ func testReminders(t *testing.T, s store.Reminders) { t.Run("lookup by ID", func(t *testing.T) { req, reminder := truncAndCreate(t) - fetched, err := s.LookupReminderByID(ctx, reminder.ID) req.NoError(err) req.Equal(reminder.ID, fetched.ID) diff --git a/store/tests/roles_test.go b/store/tests/roles_test.go index 6925b26e6..013f5644e 100644 --- a/store/tests/roles_test.go +++ b/store/tests/roles_test.go @@ -58,7 +58,6 @@ func testRoles(t *testing.T, s store.Roles) { t.Run("lookup by ID", func(t *testing.T) { req, role := truncAndCreate(t) - fetched, err := s.LookupRoleByID(ctx, role.ID) req.NoError(err) req.Equal(role.Name, fetched.Name) @@ -76,7 +75,6 @@ func testRoles(t *testing.T, s store.Roles) { t.Run("lookup by handle", func(t *testing.T) { req, role := truncAndCreate(t) - fetched, err := s.LookupRoleByHandle(ctx, role.Handle) req.NoError(err) req.Equal(role.ID, fetched.ID) diff --git a/store/tests/settings_test.go b/store/tests/settings_test.go index b508e0545..4d745943f 100644 --- a/store/tests/settings_test.go +++ b/store/tests/settings_test.go @@ -54,7 +54,6 @@ func testSettings(t *testing.T, s store.Settings) { t.Run("lookup by name and ownedBy", func(t *testing.T) { req, setting := truncAndCreate(t) - fetched, err := s.LookupSettingByNameOwnedBy(ctx, setting.Name, setting.OwnedBy) req.NoError(err) req.Equal(setting.Name, fetched.Name) diff --git a/store/tests/users_test.go b/store/tests/users_test.go index 3fb7e63a1..dcce11783 100644 --- a/store/tests/users_test.go +++ b/store/tests/users_test.go @@ -99,7 +99,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("lookup by ID", func(t *testing.T) { req, user := truncAndCreate(t) - fetched, err := store.LookupUserByID(ctx, s, user.ID) req.NoError(err) req.Equal(user.Email, fetched.Email) @@ -119,7 +118,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("lookup by email", func(t *testing.T) { req, user := truncAndCreate(t) - fetched, err := store.LookupUserByEmail(ctx, s, user.Email) req.NoError(err) req.Equal(user.Email, fetched.Email) @@ -127,7 +125,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("lookup by handle", func(t *testing.T) { req, user := truncAndCreate(t) - fetched, err := store.LookupUserByHandle(ctx, s, user.Handle) req.NoError(err) req.Equal(user.ID, fetched.ID) @@ -135,7 +132,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("lookup by nonexisting handle", func(t *testing.T) { req, _ := truncAndCreate(t) - fetched, err := store.LookupUserByHandle(ctx, s, "no such handle") req.EqualError(err, "not found") req.Nil(fetched) @@ -143,7 +139,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("lookup by username", func(t *testing.T) { req, user := truncAndCreate(t) - fetched, err := store.LookupUserByUsername(ctx, s, user.Username) req.NoError(err) req.Equal(user.ID, fetched.ID) @@ -152,7 +147,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("search", func(t *testing.T) { t.Run("by ID", func(t *testing.T) { req, prefill := truncAndFill(t, 5) - set, f, err := store.SearchUsers(ctx, s, types.UserFilter{UserID: []uint64{prefill[0].ID}}) req.NoError(err) req.Equal([]uint64{prefill[0].ID}, f.UserID) @@ -162,7 +156,6 @@ func testUsers(t *testing.T, s store.Users) { t.Run("by email", func(t *testing.T) { req, prefill := truncAndFill(t, 5) - set, _, err := store.SearchUsers(ctx, s, types.UserFilter{Email: prefill[0].Email}) req.NoError(err) req.Len(set, 1)