From 0e9ad9f7f8328c9e955e93e8c9ba3dba861dcf10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 10 Feb 2021 11:34:41 +0100 Subject: [PATCH] Replacing {require,assert}.{Nil,NotNil} with {require,assert}.{NoError,Error} in the store tests (when comparing errors) (#16886) * Replacing require.Nil with require.NoError * More replacements * More Nil/NotNill to NoError/Error * Other detected errors * renaming apperr to err * Removed not needed line * Rename old appErr variables that are no longer model.AppError values * Fixing tiny typo * Reverting changes outside the store (accidentally added) * Apply suggestions from code review Co-authored-by: Doug Lauder Co-authored-by: Doug Lauder --- store/localcachelayer/channel_layer_test.go | 16 +- store/localcachelayer/emoji_layer_test.go | 8 +- store/localcachelayer/file_info_layer_test.go | 2 +- store/localcachelayer/post_layer_test.go | 10 +- store/localcachelayer/reaction_layer_test.go | 3 +- store/localcachelayer/role_layer_test.go | 4 +- store/localcachelayer/scheme_layer_test.go | 4 +- store/localcachelayer/team_layer_test.go | 12 +- .../terms_of_service_layer_test.go | 8 +- store/localcachelayer/user_layer_test.go | 30 +- store/localcachelayer/webhook_layer_test.go | 2 +- store/searchtest/channel_layer.go | 66 +- store/searchtest/file_info_layer.go | 636 +++--- store/searchtest/helper.go | 96 +- store/searchtest/post_layer.go | 676 +++---- store/searchtest/user_layer.go | 276 +-- store/sqlstore/channel_store.go | 6 +- store/sqlstore/channel_store_test.go | 2 +- store/sqlstore/integrity_test.go | 172 +- store/sqlstore/preference_store_test.go | 6 +- store/sqlstore/scheme_store.go | 6 +- store/sqlstore/session_store.go | 6 +- store/sqlstore/store_test.go | 2 +- store/sqlstore/upgrade_test.go | 4 +- store/storetest/audit_store.go | 16 +- store/storetest/bot_store.go | 142 +- .../storetest/channel_member_history_store.go | 76 +- store/storetest/channel_store.go | 1348 ++++++------- store/storetest/channel_store_categories.go | 466 ++--- store/storetest/cluster_discovery_store.go | 38 +- store/storetest/command_store.go | 62 +- store/storetest/command_webhook_store.go | 14 +- store/storetest/compliance_store.go | 230 +-- store/storetest/emoji_store.go | 54 +- store/storetest/file_info_store.go | 86 +- store/storetest/group_store.go | 1034 +++++----- store/storetest/job_store.go | 78 +- store/storetest/license_store.go | 12 +- store/storetest/link_metadata_store.go | 42 +- store/storetest/oauth_store.go | 108 +- store/storetest/plugin_store.go | 204 +- store/storetest/post_store.go | 704 +++---- store/storetest/preference_store.go | 62 +- store/storetest/reaction_store.go | 106 +- store/storetest/role_store.go | 114 +- store/storetest/scheme_store.go | 126 +- store/storetest/session_store.go | 134 +- store/storetest/status_store.go | 20 +- store/storetest/system_store.go | 48 +- store/storetest/team_store.go | 626 +++--- store/storetest/terms_of_service_store.go | 28 +- store/storetest/thread_store.go | 84 +- store/storetest/user_access_token_store.go | 56 +- store/storetest/user_store.go | 1786 ++++++++--------- store/storetest/user_terms_of_service.go | 14 +- store/storetest/webhook_store.go | 196 +- 56 files changed, 5061 insertions(+), 5106 deletions(-) diff --git a/store/localcachelayer/channel_layer_test.go b/store/localcachelayer/channel_layer_test.go index cdd8561934..054aeaf909 100644 --- a/store/localcachelayer/channel_layer_test.go +++ b/store/localcachelayer/channel_layer_test.go @@ -28,11 +28,11 @@ func TestChannelStoreChannelMemberCountsCache(t *testing.T) { require.NoError(t, err) count, err := cachedStore.Channel().GetMemberCount("id", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, count, countResult) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "GetMemberCount", 1) count, err = cachedStore.Channel().GetMemberCount("id", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, count, countResult) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "GetMemberCount", 1) }) @@ -114,11 +114,11 @@ func TestChannelStoreChannelPinnedPostsCountsCache(t *testing.T) { require.NoError(t, err) count, err := cachedStore.Channel().GetPinnedPostCount("id", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, count, countResult) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "GetPinnedPostCount", 1) count, err = cachedStore.Channel().GetPinnedPostCount("id", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, count, countResult) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "GetPinnedPostCount", 1) }) @@ -186,11 +186,11 @@ func TestChannelStoreGuestCountCache(t *testing.T) { require.NoError(t, err) count, err := cachedStore.Channel().GetGuestCount("id", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, count, countResult) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "GetGuestCount", 1) count, err = cachedStore.Channel().GetGuestCount("id", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, count, countResult) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "GetGuestCount", 1) }) @@ -258,11 +258,11 @@ func TestChannelStoreChannel(t *testing.T) { require.NoError(t, err) channel, err := cachedStore.Channel().Get(channelId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, channel, &fakeChannel) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "Get", 1) channel, err = cachedStore.Channel().Get(channelId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, channel, &fakeChannel) mockStore.Channel().(*mocks.ChannelStore).AssertNumberOfCalls(t, "Get", 1) }) diff --git a/store/localcachelayer/emoji_layer_test.go b/store/localcachelayer/emoji_layer_test.go index d5bdb576d8..b028d2f93b 100644 --- a/store/localcachelayer/emoji_layer_test.go +++ b/store/localcachelayer/emoji_layer_test.go @@ -28,11 +28,11 @@ func TestEmojiStoreCache(t *testing.T) { require.NoError(t, err) emoji, err := cachedStore.Emoji().Get("123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, emoji, &fakeEmoji) mockStore.Emoji().(*mocks.EmojiStore).AssertNumberOfCalls(t, "Get", 1) emoji, err = cachedStore.Emoji().Get("123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, emoji, &fakeEmoji) mockStore.Emoji().(*mocks.EmojiStore).AssertNumberOfCalls(t, "Get", 1) }) @@ -44,11 +44,11 @@ func TestEmojiStoreCache(t *testing.T) { require.NoError(t, err) emoji, err := cachedStore.Emoji().GetByName("name123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, emoji, &fakeEmoji) mockStore.Emoji().(*mocks.EmojiStore).AssertNumberOfCalls(t, "GetByName", 1) emoji, err = cachedStore.Emoji().GetByName("name123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, emoji, &fakeEmoji) mockStore.Emoji().(*mocks.EmojiStore).AssertNumberOfCalls(t, "GetByName", 1) }) diff --git a/store/localcachelayer/file_info_layer_test.go b/store/localcachelayer/file_info_layer_test.go index 38f757d94c..e011d92e55 100644 --- a/store/localcachelayer/file_info_layer_test.go +++ b/store/localcachelayer/file_info_layer_test.go @@ -28,7 +28,7 @@ func TestFileInfoStoreCache(t *testing.T) { require.NoError(t, err) fileInfos, err := cachedStore.FileInfo().GetForPost("123", true, true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fileInfos, []*model.FileInfo{&fakeFileInfo}) mockStore.FileInfo().(*mocks.FileInfoStore).AssertNumberOfCalls(t, "GetForPost", 1) assert.Equal(t, fileInfos, []*model.FileInfo{&fakeFileInfo}) diff --git a/store/localcachelayer/post_layer_test.go b/store/localcachelayer/post_layer_test.go index c60d633539..3ed2701cf1 100644 --- a/store/localcachelayer/post_layer_test.go +++ b/store/localcachelayer/post_layer_test.go @@ -92,12 +92,12 @@ func TestPostStoreLastPostTimeCache(t *testing.T) { expectedResult := model.NewPostList() list, err := cachedStore.Post().GetPostsSince(fakeOptions, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, list, expectedResult) mockStore.Post().(*mocks.PostStore).AssertNumberOfCalls(t, "GetPostsSince", 1) list, err = cachedStore.Post().GetPostsSince(fakeOptions, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, list, expectedResult) mockStore.Post().(*mocks.PostStore).AssertNumberOfCalls(t, "GetPostsSince", 1) }) @@ -152,7 +152,7 @@ func TestPostStoreCache(t *testing.T) { require.NoError(t, err) gotPosts, err := cachedStore.Post().GetPosts(fakeOptions, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakePosts, gotPosts) mockStore.Post().(*mocks.PostStore).AssertNumberOfCalls(t, "GetPosts", 1) @@ -167,7 +167,7 @@ func TestPostStoreCache(t *testing.T) { require.NoError(t, err) gotPosts, err := cachedStore.Post().GetPosts(fakeOptions, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakePosts, gotPosts) mockStore.Post().(*mocks.PostStore).AssertNumberOfCalls(t, "GetPosts", 1) @@ -182,7 +182,7 @@ func TestPostStoreCache(t *testing.T) { require.NoError(t, err) gotPosts, err := cachedStore.Post().GetPosts(fakeOptions, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakePosts, gotPosts) mockStore.Post().(*mocks.PostStore).AssertNumberOfCalls(t, "GetPosts", 1) diff --git a/store/localcachelayer/reaction_layer_test.go b/store/localcachelayer/reaction_layer_test.go index b2acccca07..25daefb928 100644 --- a/store/localcachelayer/reaction_layer_test.go +++ b/store/localcachelayer/reaction_layer_test.go @@ -28,10 +28,9 @@ func TestReactionStoreCache(t *testing.T) { require.NoError(t, err) reaction, err := cachedStore.Reaction().GetForPost("123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, reaction, []*model.Reaction{&fakeReaction}) mockStore.Reaction().(*mocks.ReactionStore).AssertNumberOfCalls(t, "GetForPost", 1) - require.Nil(t, err) assert.Equal(t, reaction, []*model.Reaction{&fakeReaction}) cachedStore.Reaction().GetForPost("123", true) mockStore.Reaction().(*mocks.ReactionStore).AssertNumberOfCalls(t, "GetForPost", 1) diff --git a/store/localcachelayer/role_layer_test.go b/store/localcachelayer/role_layer_test.go index 99bcd9fa4a..27090bf15d 100644 --- a/store/localcachelayer/role_layer_test.go +++ b/store/localcachelayer/role_layer_test.go @@ -28,10 +28,10 @@ func TestRoleStoreCache(t *testing.T) { require.NoError(t, err) role, err := cachedStore.Role().GetByName("role-name") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, role, &fakeRole) mockStore.Role().(*mocks.RoleStore).AssertNumberOfCalls(t, "GetByName", 1) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, role, &fakeRole) cachedStore.Role().GetByName("role-name") mockStore.Role().(*mocks.RoleStore).AssertNumberOfCalls(t, "GetByName", 1) diff --git a/store/localcachelayer/scheme_layer_test.go b/store/localcachelayer/scheme_layer_test.go index 461a610f9e..519558b872 100644 --- a/store/localcachelayer/scheme_layer_test.go +++ b/store/localcachelayer/scheme_layer_test.go @@ -28,10 +28,10 @@ func TestSchemeStoreCache(t *testing.T) { require.NoError(t, err) scheme, err := cachedStore.Scheme().Get("123") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, scheme, &fakeScheme) mockStore.Scheme().(*mocks.SchemeStore).AssertNumberOfCalls(t, "Get", 1) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, scheme, &fakeScheme) cachedStore.Scheme().Get("123") mockStore.Scheme().(*mocks.SchemeStore).AssertNumberOfCalls(t, "Get", 1) diff --git a/store/localcachelayer/team_layer_test.go b/store/localcachelayer/team_layer_test.go index 7c24a84f58..262037c55b 100644 --- a/store/localcachelayer/team_layer_test.go +++ b/store/localcachelayer/team_layer_test.go @@ -28,12 +28,12 @@ func TestTeamStoreCache(t *testing.T) { require.NoError(t, err) gotUserTeamIds, err := cachedStore.Team().GetUserTeamIds(fakeUserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUserTeamIds, gotUserTeamIds) mockStore.Team().(*mocks.TeamStore).AssertNumberOfCalls(t, "GetUserTeamIds", 1) gotUserTeamIds, err = cachedStore.Team().GetUserTeamIds(fakeUserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUserTeamIds, gotUserTeamIds) mockStore.Team().(*mocks.TeamStore).AssertNumberOfCalls(t, "GetUserTeamIds", 1) }) @@ -45,12 +45,12 @@ func TestTeamStoreCache(t *testing.T) { require.NoError(t, err) gotUserTeamIds, err := cachedStore.Team().GetUserTeamIds(fakeUserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUserTeamIds, gotUserTeamIds) mockStore.Team().(*mocks.TeamStore).AssertNumberOfCalls(t, "GetUserTeamIds", 1) gotUserTeamIds, err = cachedStore.Team().GetUserTeamIds(fakeUserId, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUserTeamIds, gotUserTeamIds) mockStore.Team().(*mocks.TeamStore).AssertNumberOfCalls(t, "GetUserTeamIds", 2) }) @@ -62,14 +62,14 @@ func TestTeamStoreCache(t *testing.T) { require.NoError(t, err) gotUserTeamIds, err := cachedStore.Team().GetUserTeamIds(fakeUserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUserTeamIds, gotUserTeamIds) mockStore.Team().(*mocks.TeamStore).AssertNumberOfCalls(t, "GetUserTeamIds", 1) cachedStore.Team().InvalidateAllTeamIdsForUser(fakeUserId) gotUserTeamIds, err = cachedStore.Team().GetUserTeamIds(fakeUserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUserTeamIds, gotUserTeamIds) mockStore.Team().(*mocks.TeamStore).AssertNumberOfCalls(t, "GetUserTeamIds", 2) }) diff --git a/store/localcachelayer/terms_of_service_layer_test.go b/store/localcachelayer/terms_of_service_layer_test.go index 7574c6ca5a..7cec2f7dff 100644 --- a/store/localcachelayer/terms_of_service_layer_test.go +++ b/store/localcachelayer/terms_of_service_layer_test.go @@ -29,11 +29,11 @@ func TestTermsOfServiceStoreTermsOfServiceCache(t *testing.T) { require.NoError(t, err) termsOfService, err := cachedStore.TermsOfService().GetLatest(true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, termsOfService, &fakeTermsOfService) mockStore.TermsOfService().(*mocks.TermsOfServiceStore).AssertNumberOfCalls(t, "GetLatest", 1) termsOfService, err = cachedStore.TermsOfService().GetLatest(true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, termsOfService, &fakeTermsOfService) mockStore.TermsOfService().(*mocks.TermsOfServiceStore).AssertNumberOfCalls(t, "GetLatest", 1) }) @@ -45,11 +45,11 @@ func TestTermsOfServiceStoreTermsOfServiceCache(t *testing.T) { require.NoError(t, err) termsOfService, err := cachedStore.TermsOfService().Get("123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, termsOfService, &fakeTermsOfService) mockStore.TermsOfService().(*mocks.TermsOfServiceStore).AssertNumberOfCalls(t, "Get", 1) termsOfService, err = cachedStore.TermsOfService().Get("123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, termsOfService, &fakeTermsOfService) mockStore.TermsOfService().(*mocks.TermsOfServiceStore).AssertNumberOfCalls(t, "Get", 1) }) diff --git a/store/localcachelayer/user_layer_test.go b/store/localcachelayer/user_layer_test.go index 88cc948bac..e46fa171cf 100644 --- a/store/localcachelayer/user_layer_test.go +++ b/store/localcachelayer/user_layer_test.go @@ -34,7 +34,7 @@ func TestUserStoreCache(t *testing.T) { require.NoError(t, err) gotUser, err := cachedStore.User().GetProfileByIds(fakeUserIds, &store.UserGetByIdsOpts{}, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUser, gotUser) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "GetProfileByIds", 1) @@ -49,7 +49,7 @@ func TestUserStoreCache(t *testing.T) { require.NoError(t, err) gotUser, err := cachedStore.User().GetProfileByIds(fakeUserIds, &store.UserGetByIdsOpts{}, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUser, gotUser) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "GetProfileByIds", 1) @@ -64,7 +64,7 @@ func TestUserStoreCache(t *testing.T) { require.NoError(t, err) gotUser, err := cachedStore.User().GetProfileByIds(fakeUserIds, &store.UserGetByIdsOpts{}, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUser, gotUser) cachedStore.User().InvalidateProfileCacheForUser("123") @@ -80,7 +80,7 @@ func TestUserStoreCache(t *testing.T) { require.NoError(t, err) storedUsers, err := mockStore.User().GetProfileByIds(fakeUserIds, &store.UserGetByIdsOpts{}, false) - require.Nil(t, err) + require.NoError(t, err) originalProps := make([]model.StringMap, len(storedUsers)) @@ -91,14 +91,14 @@ func TestUserStoreCache(t *testing.T) { } cachedUsers, err := cachedStore.User().GetProfileByIds(fakeUserIds, &store.UserGetByIdsOpts{}, true) - require.Nil(t, err) + require.NoError(t, err) for i := 0; i < len(storedUsers); i++ { assert.Equal(t, storedUsers[i].Id, cachedUsers[i].Id) } cachedUsers, err = cachedStore.User().GetProfileByIds(fakeUserIds, &store.UserGetByIdsOpts{}, true) - require.Nil(t, err) + require.NoError(t, err) for i := 0; i < len(storedUsers); i++ { storedUsers[i].Props = model.StringMap{} storedUsers[i].Timezone = model.StringMap{} @@ -130,7 +130,7 @@ func TestUserStoreProfilesInChannelCache(t *testing.T) { require.NoError(t, err) gotMap, err := cachedStore.User().GetAllProfilesInChannel(fakeChannelId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeMap, gotMap) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "GetAllProfilesInChannel", 1) @@ -145,7 +145,7 @@ func TestUserStoreProfilesInChannelCache(t *testing.T) { require.NoError(t, err) gotMap, err := cachedStore.User().GetAllProfilesInChannel(fakeChannelId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeMap, gotMap) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "GetAllProfilesInChannel", 1) @@ -160,7 +160,7 @@ func TestUserStoreProfilesInChannelCache(t *testing.T) { require.NoError(t, err) gotMap, err := cachedStore.User().GetAllProfilesInChannel(fakeChannelId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeMap, gotMap) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "GetAllProfilesInChannel", 1) @@ -177,7 +177,7 @@ func TestUserStoreProfilesInChannelCache(t *testing.T) { require.NoError(t, err) gotMap, err := cachedStore.User().GetAllProfilesInChannel(fakeChannelId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeMap, gotMap) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "GetAllProfilesInChannel", 1) @@ -202,7 +202,7 @@ func TestUserStoreGetCache(t *testing.T) { require.NoError(t, err) gotUser, err := cachedStore.User().Get(fakeUserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUser, gotUser) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "Get", 1) @@ -217,7 +217,7 @@ func TestUserStoreGetCache(t *testing.T) { require.NoError(t, err) gotUser, err := cachedStore.User().Get(fakeUserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, fakeUser, gotUser) mockStore.User().(*mocks.UserStore).AssertNumberOfCalls(t, "Get", 1) @@ -234,20 +234,20 @@ func TestUserStoreGetCache(t *testing.T) { require.NoError(t, err) storedUser, err := mockStore.User().Get(fakeUserId) - require.Nil(t, err) + require.NoError(t, err) originalProps := storedUser.NotifyProps storedUser.NotifyProps = map[string]string{} storedUser.NotifyProps["key"] = "somevalue" cachedUser, err := cachedStore.User().Get(fakeUserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, storedUser, cachedUser) storedUser.Props = model.StringMap{} storedUser.Timezone = model.StringMap{} cachedUser, err = cachedStore.User().Get(fakeUserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, storedUser, cachedUser) if storedUser == cachedUser { assert.Fail(t, "should be different pointers") diff --git a/store/localcachelayer/webhook_layer_test.go b/store/localcachelayer/webhook_layer_test.go index b5a3f78df7..ad5ae142d3 100644 --- a/store/localcachelayer/webhook_layer_test.go +++ b/store/localcachelayer/webhook_layer_test.go @@ -28,7 +28,7 @@ func TestWebhookStoreCache(t *testing.T) { require.NoError(t, err) incomingWebhook, err := cachedStore.Webhook().GetIncoming("123", true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, incomingWebhook, &fakeWebhook) mockStore.Webhook().(*mocks.WebhookStore).AssertNumberOfCalls(t, "GetIncoming", 1) diff --git a/store/searchtest/channel_layer.go b/store/searchtest/channel_layer.go index ccd94a02fe..c28fcd8632 100644 --- a/store/searchtest/channel_layer.go +++ b/store/searchtest/channel_layer.go @@ -70,100 +70,100 @@ func TestSearchChannelStore(t *testing.T, s store.Store, testEngine *SearchTestE Store: s, } err := th.SetupBasicFixtures() - require.Nil(t, err) + require.NoError(t, err) defer th.CleanFixtures() runTestSearch(t, testEngine, searchChannelStoreTests, th) } func testAutocompleteChannelByName(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id}, res) } func testAutocompleteChannelByDisplayName(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "ChannelA", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "ChannelA", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id}, res) } func testAutocompleteChannelByNameSplittedWithDashChar(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id}, res) } func testAutocompleteChannelByNameSplittedWithUnderscoreChar(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel_alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel_a", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel_a", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{alternate.Id}, res) } func testAutocompleteChannelByDisplayNameSplittedByWhitespaces(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "Channel A", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "Channel A", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{alternate.Id}, res) } func testAutocompleteAllChannelsIfTermIsEmpty(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) other, err := th.createChannel(th.Team.Id, "other-channel", "Other Channel", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) defer th.deleteChannel(other) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id, other.Id}, res) } func testSearchChannelsInCaseInsensitiveManner(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channela", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channela", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id}, res) - res, apperr = th.Store.Channel().AutocompleteInTeam(th.Team.Id, "ChAnNeL-a", false) - require.Nil(t, apperr) + res, err = th.Store.Channel().AutocompleteInTeam(th.Team.Id, "ChAnNeL-a", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id}, res) } func testSearchOnlyPublicChannels(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_PRIVATE, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id}, res) } func testSearchShouldSupportHavingHyphenAsLastCharacter(t *testing.T, th *SearchTestHelper) { alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(alternate) - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-", false) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-", false) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, alternate.Id}, res) } func testSearchShouldSupportAutocompleteWithArchivedChannels(t *testing.T, th *SearchTestHelper) { - res, apperr := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-", true) - require.Nil(t, apperr) + res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-", true) + require.NoError(t, err) th.checkChannelIdsMatch(t, []string{th.ChannelBasic.Id, th.ChannelDeleted.Id}, res) } diff --git a/store/searchtest/file_info_layer.go b/store/searchtest/file_info_layer.go index f3659711da..45661683b8 100644 --- a/store/searchtest/file_info_layer.go +++ b/store/searchtest/file_info_layer.go @@ -189,7 +189,7 @@ func TestSearchFileInfoStore(t *testing.T, s store.Store, testEngine *SearchTest Store: s, } err := th.SetupBasicFixtures() - require.Nil(t, err) + require.NoError(t, err) defer th.CleanFixtures() runTestSearch(t, testEngine, searchFileInfoStoreTests, th) @@ -197,28 +197,28 @@ func TestSearchFileInfoStore(t *testing.T, s store.Store, testEngine *SearchTest func testFileInfoSearchFileInfosIncludingDMs(t *testing.T, th *SearchTestHelper) { direct, err := th.createDirectChannel(th.Team.Id, "direct", "direct", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(direct) post, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "dm test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p1, err := th.createFileInfo(th.User.Id, post.Id, "dm test filename", "dm contenttest filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "dm other filename", "dm other filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post2.Id, "channel test filename", "channel contenttest filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("by-name", func(t *testing.T) { params := &model.SearchParams{Terms: "test"} results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -228,7 +228,7 @@ func testFileInfoSearchFileInfosIncludingDMs(t *testing.T, th *SearchTestHelper) t.Run("by-content", func(t *testing.T) { params := &model.SearchParams{Terms: "contenttest"} results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -238,34 +238,34 @@ func testFileInfoSearchFileInfosIncludingDMs(t *testing.T, th *SearchTestHelper) func testFileInfoSearchFileInfosWithPagination(t *testing.T, th *SearchTestHelper) { direct, err := th.createDirectChannel(th.Team.Id, "direct", "direct", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(direct) post, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 10000, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "dm test", "", model.POST_DEFAULT, 20000, false) - require.Nil(t, err) + require.NoError(t, err) p1, err := th.createFileInfo(th.User.Id, post.Id, "dm test filename", "dm contenttest filename", "jpg", "image/jpeg", 10000, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "dm other filename", "dm other filename", "jpg", "image/jpeg", 20000, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post2.Id, "channel test filename", "channel contenttest filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("by-name", func(t *testing.T) { params := &model.SearchParams{Terms: "test"} results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -274,13 +274,13 @@ func testFileInfoSearchFileInfosWithPagination(t *testing.T, th *SearchTestHelpe t.Run("by-content", func(t *testing.T) { params := &model.SearchParams{Terms: "contenttest"} results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -289,19 +289,19 @@ func testFileInfoSearchFileInfosWithPagination(t *testing.T, th *SearchTestHelpe func testFileInfoSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "channel test 1 2 3 filename", "channel content test 1 2 3 filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "channel test 123 filename", "channel content test 123 filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("by-name", func(t *testing.T) { params := &model.SearchParams{Terms: "\"channel test 1 2 3\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -309,8 +309,8 @@ func testFileInfoSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) { t.Run("by-content", func(t *testing.T) { params := &model.SearchParams{Terms: "\"channel content test 1 2 3\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -319,20 +319,20 @@ func testFileInfoSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "test email test@test.com", "test email test@content.com", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "test email test2@test.com", "test email test2@content.com", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("by-name", func(t *testing.T) { t.Run("Should search email addresses enclosed by quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "\"test@test.com\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -340,8 +340,8 @@ func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { t.Run("Should search email addresses without quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "test@test.com"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -350,8 +350,8 @@ func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { t.Run("by-content", func(t *testing.T) { t.Run("Should search email addresses enclosed by quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "\"test@content.com\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -359,8 +359,8 @@ func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { t.Run("Should search email addresses without quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "test@content.com"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -370,17 +370,17 @@ func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "_start middle end_ _another_", "_start middle end_ _another_", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search the start inside the markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "start"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -388,8 +388,8 @@ func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Should search a word in the middle of the markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "middle"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -397,8 +397,8 @@ func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Should search in the end of the markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "end"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -406,8 +406,8 @@ func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Should search inside markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "another"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -416,36 +416,36 @@ func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should be able to search chinese words", func(t *testing.T) { p1, err := th.createFileInfo(th.User.Id, post.Id, "你好", "你好", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "你", "你", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "你"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) }) t.Run("Should search two words", func(t *testing.T) { params := &model.SearchParams{Terms: "你好"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) }) t.Run("Should search with wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "你*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -454,21 +454,21 @@ func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { }) t.Run("Should be able to search cyrillic words", func(t *testing.T) { p1, err := th.createFileInfo(th.User.Id, post.Id, "слово test", "слово test", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "слово"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) }) t.Run("Should search using wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "слов*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -477,15 +477,15 @@ func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { t.Run("Should be able to search japanese words", func(t *testing.T) { p1, err := th.createFileInfo(th.User.Id, post.Id, "本", "本", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "本木", "本木", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "本"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -493,16 +493,16 @@ func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { }) t.Run("Should search two words", func(t *testing.T) { params := &model.SearchParams{Terms: "本木"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) }) t.Run("Should search with wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "本*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -512,31 +512,31 @@ func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { t.Run("Should be able to search korean words", func(t *testing.T) { p1, err := th.createFileInfo(th.User.Id, post.Id, "불", "불", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "불다", "불다", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "불"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) }) t.Run("Should search two words", func(t *testing.T) { params := &model.SearchParams{Terms: "불다"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) }) t.Run("Should search with wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "불*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -547,26 +547,26 @@ func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "Straße test", "Straße test", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "Strasse test", "Strasse test", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{Terms: "Straße"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) params = &model.SearchParams{Terms: "Strasse"} - results, apperr = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -575,53 +575,53 @@ func testFileInfoSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) func testFileInfoSearchAlternativeSpellingsAccents(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "café", "café", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "café", "café", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{Terms: "café"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) params = &model.SearchParams{Terms: "café"} - results, apperr = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) params = &model.SearchParams{Terms: "cafe"} - results, apperr = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 0) } func testFileInfoSearchOrExcludeFileInfosBySpecificUser(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "test fromuser filename", "test fromuser filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User2.Id, post.Id, "test fromuser filename", "test fromuser filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) defer th.deleteUserFileInfos(th.User2.Id) params := &model.SearchParams{Terms: "fromuser", FromUsers: []string{th.User.Id}} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -629,22 +629,22 @@ func testFileInfoSearchOrExcludeFileInfosBySpecificUser(t *testing.T, th *Search func testFileInfoSearchOrExcludeFileInfosInChannel(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "test fromuser filename", "test fromuser filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post2.Id, "test fromuser filename", "test fromuser filename", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) defer th.deleteUserFileInfos(th.User2.Id) params := &model.SearchParams{Terms: "fromuser", InChannels: []string{th.ChannelBasic.Id}} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -652,24 +652,24 @@ func testFileInfoSearchOrExcludeFileInfosInChannel(t *testing.T, th *SearchTestH func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelper) { direct, err := th.createDirectChannel(th.Team.Id, "direct", "direct", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(direct) group, err := th.createGroupChannel(th.Team.Id, "test group", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(group) post1, err := th.createPost(th.User.Id, direct.Id, "test fromuser", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) post2, err := th.createPost(th.User2.Id, group.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) defer th.deleteUserPosts(th.User2.Id) p1, err := th.createFileInfo(th.User.Id, post1.Id, "test fromuser", "test fromuser", "jpg", "image/jpg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User2.Id, post2.Id, "test fromuser 2", "test fromuser 2", "jpg", "image/jpg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) defer th.deleteUserFileInfos(th.User2.Id) @@ -678,8 +678,8 @@ func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelp Terms: "fromuser", InChannels: []string{direct.Id, group.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -691,8 +691,8 @@ func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelp Terms: "fromuser", InChannels: []string{direct.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -703,8 +703,8 @@ func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelp Terms: "fromuser", InChannels: []string{group.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -713,15 +713,15 @@ func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelp func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "test", "test", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "test", "test", "png", "image/png", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createFileInfo(th.User.Id, post.Id, "test", "test", "bmp", "image/bmp", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Search by one extension", func(t *testing.T) { @@ -730,8 +730,8 @@ func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) InChannels: []string{th.ChannelBasic.Id}, Extensions: []string{"jpg"}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -743,8 +743,8 @@ func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) InChannels: []string{th.ChannelBasic.Id}, Extensions: []string{"jpg", "bmp"}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -757,8 +757,8 @@ func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) InChannels: []string{th.ChannelBasic.Id}, ExcludedExtensions: []string{"jpg"}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -771,8 +771,8 @@ func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) InChannels: []string{th.ChannelBasic.Id}, ExcludedExtensions: []string{"jpg", "bmp"}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -781,20 +781,20 @@ func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) func testFileInfoFilterFilesInSpecificDate(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) creationDate := model.GetMillisForTime(time.Date(2020, 03, 22, 12, 0, 0, 0, time.UTC)) p1, err := th.createFileInfo(th.User.Id, post1.Id, "test in specific date", "test in specific date", "jpg", "image/jpeg", creationDate, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 23, 0, 0, 0, 0, time.UTC)) p2, err := th.createFileInfo(th.User.Id, post2.Id, "test in the present", "test in the present", "jpg", "image/jpeg", creationDate2, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 21, 23, 59, 59, 0, time.UTC)) p3, err := th.createFileInfo(th.User.Id, post1.Id, "test in the present", "test in the present", "jpg", "image/jpeg", creationDate3, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should be able to search posts on date", func(t *testing.T) { @@ -802,8 +802,8 @@ func testFileInfoFilterFilesInSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", OnDate: "2020-03-22", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -813,8 +813,8 @@ func testFileInfoFilterFilesInSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", ExcludedDate: "2020-03-22", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -824,20 +824,20 @@ func testFileInfoFilterFilesInSpecificDate(t *testing.T, th *SearchTestHelper) { func testFileInfoFilterFilesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC)) p1, err := th.createFileInfo(th.User.Id, post1.Id, "test in specific date", "test in specific date", "jpg", "image/jpeg", creationDate, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 22, 23, 59, 59, 0, time.UTC)) p2, err := th.createFileInfo(th.User.Id, post2.Id, "test in specific date 2", "test in specific date 2", "jpg", "image/jpeg", creationDate2, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 26, 16, 55, 0, 0, time.UTC)) p3, err := th.createFileInfo(th.User.Id, post1.Id, "test in the present", "test in the present", "jpg", "image/jpeg", creationDate3, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should be able to search posts before a date", func(t *testing.T) { @@ -845,8 +845,8 @@ func testFileInfoFilterFilesBeforeSpecificDate(t *testing.T, th *SearchTestHelpe Terms: "test", BeforeDate: "2020-03-23", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -858,8 +858,8 @@ func testFileInfoFilterFilesBeforeSpecificDate(t *testing.T, th *SearchTestHelpe Terms: "test", ExcludedBeforeDate: "2020-03-23", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p3.Id, results.FileInfos) @@ -868,20 +868,20 @@ func testFileInfoFilterFilesBeforeSpecificDate(t *testing.T, th *SearchTestHelpe func testFileInfoFilterFilesAfterSpecificDate(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC)) p1, err := th.createFileInfo(th.User.Id, post1.Id, "test in specific date", "test in specific date", "jpg", "image/jpeg", creationDate, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 22, 23, 59, 59, 0, time.UTC)) p2, err := th.createFileInfo(th.User.Id, post2.Id, "test in specific date 2", "test in specific date 2", "jpg", "image/jpeg", creationDate2, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 26, 16, 55, 0, 0, time.UTC)) p3, err := th.createFileInfo(th.User.Id, post1.Id, "test in the present", "test in the present", "jpg", "image/jpeg", creationDate3, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should be able to search posts after a date", func(t *testing.T) { @@ -889,8 +889,8 @@ func testFileInfoFilterFilesAfterSpecificDate(t *testing.T, th *SearchTestHelper Terms: "test", AfterDate: "2020-03-23", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p3.Id, results.FileInfos) @@ -901,8 +901,8 @@ func testFileInfoFilterFilesAfterSpecificDate(t *testing.T, th *SearchTestHelper Terms: "test", ExcludedAfterDate: "2020-03-23", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -912,17 +912,17 @@ func testFileInfoFilterFilesAfterSpecificDate(t *testing.T, th *SearchTestHelper func testFileInfoFilterFilesWithATerm(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post1.Id, "one two three", "one two three", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post2.Id, "one four five six", "one four five six", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post1.Id, "one seven eight nine", "one seven eight nine", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should exclude terms", func(t *testing.T) { @@ -930,8 +930,8 @@ func testFileInfoFilterFilesWithATerm(t *testing.T, th *SearchTestHelper) { Terms: "one", ExcludedTerms: "five eight", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -942,8 +942,8 @@ func testFileInfoFilterFilesWithATerm(t *testing.T, th *SearchTestHelper) { Terms: "one", ExcludedTerms: "\"eight nine\"", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -953,15 +953,15 @@ func testFileInfoFilterFilesWithATerm(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "one two three message", "one two three message", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "two messages", "two messages", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "another message", "another message", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search posts using OR operator", func(t *testing.T) { @@ -969,8 +969,8 @@ func testFileInfoSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) Terms: "one two", OrTerms: true, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -982,8 +982,8 @@ func testFileInfoSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) Terms: "one two", OrTerms: false, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -992,20 +992,20 @@ func testFileInfoSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC)) p1, err := th.createFileInfo(th.User.Id, post2.Id, "one two three message", "one two three message", "jpg", "image/jpeg", creationDate, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 10, 12, 0, 0, 0, time.UTC)) p2, err := th.createFileInfo(th.User2.Id, post2.Id, "two messages", "two messages", "jpg", "image/jpeg", creationDate2, 0) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 20, 12, 0, 0, 0, time.UTC)) p3, err := th.createFileInfo(th.User.Id, post1.Id, "two another message", "two another message", "jpg", "image/jpeg", creationDate3, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) defer th.deleteUserFileInfos(th.User2.Id) @@ -1015,8 +1015,8 @@ func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) FromUsers: []string{th.User2.Id}, InChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -1028,8 +1028,8 @@ func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) ExcludedUsers: []string{th.User2.Id}, InChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1042,8 +1042,8 @@ func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) ExcludedAfterDate: "2020-03-11", InChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -1054,8 +1054,8 @@ func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) AfterDate: "2020-03-11", ExcludedChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p3.Id, results.FileInfos) @@ -1064,25 +1064,25 @@ func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) func testFileInfoSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "the search for a bunch of stop words", "the search for a bunch of stop words", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "the objective is to avoid a bunch of stop words", "the objective is to avoid a bunch of stop words", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createFileInfo(th.User.Id, post.Id, "in the a on to where you", "in the a on to where you", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p4, err := th.createFileInfo(th.User.Id, post.Id, "where is the car?", "where is the car?", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should avoid stop word 'the'", func(t *testing.T) { params := &model.SearchParams{ Terms: "the search", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1092,8 +1092,8 @@ func testFileInfoSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "a avoid", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -1103,45 +1103,45 @@ func testFileInfoSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "in where you", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p3.Id, results.FileInfos) }) t.Run("Should avoid stop words 'where', 'is' and 'the'", func(t *testing.T) { - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{{Terms: "is the car"}}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{{Terms: "is the car"}}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p4.Id, results.FileInfos) }) t.Run("Should remove all terms and return empty list", func(t *testing.T) { - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{{Terms: "is the"}}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{{Terms: "is the"}}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Empty(t, results.FileInfos) }) } func testFileInfoSupportStemming(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "search post", "search post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "searching post", "searching post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "another post", "another post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{ Terms: "search", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1150,23 +1150,23 @@ func testFileInfoSupportStemming(t *testing.T, th *SearchTestHelper) { func testFileInfoSupportWildcards(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "search post", "search post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "searching", "searching", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "another post", "another post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Simple wildcard-only search", func(t *testing.T) { params := &model.SearchParams{ Terms: "search*", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1177,8 +1177,8 @@ func testFileInfoSupportWildcards(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "sear* post", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1187,42 +1187,42 @@ func testFileInfoSupportWildcards(t *testing.T, th *SearchTestHelper) { func testFileInfoNotSupportPrecedingWildcards(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) _, err = th.createFileInfo(th.User.Id, post.Id, "search post", "search post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "searching post", "searching post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "another post", "another post", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{ Terms: "*earch", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 0) } func testFileInfoSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "qwerty", "qwerty", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "qwertyjkl", "qwertyjkl", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{ Terms: "qwerty *", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1230,21 +1230,21 @@ func testFileInfoSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) func testFileInfoSupportTermsWithDash(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "search term-with-dash", "search term-with-dash", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "searching term with dash", "searching term with dash", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search terms with dash", func(t *testing.T) { params := &model.SearchParams{ Terms: "term-with-dash", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1254,8 +1254,8 @@ func testFileInfoSupportTermsWithDash(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "\"term-with-dash\"", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1264,21 +1264,21 @@ func testFileInfoSupportTermsWithDash(t *testing.T, th *SearchTestHelper) { func testFileInfoSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "search term_with_underscore", "search term_with_underscore", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "searching term with underscore", "searching term with underscore", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should search terms with underscore", func(t *testing.T) { params := &model.SearchParams{ Terms: "term_with_underscore", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1288,8 +1288,8 @@ func testFileInfoSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) params := &model.SearchParams{ Terms: "\"term_with_underscore\"", } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1298,27 +1298,27 @@ func testFileInfoSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelDeleted.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post1.Id, "message in deleted channel", "message in deleted channel", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post2.Id, "message in regular channel", "message in regular channel", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createFileInfo(th.User.Id, post3.Id, "message in private channel", "message in private channel", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Doesn't include posts in deleted channels", func(t *testing.T) { params := &model.SearchParams{Terms: "message", IncludeDeletedChannels: false} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -1327,8 +1327,8 @@ func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestH t.Run("Include posts in deleted channels", func(t *testing.T) { params := &model.SearchParams{Terms: "message", IncludeDeletedChannels: true} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 3) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1338,8 +1338,8 @@ func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestH t.Run("Include posts in deleted channels using multiple terms", func(t *testing.T) { params := &model.SearchParams{Terms: "message channel", IncludeDeletedChannels: true} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 3) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1353,8 +1353,8 @@ func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestH IncludeDeletedChannels: true, OrTerms: true, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 3) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1371,27 +1371,27 @@ func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestH Terms: "#hashtag", IncludeDeletedChannels: false, } - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params1, params2}, th.User.Id, th.Team.Id, 0, 20) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params1, params2}, th.User.Id, th.Team.Id, 0, 20) require.Nil(t, results) - require.NotNil(t, apperr) + require.Error(t, err) }) } func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "message with-dash-term", "message with-dash-term", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "message with dash term", "message with dash term", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Search for terms with dash", func(t *testing.T) { params := &model.SearchParams{Terms: "with-dash-term"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1399,8 +1399,8 @@ func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { t.Run("Search for terms with quoted dash", func(t *testing.T) { params := &model.SearchParams{Terms: "\"with-dash-term\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1408,8 +1408,8 @@ func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple terms with one having dash", func(t *testing.T) { params := &model.SearchParams{Terms: "with-dash-term message"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1417,8 +1417,8 @@ func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple OR terms with one having dash", func(t *testing.T) { params := &model.SearchParams{Terms: "with-dash-term message", OrTerms: true} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1428,19 +1428,19 @@ func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "message with.dots.term", "message with.dots.term", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "message with dots term", "message with dots term", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Search for terms with dots", func(t *testing.T) { params := &model.SearchParams{Terms: "with.dots.term"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1448,8 +1448,8 @@ func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { t.Run("Search for terms with quoted dots", func(t *testing.T) { params := &model.SearchParams{Terms: "\"with.dots.term\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1457,8 +1457,8 @@ func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple terms with one having dots", func(t *testing.T) { params := &model.SearchParams{Terms: "with.dots.term message"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1466,8 +1466,8 @@ func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple OR terms with one having dots", func(t *testing.T) { params := &model.SearchParams{Terms: "with.dots.term message", OrTerms: true} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1477,19 +1477,19 @@ func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "message with_underscores_term", "message with_underscores_term", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post.Id, "message with underscores term", "message with underscores term", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Search for terms with underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "with_underscores_term"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1497,8 +1497,8 @@ func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) t.Run("Search for terms with quoted underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "\"with_underscores_term\""} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1506,8 +1506,8 @@ func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) t.Run("Search for multiple terms with one having underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "with_underscores_term message"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1515,8 +1515,8 @@ func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) t.Run("Search for multiple OR terms with one having underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "with_underscores_term message", OrTerms: true} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1526,24 +1526,24 @@ func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) func testFileInfoSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post1.Id, "approve", "approve", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post2.Id, "approved", "approved", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createFileInfo(th.User.Id, post2.Id, "approvedz", "approvedz", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should stem appr", func(t *testing.T) { params := &model.SearchParams{Terms: "appr*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 3) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1553,8 +1553,8 @@ func testFileInfoSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) t.Run("Should stem approve", func(t *testing.T) { params := &model.SearchParams{Terms: "approve*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p3.Id, results.FileInfos) @@ -1563,21 +1563,21 @@ func testFileInfoSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) func testFileInfoSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) { post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p1, err := th.createFileInfo(th.User.Id, post1.Id, "hello world", "hello world", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createFileInfo(th.User.Id, post2.Id, "hell or heaven", "hell or heaven", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) t.Run("Should return results without quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "hell*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 2) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1586,8 +1586,8 @@ func testFileInfoSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper t.Run("Should return just one result with quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "\"hell\"*"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p2.Id, results.FileInfos) @@ -1597,30 +1597,30 @@ func testFileInfoSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper func testFileInfoSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "alpha/beta gamma, theta", "alpha/beta gamma, theta", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{Terms: "gamma"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) params = &model.SearchParams{Terms: "beta"} - results, apperr = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) params = &model.SearchParams{Terms: "alpha"} - results, apperr = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) @@ -1628,18 +1628,18 @@ func testFileInfoSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelpe func testFileInfoSearchEmailsWithoutQuotes(t *testing.T, th *SearchTestHelper) { post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) p1, err := th.createFileInfo(th.User.Id, post.Id, "message test@test.com", "message test@test.com", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createFileInfo(th.User.Id, post.Id, "message test2@test.com", "message test2@test.com", "jpg", "image/jpeg", 0, 0) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserFileInfos(th.User.Id) params := &model.SearchParams{Terms: "test@test.com"} - results, apperr := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.FileInfo().Search([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.FileInfos, 1) th.checkFileInfoInSearchResults(t, p1.Id, results.FileInfos) diff --git a/store/searchtest/helper.go b/store/searchtest/helper.go index 3939150d32..02a50ad2c0 100644 --- a/store/searchtest/helper.go +++ b/store/searchtest/helper.go @@ -147,29 +147,19 @@ func (th *SearchTestHelper) CleanFixtures() error { } func (th *SearchTestHelper) createTeam(name, displayName, teamType string) (*model.Team, error) { - team, appError := th.Store.Team().Save(&model.Team{ + return th.Store.Team().Save(&model.Team{ Name: name, DisplayName: displayName, Type: teamType, }) - if appError != nil { - return nil, errors.New(appError.Error()) - } - - return team, nil } func (th *SearchTestHelper) deleteTeam(team *model.Team) error { - appError := th.Store.Team().RemoveAllMembersByTeam(team.Id) - if appError != nil { - return errors.New(appError.Error()) - } - err := th.Store.Team().PermanentDelete(team.Id) + err := th.Store.Team().RemoveAllMembersByTeam(team.Id) if err != nil { return err } - - return nil + return th.Store.Team().PermanentDelete(team.Id) } func (th *SearchTestHelper) makeEmail() string { @@ -177,7 +167,7 @@ func (th *SearchTestHelper) makeEmail() string { } func (th *SearchTestHelper) createUser(username, nickname, firstName, lastName string) (*model.User, error) { - user, appError := th.Store.User().Save(&model.User{ + return th.Store.User().Save(&model.User{ Username: username, Password: username, Nickname: nickname, @@ -185,15 +175,10 @@ func (th *SearchTestHelper) createUser(username, nickname, firstName, lastName s LastName: lastName, Email: th.makeEmail(), }) - if appError != nil { - return nil, errors.New(appError.Error()) - } - - return user, nil } func (th *SearchTestHelper) createGuest(username, nickname, firstName, lastName string) (*model.User, error) { - user, appError := th.Store.User().Save(&model.User{ + return th.Store.User().Save(&model.User{ Username: username, Password: username, Nickname: nickname, @@ -202,26 +187,16 @@ func (th *SearchTestHelper) createGuest(username, nickname, firstName, lastName Email: th.makeEmail(), Roles: model.SYSTEM_GUEST_ROLE_ID, }) - if appError != nil { - return nil, errors.New(appError.Error()) - } - - return user, nil } func (th *SearchTestHelper) deleteUser(user *model.User) error { - appError := th.Store.User().PermanentDelete(user.Id) - if appError != nil { - return errors.New(appError.Error()) - } - - return nil + return th.Store.User().PermanentDelete(user.Id) } func (th *SearchTestHelper) cleanAllUsers() error { - users, apperr := th.Store.User().GetAll() - if apperr != nil { - return apperr + users, err := th.Store.User().GetAll() + if err != nil { + return err } for _, u := range users { @@ -241,9 +216,9 @@ func (th *SearchTestHelper) createBot(username, displayName, ownerID string) (*m OwnerId: ownerID, } - user, apperr := th.Store.User().Save(model.UserFromBot(botModel)) - if apperr != nil { - return nil, errors.New(apperr.Error()) + user, err := th.Store.User().Save(model.UserFromBot(botModel)) + if err != nil { + return nil, errors.New(err.Error()) } botModel.UserId = user.Id @@ -265,21 +240,21 @@ func (th *SearchTestHelper) deleteBot(botID string) error { } func (th *SearchTestHelper) createChannel(teamID, name, displayName, purpose, channelType string, deleted bool) (*model.Channel, error) { - channel, appError := th.Store.Channel().Save(&model.Channel{ + channel, err := th.Store.Channel().Save(&model.Channel{ TeamId: teamID, DisplayName: displayName, Name: name, Type: channelType, Purpose: purpose, }, 999) - if appError != nil { - return nil, errors.New(appError.Error()) + if err != nil { + return nil, err } if deleted { - appError := th.Store.Channel().Delete(channel.Id, model.GetMillis()) - if appError != nil { - return nil, errors.New(appError.Error()) + err := th.Store.Channel().Delete(channel.Id, model.GetMillis()) + if err != nil { + return nil, err } } @@ -324,9 +299,9 @@ func (th *SearchTestHelper) createGroupChannel(teamID, displayName string, users Type: model.CHANNEL_GROUP, } - channel, apperr := th.Store.Channel().Save(group, 10000) - if apperr != nil { - return nil, errors.New(apperr.Error()) + channel, err := th.Store.Channel().Save(group, 10000) + if err != nil { + return nil, errors.New(err.Error()) } for _, user := range users { @@ -341,17 +316,12 @@ func (th *SearchTestHelper) createGroupChannel(teamID, displayName string, users } func (th *SearchTestHelper) deleteChannel(channel *model.Channel) error { - appError := th.Store.Channel().PermanentDeleteMembersByChannel(channel.Id) - if appError != nil { - return errors.New(appError.Error()) - } - - err := th.Store.Channel().PermanentDelete(channel.Id) + err := th.Store.Channel().PermanentDeleteMembersByChannel(channel.Id) if err != nil { return err } - return nil + return th.Store.Channel().PermanentDelete(channel.Id) } func (th *SearchTestHelper) deleteChannels(channels []*model.Channel) error { @@ -384,12 +354,7 @@ func (th *SearchTestHelper) createPost(userID, channelID, message, hashtags, pos creationTime = createAt } postModel := th.createPostModel(userID, channelID, message, hashtags, postType, creationTime, pinned) - post, appError := th.Store.Post().Save(postModel) - if appError != nil { - return nil, errors.New(appError.Error()) - } - - return post, nil + return th.Store.Post().Save(postModel) } func (th *SearchTestHelper) createFileInfoModel(creatorID, postID, name, content, extension, mimeType string, createAt, size int64) *model.FileInfo { @@ -414,23 +379,14 @@ func (th *SearchTestHelper) createFileInfo(creatorID, postID, name, content, ext creationTime = createAt } fileInfoModel := th.createFileInfoModel(creatorID, postID, name, content, extension, mimeType, creationTime, size) - fileInfo, appError := th.Store.FileInfo().Save(fileInfoModel) - if appError != nil { - return nil, errors.New(appError.Error()) - } - - return fileInfo, nil + return th.Store.FileInfo().Save(fileInfoModel) } func (th *SearchTestHelper) createReply(userID, message, hashtags string, parent *model.Post, createAt int64, pinned bool) (*model.Post, error) { replyModel := th.createPostModel(userID, parent.ChannelId, message, hashtags, parent.Type, createAt, pinned) replyModel.ParentId = parent.Id replyModel.RootId = parent.Id - reply, appError := th.Store.Post().Save(replyModel) - if appError != nil { - return nil, errors.New(appError.Error()) - } - return reply, nil + return th.Store.Post().Save(replyModel) } func (th *SearchTestHelper) deleteUserPosts(userID string) error { diff --git a/store/searchtest/post_layer.go b/store/searchtest/post_layer.go index 720f58b273..40d2be566a 100644 --- a/store/searchtest/post_layer.go +++ b/store/searchtest/post_layer.go @@ -269,7 +269,7 @@ func TestSearchPostStore(t *testing.T, s store.Store, testEngine *SearchTestEngi Store: s, } err := th.SetupBasicFixtures() - require.Nil(t, err) + require.NoError(t, err) defer th.CleanFixtures() runTestSearch(t, testEngine, searchPostStoreTests, th) @@ -277,20 +277,20 @@ func TestSearchPostStore(t *testing.T, s store.Store, testEngine *SearchTestEngi func testSearchPostsIncludingDMs(t *testing.T, th *SearchTestHelper) { direct, err := th.createDirectChannel(th.Team.Id, "direct", "direct", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(direct) p1, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, direct.Id, "dm other", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "test"} results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -299,26 +299,26 @@ func testSearchPostsIncludingDMs(t *testing.T, th *SearchTestHelper) { func testSearchPostsWithPagination(t *testing.T, th *SearchTestHelper) { direct, err := th.createDirectChannel(th.Team.Id, "direct", "direct", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(direct) p1, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 10000, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, direct.Id, "dm other", "", model.POST_DEFAULT, 20000, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "test"} results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) results, err = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -326,14 +326,14 @@ func testSearchPostsWithPagination(t *testing.T, th *SearchTestHelper) { func testSearchReturnPinnedAndUnpinned(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test unpinned", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test pinned", "", model.POST_DEFAULT, 0, true) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "test"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -342,14 +342,14 @@ func testSearchReturnPinnedAndUnpinned(t *testing.T, th *SearchTestHelper) { func testSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test 1 2 3", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test 123", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "\"channel test 1 2 3\""} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -357,15 +357,15 @@ func testSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) { func testSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test email test@test.com", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test email test2@test.com", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search email addresses enclosed by quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "\"test@test.com\""} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -373,8 +373,8 @@ func testSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { t.Run("Should search email addresses without quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "test@test.com"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -383,13 +383,13 @@ func testSearchEmailAddresses(t *testing.T, th *SearchTestHelper) { func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "_start middle end_ _another_", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search the start inside the markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "start"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -397,8 +397,8 @@ func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Should search a word in the middle of the markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "middle"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -406,8 +406,8 @@ func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Should search in the end of the markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "end"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -415,8 +415,8 @@ func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Should search inside markdown underscore", func(t *testing.T) { params := &model.SearchParams{Terms: "another"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -426,31 +426,31 @@ func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) { func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { t.Run("Should be able to search chinese words", func(t *testing.T) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "你好", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "你", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "你"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) }) t.Run("Should search two words", func(t *testing.T) { params := &model.SearchParams{Terms: "你好"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) }) t.Run("Should search with wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "你*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -459,21 +459,21 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { }) t.Run("Should be able to search cyrillic words", func(t *testing.T) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "слово test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "слово"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) }) t.Run("Should search using wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "слов*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -482,15 +482,15 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { t.Run("Should be able to search japanese words", func(t *testing.T) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "本", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "本木", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "本"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -498,16 +498,16 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { }) t.Run("Should search two words", func(t *testing.T) { params := &model.SearchParams{Terms: "本木"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) }) t.Run("Should search with wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "本*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -517,31 +517,31 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { t.Run("Should be able to search korean words", func(t *testing.T) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "불", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "불다", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search one word", func(t *testing.T) { params := &model.SearchParams{Terms: "불"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) }) t.Run("Should search two words", func(t *testing.T) { params := &model.SearchParams{Terms: "불다"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) }) t.Run("Should search with wildcard", func(t *testing.T) { params := &model.SearchParams{Terms: "불*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -552,22 +552,22 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) { func testSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "Straße test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "Strasse test", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "Straße"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) th.checkPostInSearchResults(t, p2.Id, results.Posts) params = &model.SearchParams{Terms: "Strasse"} - results, apperr = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -576,39 +576,39 @@ func testSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) { func testSearchAlternativeSpellingsAccents(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "café", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "café", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "café"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) th.checkPostInSearchResults(t, p2.Id, results.Posts) params = &model.SearchParams{Terms: "café"} - results, apperr = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) th.checkPostInSearchResults(t, p2.Id, results.Posts) params = &model.SearchParams{Terms: "cafe"} - results, apperr = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 0) } func testSearchOrExcludePostsBySpecificUser(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test fromuser", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User2.Id, th.ChannelPrivate.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) defer th.deleteUserPosts(th.User2.Id) @@ -616,8 +616,8 @@ func testSearchOrExcludePostsBySpecificUser(t *testing.T, th *SearchTestHelper) Terms: "fromuser", FromUsers: []string{th.User.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -625,9 +625,9 @@ func testSearchOrExcludePostsBySpecificUser(t *testing.T, th *SearchTestHelper) func testSearchOrExcludePostsInChannel(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test fromuser", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User2.Id, th.ChannelPrivate.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) defer th.deleteUserPosts(th.User2.Id) @@ -635,8 +635,8 @@ func testSearchOrExcludePostsInChannel(t *testing.T, th *SearchTestHelper) { Terms: "fromuser", InChannels: []string{th.ChannelBasic.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -644,17 +644,17 @@ func testSearchOrExcludePostsInChannel(t *testing.T, th *SearchTestHelper) { func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) { direct, err := th.createDirectChannel(th.Team.Id, "direct", "direct", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(direct) group, err := th.createGroupChannel(th.Team.Id, "test group", []*model.User{th.User, th.User2}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteChannel(group) p1, err := th.createPost(th.User.Id, direct.Id, "test fromuser", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User2.Id, group.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) defer th.deleteUserPosts(th.User2.Id) @@ -663,8 +663,8 @@ func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) { Terms: "fromuser", InChannels: []string{direct.Id, group.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -676,8 +676,8 @@ func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) { Terms: "fromuser", InChannels: []string{direct.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -688,8 +688,8 @@ func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) { Terms: "fromuser", InChannels: []string{group.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -699,13 +699,13 @@ func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) { func testFilterMessagesInSpecificDate(t *testing.T, th *SearchTestHelper) { creationDate := model.GetMillisForTime(time.Date(2020, 03, 22, 12, 0, 0, 0, time.UTC)) p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.POST_DEFAULT, creationDate, false) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 23, 0, 0, 0, 0, time.UTC)) p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in the present", "", model.POST_DEFAULT, creationDate2, false) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 21, 23, 59, 59, 0, time.UTC)) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.POST_DEFAULT, creationDate3, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should be able to search posts on date", func(t *testing.T) { @@ -713,8 +713,8 @@ func testFilterMessagesInSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", OnDate: "2020-03-22", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -724,8 +724,8 @@ func testFilterMessagesInSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", ExcludedDate: "2020-03-22", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -736,13 +736,13 @@ func testFilterMessagesInSpecificDate(t *testing.T, th *SearchTestHelper) { func testFilterMessagesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) { creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC)) p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.POST_DEFAULT, creationDate, false) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 22, 23, 59, 59, 0, time.UTC)) p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in specific date 2", "", model.POST_DEFAULT, creationDate2, false) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 26, 16, 55, 0, 0, time.UTC)) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.POST_DEFAULT, creationDate3, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should be able to search posts before a date", func(t *testing.T) { @@ -750,8 +750,8 @@ func testFilterMessagesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", BeforeDate: "2020-03-23", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -763,8 +763,8 @@ func testFilterMessagesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", ExcludedBeforeDate: "2020-03-23", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p3.Id, results.Posts) @@ -774,13 +774,13 @@ func testFilterMessagesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) { func testFilterMessagesAfterSpecificDate(t *testing.T, th *SearchTestHelper) { creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC)) p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.POST_DEFAULT, creationDate, false) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 22, 23, 59, 59, 0, time.UTC)) p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in specific date 2", "", model.POST_DEFAULT, creationDate2, false) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 26, 16, 55, 0, 0, time.UTC)) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.POST_DEFAULT, creationDate3, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should be able to search posts after a date", func(t *testing.T) { @@ -788,8 +788,8 @@ func testFilterMessagesAfterSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", AfterDate: "2020-03-23", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p3.Id, results.Posts) @@ -800,8 +800,8 @@ func testFilterMessagesAfterSpecificDate(t *testing.T, th *SearchTestHelper) { Terms: "test", ExcludedAfterDate: "2020-03-23", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -811,11 +811,11 @@ func testFilterMessagesAfterSpecificDate(t *testing.T, th *SearchTestHelper) { func testFilterMessagesWithATerm(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one two three", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "one four five six", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "one seven eight nine", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should exclude terms", func(t *testing.T) { @@ -823,8 +823,8 @@ func testFilterMessagesWithATerm(t *testing.T, th *SearchTestHelper) { Terms: "one", ExcludedTerms: "five eight", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -835,8 +835,8 @@ func testFilterMessagesWithATerm(t *testing.T, th *SearchTestHelper) { Terms: "one", ExcludedTerms: "\"eight nine\"", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -846,11 +846,11 @@ func testFilterMessagesWithATerm(t *testing.T, th *SearchTestHelper) { func testSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one two three message", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "two messages", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another message", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search posts using OR operator", func(t *testing.T) { @@ -858,8 +858,8 @@ func testSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) { Terms: "one two", OrTerms: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -871,8 +871,8 @@ func testSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) { Terms: "one two", OrTerms: false, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -882,13 +882,13 @@ func testSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) { func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC)) p1, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "one two three message", "", model.POST_DEFAULT, creationDate, false) - require.Nil(t, err) + require.NoError(t, err) creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 10, 12, 0, 0, 0, time.UTC)) p2, err := th.createPost(th.User2.Id, th.ChannelPrivate.Id, "two messages", "", model.POST_DEFAULT, creationDate2, false) - require.Nil(t, err) + require.NoError(t, err) creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 20, 12, 0, 0, 0, time.UTC)) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "two another message", "", model.POST_DEFAULT, creationDate3, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) defer th.deleteUserPosts(th.User2.Id) @@ -898,8 +898,8 @@ func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { FromUsers: []string{th.User2.Id}, InChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -911,8 +911,8 @@ func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { ExcludedUsers: []string{th.User2.Id}, InChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -925,8 +925,8 @@ func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { ExcludedAfterDate: "2020-03-11", InChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -937,8 +937,8 @@ func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { AfterDate: "2020-03-11", ExcludedChannels: []string{th.ChannelPrivate.Id}, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p3.Id, results.Posts) @@ -947,21 +947,21 @@ func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) { func testSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "the search for a bunch of stop words", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "the objective is to avoid a bunch of stop words", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "in the a on to where you", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p4, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "where is the car?", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should avoid stop word 'the'", func(t *testing.T) { params := &model.SearchParams{ Terms: "the search", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -971,8 +971,8 @@ func testSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "a avoid", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -982,41 +982,41 @@ func testSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "in where you", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p3.Id, results.Posts) }) t.Run("Should avoid stop words 'where', 'is' and 'the'", func(t *testing.T) { - results, apperr := th.Store.Post().Search(th.Team.Id, th.User.Id, &model.SearchParams{Terms: "where is the car"}) - require.Nil(t, apperr) + results, err := th.Store.Post().Search(th.Team.Id, th.User.Id, &model.SearchParams{Terms: "where is the car"}) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p4.Id, results.Posts) }) t.Run("Should remove all terms and return empty list", func(t *testing.T) { - results, apperr := th.Store.Post().Search(th.Team.Id, th.User.Id, &model.SearchParams{Terms: "where is the"}) - require.Nil(t, apperr) + results, err := th.Store.Post().Search(th.Team.Id, th.User.Id, &model.SearchParams{Terms: "where is the"}) + require.NoError(t, err) require.Empty(t, results.Posts) }) } func testSupportStemming(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "search", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1025,19 +1025,19 @@ func testSupportStemming(t *testing.T, th *SearchTestHelper) { func testSupportWildcards(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Simple wildcard-only search", func(t *testing.T) { params := &model.SearchParams{ Terms: "search*", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1048,8 +1048,8 @@ func testSupportWildcards(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "sear* post", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1058,34 +1058,34 @@ func testSupportWildcards(t *testing.T, th *SearchTestHelper) { func testNotSupportPrecedingWildcards(t *testing.T, th *SearchTestHelper) { _, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "*earch", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 0) } func testSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "qwerty", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "qwertyjkl", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "qwerty *", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1093,17 +1093,17 @@ func testSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) { func testSupportTermsWithDash(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search term-with-dash", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with dash", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search terms with dash", func(t *testing.T) { params := &model.SearchParams{ Terms: "term-with-dash", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1113,8 +1113,8 @@ func testSupportTermsWithDash(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "\"term-with-dash\"", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1123,17 +1123,17 @@ func testSupportTermsWithDash(t *testing.T, th *SearchTestHelper) { func testSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search term_with_underscore", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with underscore", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search terms with underscore", func(t *testing.T) { params := &model.SearchParams{ Terms: "term_with_underscore", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1143,8 +1143,8 @@ func testSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) { params := &model.SearchParams{ Terms: "\"term_with_underscore\"", } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1153,11 +1153,11 @@ func testSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) { func testSearchOrExcludePostsWithHashtags(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post with #hashtag", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with hashtag", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search terms with hashtags", func(t *testing.T) { @@ -1165,8 +1165,8 @@ func testSearchOrExcludePostsWithHashtags(t *testing.T, th *SearchTestHelper) { Terms: "#hashtag", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1178,8 +1178,8 @@ func testSearchOrExcludePostsWithHashtags(t *testing.T, th *SearchTestHelper) { Terms: "#hashtag", IsHashtag: false, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1189,23 +1189,23 @@ func testSearchOrExcludePostsWithHashtags(t *testing.T, th *SearchTestHelper) { func testSearchHashtagWithMarkdown(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with `#hashtag`", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with **#hashtag**", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p4, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with ~~#hashtag~~", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p5, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with _#hashtag_", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "#hashtag", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 5) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1217,9 +1217,9 @@ func testSearchHashtagWithMarkdown(t *testing.T, th *SearchTestHelper) { func testSearcWithMultipleHashtags(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtwo #hashone", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with `#hashtag`", "#hashtwo #hashthree", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should search posts with multiple hashtags", func(t *testing.T) { @@ -1227,8 +1227,8 @@ func testSearcWithMultipleHashtags(t *testing.T, th *SearchTestHelper) { Terms: "#hashone #hashtwo", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1240,8 +1240,8 @@ func testSearcWithMultipleHashtags(t *testing.T, th *SearchTestHelper) { IsHashtag: true, OrTerms: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1251,15 +1251,15 @@ func testSearcWithMultipleHashtags(t *testing.T, th *SearchTestHelper) { func testSearchPostsWithDotsInHashtags(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag.dot", "#hashtag.dot", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "#hashtag.dot", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1267,11 +1267,11 @@ func testSearchPostsWithDotsInHashtags(t *testing.T, th *SearchTestHelper) { func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #HaShTaG", "#HaShTaG", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #HASHTAG", "#HASHTAG", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Lower case hashtag", func(t *testing.T) { @@ -1279,8 +1279,8 @@ func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) { Terms: "#hashtag", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1293,8 +1293,8 @@ func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) { Terms: "#HASHTAG", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1307,8 +1307,8 @@ func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) { Terms: "#HaShTaG", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1319,17 +1319,17 @@ func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) { func testSearchHashtagWithDash(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag-test", "#hashtag-test", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "#hashtag-test", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1337,17 +1337,17 @@ func testSearchHashtagWithDash(t *testing.T, th *SearchTestHelper) { func testSearchHashtagWithNumbers(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #h4sht4g", "#h4sht4g", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "#h4sht4g", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1355,17 +1355,17 @@ func testSearchHashtagWithNumbers(t *testing.T, th *SearchTestHelper) { func testSearchHashtagWithDots(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag.test", "#hashtag.test", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "#hashtag.test", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1373,17 +1373,17 @@ func testSearchHashtagWithDots(t *testing.T, th *SearchTestHelper) { func testSearchHashtagWithUnderscores(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag_test", "#hashtag_test", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{ Terms: "#hashtag_test", IsHashtag: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1391,38 +1391,38 @@ func testSearchHashtagWithUnderscores(t *testing.T, th *SearchTestHelper) { func testSearchShouldExcludeSytemMessages(t *testing.T, th *SearchTestHelper) { _, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message one", "", model.POST_JOIN_CHANNEL, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message two", "", model.POST_LEAVE_CHANNEL, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message three", "", model.POST_LEAVE_TEAM, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message four", "", model.POST_ADD_TO_CHANNEL, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message five", "", model.POST_ADD_TO_TEAM, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message six", "", model.POST_HEADER_CHANGE, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "test system"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 0) } func testSearchShouldBeAbleToMatchByMentions(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system @testuser", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system testuser", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system #testuser", "#testuser", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "@testuser"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1432,17 +1432,17 @@ func testSearchShouldBeAbleToMatchByMentions(t *testing.T, th *SearchTestHelper) func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelDeleted.Id, "message in deleted channel", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message in regular channel", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "message in private channel", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Doesn't include posts in deleted channels", func(t *testing.T) { params := &model.SearchParams{Terms: "message", IncludeDeletedChannels: false} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -1451,8 +1451,8 @@ func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) { t.Run("Include posts in deleted channels", func(t *testing.T) { params := &model.SearchParams{Terms: "message", IncludeDeletedChannels: true} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1462,8 +1462,8 @@ func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) { t.Run("Include posts in deleted channels using multiple terms", func(t *testing.T) { params := &model.SearchParams{Terms: "message channel", IncludeDeletedChannels: true} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1477,8 +1477,8 @@ func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) { IncludeDeletedChannels: true, OrTerms: true, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1495,23 +1495,23 @@ func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) { Terms: "#hashtag", IncludeDeletedChannels: false, } - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params1, params2}, th.User.Id, th.Team.Id, 0, 20) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params1, params2}, th.User.Id, th.Team.Id, 0, 20) require.Nil(t, results) - require.NotNil(t, apperr) + require.Error(t, err) }) } func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with-dash-term", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with dash term", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Search for terms with dash", func(t *testing.T) { params := &model.SearchParams{Terms: "with-dash-term"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1519,8 +1519,8 @@ func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { t.Run("Search for terms with quoted dash", func(t *testing.T) { params := &model.SearchParams{Terms: "\"with-dash-term\""} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1528,8 +1528,8 @@ func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple terms with one having dash", func(t *testing.T) { params := &model.SearchParams{Terms: "with-dash-term message"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1537,8 +1537,8 @@ func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple OR terms with one having dash", func(t *testing.T) { params := &model.SearchParams{Terms: "with-dash-term message", OrTerms: true} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1548,15 +1548,15 @@ func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) { func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with.dots.term", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with dots term", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Search for terms with dots", func(t *testing.T) { params := &model.SearchParams{Terms: "with.dots.term"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1564,8 +1564,8 @@ func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { t.Run("Search for terms with quoted dots", func(t *testing.T) { params := &model.SearchParams{Terms: "\"with.dots.term\""} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1573,8 +1573,8 @@ func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple terms with one having dots", func(t *testing.T) { params := &model.SearchParams{Terms: "with.dots.term message"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1582,8 +1582,8 @@ func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple OR terms with one having dots", func(t *testing.T) { params := &model.SearchParams{Terms: "with.dots.term message", OrTerms: true} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1593,15 +1593,15 @@ func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) { func testSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with_underscores_term", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with underscores term", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Search for terms with underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "with_underscores_term"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1609,8 +1609,8 @@ func testSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Search for terms with quoted underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "\"with_underscores_term\""} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1618,8 +1618,8 @@ func testSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple terms with one having underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "with_underscores_term message"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1627,8 +1627,8 @@ func testSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) { t.Run("Search for multiple OR terms with one having underscores", func(t *testing.T) { params := &model.SearchParams{Terms: "with_underscores_term message", OrTerms: true} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1638,19 +1638,19 @@ func testSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) { func testSearchBotAccountsPosts(t *testing.T, th *SearchTestHelper) { bot, err := th.createBot("testbot", "Test Bot", th.User.Id) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteBot(bot.UserId) err = th.addUserToTeams(model.UserFromBot(bot), []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) p1, err := th.createPost(bot.UserId, th.ChannelBasic.Id, "bot test message", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(bot.UserId, th.ChannelPrivate.Id, "bot test message in private", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(bot.UserId) params := &model.SearchParams{Terms: "bot"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1659,17 +1659,17 @@ func testSearchBotAccountsPosts(t *testing.T, th *SearchTestHelper) { func testSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "approve", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "approved", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "approvedz", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should stem appr", func(t *testing.T) { params := &model.SearchParams{Terms: "appr*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 3) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1679,8 +1679,8 @@ func testSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) { t.Run("Should stem approve", func(t *testing.T) { params := &model.SearchParams{Terms: "approve*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p3.Id, results.Posts) @@ -1689,15 +1689,15 @@ func testSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) { func testSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "hello world", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "hell or heaven", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) t.Run("Should return results without quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "hell*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 2) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1706,8 +1706,8 @@ func testSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) { t.Run("Should return just one result with quotes", func(t *testing.T) { params := &model.SearchParams{Terms: "\"hell\"*"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p2.Id, results.Posts) @@ -1717,16 +1717,16 @@ func testSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) { func testHashtagSearchShouldSupportThreeOrMoreCharacters(t *testing.T, th *SearchTestHelper) { _, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one char hashtag #1", "#1", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelPrivate.Id, "two chars hashtag #12", "#12", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "three chars hashtag #123", "#123", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "#123", IsHashtag: true} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p3.Id, results.Posts) @@ -1734,26 +1734,26 @@ func testHashtagSearchShouldSupportThreeOrMoreCharacters(t *testing.T, th *Searc func testSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "alpha/beta gamma, theta", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "gamma"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) params = &model.SearchParams{Terms: "beta"} - results, apperr = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) params = &model.SearchParams{Terms: "alpha"} - results, apperr = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err = th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1761,14 +1761,14 @@ func testSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelper) { func testSearchEmailsWithoutQuotes(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message test@test.com", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) _, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "message test2@test.com", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "test@test.com"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1776,14 +1776,14 @@ func testSearchEmailsWithoutQuotes(t *testing.T, th *SearchTestHelper) { func testSupportSearchInComments(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message test@test.com", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) r1, err := th.createReply(th.User.Id, "reply check", "", p1, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "reply"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, r1.Id, results.Posts) @@ -1791,12 +1791,12 @@ func testSupportSearchInComments(t *testing.T, th *SearchTestHelper) { func testSupportSearchTermsWithinLinks(t *testing.T, th *SearchTestHelper) { p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with link http://www.wikipedia.org/dolphins", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "wikipedia"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 1) th.checkPostInSearchResults(t, p1.Id, results.Posts) @@ -1804,12 +1804,12 @@ func testSupportSearchTermsWithinLinks(t *testing.T, th *SearchTestHelper) { func testShouldNotReturnLinksEmbeddedInMarkdown(t *testing.T, th *SearchTestHelper) { _, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with link [here](http://www.wikipedia.org/dolphins)", "", model.POST_DEFAULT, 0, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUserPosts(th.User.Id) params := &model.SearchParams{Terms: "wikipedia"} - results, apperr := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) - require.Nil(t, apperr) + results, err := th.Store.Post().SearchPostsInTeamForUser([]*model.SearchParams{params}, th.User.Id, th.Team.Id, 0, 20) + require.NoError(t, err) require.Len(t, results.Posts, 0) } diff --git a/store/searchtest/user_layer.go b/store/searchtest/user_layer.go index 8bfdde5df1..a00b906e2b 100644 --- a/store/searchtest/user_layer.go +++ b/store/searchtest/user_layer.go @@ -159,7 +159,7 @@ func TestSearchUserStore(t *testing.T, s store.Store, testEngine *SearchTestEngi Store: s, } err := th.SetupBasicFixtures() - require.Nil(t, err) + require.NoError(t, err) defer th.CleanFixtures() runTestSearch(t, testEngine, searchUserStoreTests, th) } @@ -170,13 +170,13 @@ func testGetAllUsersInChannelWithEmptyTerm(t *testing.T, th *SearchTestHelper) { Limit: model.USER_SEARCH_DEFAULT_LIMIT, } users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) t.Run("Should be able to correctly honor limit when autocompleting", func(t *testing.T) { result, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, result.InChannel, 1) require.Len(t, result.OutOfChannel, 1) }) @@ -184,7 +184,7 @@ func testGetAllUsersInChannelWithEmptyTerm(t *testing.T, th *SearchTestHelper) { t.Run("Return all users in team", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) @@ -192,15 +192,15 @@ func testGetAllUsersInChannelWithEmptyTerm(t *testing.T, th *SearchTestHelper) { t.Run("Return all users in teams even though some of them don't have a team associated", func(t *testing.T) { options := createDefaultOptions(true, false, false) userAlternate, err := th.createUser("user-alternate", "user-alternate", "user", "alternate") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) userGuest, err := th.createGuest("user-guest", "user-guest", "user", "guest") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userGuest) // In case teamId and channelId are empty our current logic goes through Search users, err := th.Store.User().Search("", "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2, th.UserAnotherTeam, userAlternate, userGuest}, users) }) @@ -208,24 +208,24 @@ func testGetAllUsersInChannelWithEmptyTerm(t *testing.T, th *SearchTestHelper) { func testHonorChannelRestrictionsAutocompletingUsers(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("user-alternate", "user-alternate", "user", "alternate") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) guest, err := th.createGuest("guest", "guest", "guest", "one") - require.Nil(t, err) + require.NoError(t, err) err = th.addUserToTeams(guest, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(guest, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(guest) t.Run("Autocomplete users with channel restrictions", func(t *testing.T) { options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Channels: []string{th.ChannelBasic.Id}} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, userAlternate, guest}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -233,7 +233,7 @@ func testHonorChannelRestrictionsAutocompletingUsers(t *testing.T, th *SearchTes options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Channels: []string{th.ChannelBasic.Id}} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alt", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -241,7 +241,7 @@ func testHonorChannelRestrictionsAutocompletingUsers(t *testing.T, th *SearchTes options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Teams: []string{}, Channels: []string{}} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -249,7 +249,7 @@ func testHonorChannelRestrictionsAutocompletingUsers(t *testing.T, th *SearchTes options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Teams: []string{}, Channels: []string{}} users, err := th.Store.User().AutocompleteUsersInChannel("", th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -258,7 +258,7 @@ func testHonorChannelRestrictionsAutocompletingUsers(t *testing.T, th *SearchTes options.ViewRestrictions = &model.ViewUsersRestrictions{Channels: []string{th.ChannelBasic.Id}} // In case teamId and channelId are empty our current logic goes through Search users, err := th.Store.User().Search("", "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate, guest, th.User}, users) }) } @@ -268,7 +268,7 @@ func testHonorTeamRestrictionsAutocompletingUsers(t *testing.T, th *SearchTestHe options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Teams: []string{th.Team.Id}} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) @@ -276,7 +276,7 @@ func testHonorTeamRestrictionsAutocompletingUsers(t *testing.T, th *SearchTestHe options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Teams: []string{}, Channels: []string{}} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -284,11 +284,11 @@ func testHonorTeamRestrictionsAutocompletingUsers(t *testing.T, th *SearchTestHe options := createDefaultOptions(true, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Teams: []string{th.AnotherTeam.Id}} users, err := th.Store.User().Search(th.Team.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users) acusers, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, acusers.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, acusers.OutOfChannel) }) @@ -298,7 +298,7 @@ func testShouldReturnNothingWithoutProperAccess(t *testing.T, th *SearchTestHelp options := createDefaultOptions(true, false, false) options.ListOfAllowedChannels = []string{th.ChannelBasic.Id} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -306,351 +306,351 @@ func testShouldReturnNothingWithoutProperAccess(t *testing.T, th *SearchTestHelp options := createDefaultOptions(true, false, false) options.ListOfAllowedChannels = []string{} users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) } func testAutocompleteUserByUsername(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternateusername", "alternatenick", "user", "alternate") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) } func testAutocompleteUserByFirstName(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("user-alternate", "user-alternate", "altfirstname", "lastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should autocomplete users when the first name is unique", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "altfirstname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should autocomplete users for in the channel and out of the channel with the same first name", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "basicfirstname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) } func testAutocompleteUserByLastName(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("user-alternate", "user-alternate", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should return results when the last name is unique", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "altlastname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results for in the channel and out of the channel with the same last name", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "basiclastname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) } func testAutocompleteUserByNickName(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternateusername", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should return results when the nickname is unique", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternatenickname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return users that share the same part of the nickname", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "basicnickname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) } func testAutocompleteUserByEmail(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternateusername", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) userAlternate.Email = "useralt@test.email.com" _, err = th.Store.User().Update(userAlternate, false) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should autocomplete users when the email is unique", func(t *testing.T) { options := createDefaultOptions(false, true, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "useralt@test.email.com", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should autocomplete users that share the same email user prefix", func(t *testing.T) { options := createDefaultOptions(false, true, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "success_", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) t.Run("Should autocomplete users that share the same email domain", func(t *testing.T) { options := createDefaultOptions(false, true, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "simulator.amazon.com", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) t.Run("Should search users when the email is unique", func(t *testing.T) { options := createDefaultOptions(false, true, false) users, err := th.Store.User().Search(th.Team.Id, "useralt@test.email.com", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) }) t.Run("Should search users that share the same email user prefix", func(t *testing.T) { options := createDefaultOptions(false, true, false) users, err := th.Store.User().Search(th.Team.Id, "success_", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users) }) t.Run("Should search users that share the same email domain", func(t *testing.T) { options := createDefaultOptions(false, true, false) users, err := th.Store.User().Search(th.Team.Id, "simulator.amazon.com", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users) }) } func testShouldNotMatchSpecificQueriesEmail(t *testing.T, th *SearchTestHelper) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "success_", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) } func testAutocompleteUserByUsernameWithDot(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate.username", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should return results when searching for the whole username with Dot", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternate.username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results when searching for part of the username including the Dot", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, ".username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results when searching for part of the username not including the Dot", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) } func testAutocompleteUserByUsernameWithUnderscore(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate_username", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should return results when searching for the whole username with underscore", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternate_username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results when searching for part of the username including the underscore", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "_username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results when searching for part of the username not including the underscore", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) } func testAutocompleteUserByUsernameWithHyphen(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate-username", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should return results when searching for the whole username with hyphen", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternate-username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results when searching for part of the username including the hyphen", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "-username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should return results when searching for part of the username not including the hyphen", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "username", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) } func testShouldEscapePercentageCharacter(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternateusername", "alternate%nickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should autocomplete users escaping percentage symbol", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternate%", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should search users escaping percentage symbol", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "alternate%", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) }) } func testShouldEscapeUnderscoreCharacter(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate_username", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should autocomplete users escaping underscore symbol", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternate_", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should search users escaping underscore symbol", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "alternate_", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) }) } func testShouldBeAbleToSearchInactiveUsers(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("basicusernamealternate", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) userAlternate.DeleteAt = model.GetMillis() _, err = th.Store.User().Update(userAlternate, true) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should autocomplete inactive users if we allow it", func(t *testing.T) { options := createDefaultOptions(false, false, true) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) t.Run("Should search inactive users if we allow it", func(t *testing.T) { options := createDefaultOptions(false, false, true) users, err := th.Store.User().Search(th.Team.Id, "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2, userAlternate}, users) }) t.Run("Shouldn't autocomplete inactive users if we don't allow it", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) t.Run("Shouldn't search inactive users if we don't allow it", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2}, users) }) } func testShouldBeAbleToSearchFilteringByRole(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("basicusernamealternate", "alternatenickname", "firstname", "altlastname") - require.Nil(t, err) + require.NoError(t, err) userAlternate.Roles = "system_admin system_user" _, err = th.Store.User().Update(userAlternate, true) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) userAlternate2, err := th.createUser("basicusernamealternate2", "alternatenickname2", "firstname2", "altlastname2") - require.Nil(t, err) + require.NoError(t, err) userAlternate2.Roles = "system_user" _, err = th.Store.User().Update(userAlternate2, true) - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate2) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) err = th.addUserToTeams(userAlternate2, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should autocomplete users filtering by roles", func(t *testing.T) { options := createDefaultOptions(false, false, true) options.Role = "system_admin" users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -658,7 +658,7 @@ func testShouldBeAbleToSearchFilteringByRole(t *testing.T, th *SearchTestHelper) options := createDefaultOptions(false, false, true) options.Role = "system_admin" users, err := th.Store.User().Search(th.Team.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) }) } @@ -667,14 +667,14 @@ func testShouldIgnoreLeadingAtSymbols(t *testing.T, th *SearchTestHelper) { t.Run("Should autocomplete ignoring the @ symbol at the beginning", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "@basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) }) t.Run("Should search ignoring the @ symbol at the beginning", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "@basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2}, users) }) } @@ -682,31 +682,31 @@ func testShouldIgnoreLeadingAtSymbols(t *testing.T, th *SearchTestHelper) { func testSearchUsersShouldBeCaseInsensitive(t *testing.T, th *SearchTestHelper) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "BaSiCUsErNaMe", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User2}, users.OutOfChannel) } func testSearchOneTwoCharUsersnameAndFirstLastNames(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("ho", "alternatenickname", "zi", "k") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should support two characters in the full name", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "zi", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should support two characters in the username", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "ho", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -714,24 +714,24 @@ func testSearchOneTwoCharUsersnameAndFirstLastNames(t *testing.T, th *SearchTest func testShouldSupportKoreanCharacters(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate-username", "alternate-nickname", "서강준", "안신원") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) t.Run("Should support hanja korean characters", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "서강준", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) t.Run("Should support hangul korean characters", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "안신원", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) }) @@ -739,15 +739,15 @@ func testShouldSupportKoreanCharacters(t *testing.T, th *SearchTestHelper) { func testSearchWithHyphenAtTheEndOfTheTerm(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate-username", "alternate-nickname", "altfirst", "altlast") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) options := createDefaultOptions(true, false, false) users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "alternate-", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users.InChannel) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users.OutOfChannel) } @@ -756,39 +756,39 @@ func testSearchUsersInTeam(t *testing.T, th *SearchTestHelper) { t.Run("Should return all the team users", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2}, users) }) t.Run("Should return all the team users with no team id", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search("", "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2, th.UserAnotherTeam}, users) }) t.Run("Should return all the team users filtered by username", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "basicusername1", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users) }) t.Run("Should not return spurious results", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "falseuser", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users) }) t.Run("Should return all the team users filtered by username and with channel restrictions", func(t *testing.T) { options := createDefaultOptions(false, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Channels: []string{th.ChannelBasic.Id}} users, err := th.Store.User().Search(th.Team.Id, "basicusername", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users) }) t.Run("Should return all the team users filtered by username and with all channel restricted", func(t *testing.T) { options := createDefaultOptions(false, false, false) options.ViewRestrictions = &model.ViewUsersRestrictions{Channels: []string{}} users, err := th.Store.User().Search(th.Team.Id, "basicusername1", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users) }) t.Run("Should honor the limit when searching users in team", func(t *testing.T) { @@ -797,50 +797,50 @@ func testSearchUsersInTeam(t *testing.T, th *SearchTestHelper) { } users, err := th.Store.User().Search(th.Team.Id, "", optionsWithLimit) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, users, 1) }) } func testSearchUsersInTeamUsernameWithDot(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate.username", "altnickname", "altfirst", "altlast") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) options := createDefaultOptions(true, false, false) users, err := th.Store.User().Search(th.Team.Id, "alternate.", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) } func testSearchUsersInTeamUsernameWithHyphen(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate-username", "altnickname", "altfirst", "altlast") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) options := createDefaultOptions(true, false, false) users, err := th.Store.User().Search(th.Team.Id, "alternate-", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) } func testSearchUsersInTeamUsernameWithUnderscore(t *testing.T, th *SearchTestHelper) { userAlternate, err := th.createUser("alternate_username", "altnickname", "altfirst", "altlast") - require.Nil(t, err) + require.NoError(t, err) defer th.deleteUser(userAlternate) err = th.addUserToTeams(userAlternate, []string{th.Team.Id}) - require.Nil(t, err) + require.NoError(t, err) _, err = th.addUserToChannels(userAlternate, []string{th.ChannelBasic.Id}) - require.Nil(t, err) + require.NoError(t, err) options := createDefaultOptions(true, false, false) users, err := th.Store.User().Search(th.Team.Id, "alternate_", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{userAlternate}, users) } @@ -848,19 +848,19 @@ func testSearchUsersByFullName(t *testing.T, th *SearchTestHelper) { t.Run("Should search users by full name", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().Search(th.Team.Id, "basicfirstname", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User, th.User2}, users) }) t.Run("Should search user by full name", func(t *testing.T) { options := createDefaultOptions(true, false, false) users, err := th.Store.User().Search(th.Team.Id, "basicfirstname1", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{th.User}, users) }) t.Run("Should return empty when search by full name and is deactivated", func(t *testing.T) { options := createDefaultOptions(false, false, false) users, err := th.Store.User().Search(th.Team.Id, "basicfirstname1", options) - require.Nil(t, err) + require.NoError(t, err) th.assertUsersMatchInAnyOrder(t, []*model.User{}, users) }) } diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index 7bd04ed206..a184517d56 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -660,9 +660,9 @@ func (s SqlChannelStore) Update(channel *model.Channel) (*model.Channel, error) } defer finalizeTransaction(transaction) - updatedChannel, appErr := s.updateChannelT(transaction, channel) - if appErr != nil { - return nil, appErr + updatedChannel, err := s.updateChannelT(transaction, channel) + if err != nil { + return nil, err } // Additionally propagate the write to the PublicChannels table. diff --git a/store/sqlstore/channel_store_test.go b/store/sqlstore/channel_store_test.go index 0d697d669c..46143fa04c 100644 --- a/store/sqlstore/channel_store_test.go +++ b/store/sqlstore/channel_store_test.go @@ -34,7 +34,7 @@ func TestChannelSearchQuerySQLInjection(t *testing.T) { opts := store.ChannelSearchOpts{} builder := s.channelSearchQuery("'or'1'=sleep(3))); -- -", opts, false) query, _, err := builder.ToSql() - require.Nil(t, err) + require.NoError(t, err) assert.NotContains(t, query, "sleep") }) } diff --git a/store/sqlstore/integrity_test.go b/store/sqlstore/integrity_test.go index 0af56da0e7..bd21da95b0 100644 --- a/store/sqlstore/integrity_test.go +++ b/store/sqlstore/integrity_test.go @@ -350,7 +350,7 @@ func TestCheckIntegrity(t *testing.T) { require.NotNil(t, results) for result := range results { require.IsType(t, model.IntegrityCheckResult{}, result) - require.Nil(t, result.Err) + require.NoError(t, result.Err) switch data := result.Data.(type) { case model.RelationalIntegrityCheckData: require.Empty(t, data.Records) @@ -371,7 +371,7 @@ func TestCheckParentChildIntegrity(t *testing.T) { childIdAttr: "NotValid", } result := checkParentChildIntegrity(store, config) - require.NotNil(t, result.Err) + require.Error(t, result.Err) require.Empty(t, result.Data) }) }) @@ -384,7 +384,7 @@ func TestCheckChannelsCommandWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkChannelsCommandWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -393,7 +393,7 @@ func TestCheckChannelsCommandWebhooksIntegrity(t *testing.T) { channelId := model.NewId() cwh := createCommandWebhook(ss, model.NewId(), model.NewId(), channelId) result := checkChannelsCommandWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -412,7 +412,7 @@ func TestCheckChannelsChannelMemberHistoryIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkChannelsChannelMemberHistoryIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -423,7 +423,7 @@ func TestCheckChannelsChannelMemberHistoryIntegrity(t *testing.T) { cmh := createChannelMemberHistory(ss, channel.Id, user.Id) dbmap.Delete(channel) result := checkChannelsChannelMemberHistoryIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -442,7 +442,7 @@ func TestCheckChannelsChannelMembersIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkChannelsChannelMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -452,7 +452,7 @@ func TestCheckChannelsChannelMembersIntegrity(t *testing.T) { member := createChannelMemberWithChannelId(ss, channel.Id) dbmap.Delete(channel) result := checkChannelsChannelMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -470,7 +470,7 @@ func TestCheckChannelsIncomingWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkChannelsIncomingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -479,7 +479,7 @@ func TestCheckChannelsIncomingWebhooksIntegrity(t *testing.T) { channelId := model.NewId() wh := createIncomingWebhook(ss, model.NewId(), channelId, model.NewId()) result := checkChannelsIncomingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -498,7 +498,7 @@ func TestCheckChannelsOutgoingWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkChannelsOutgoingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -509,7 +509,7 @@ func TestCheckChannelsOutgoingWebhooksIntegrity(t *testing.T) { wh := createOutgoingWebhook(ss, model.NewId(), channelId, model.NewId()) dbmap.Delete(channel) result := checkChannelsOutgoingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -528,7 +528,7 @@ func TestCheckChannelsPostsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkChannelsPostsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -536,7 +536,7 @@ func TestCheckChannelsPostsIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { post := createPostWithChannelId(ss, model.NewId()) result := checkChannelsPostsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -555,7 +555,7 @@ func TestCheckCommandsCommandWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkCommandsCommandWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -564,7 +564,7 @@ func TestCheckCommandsCommandWebhooksIntegrity(t *testing.T) { commandId := model.NewId() cwh := createCommandWebhook(ss, commandId, model.NewId(), model.NewId()) result := checkCommandsCommandWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -583,7 +583,7 @@ func TestCheckPostsFileInfoIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkPostsFileInfoIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -592,7 +592,7 @@ func TestCheckPostsFileInfoIntegrity(t *testing.T) { postId := model.NewId() info := createFileInfo(ss, postId, model.NewId()) result := checkPostsFileInfoIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -611,7 +611,7 @@ func TestCheckPostsPostsParentIdIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkPostsPostsParentIdIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -621,7 +621,7 @@ func TestCheckPostsPostsParentIdIntegrity(t *testing.T) { parent := createPost(ss, model.NewId(), model.NewId(), root.Id, root.Id) post := createPost(ss, model.NewId(), model.NewId(), root.Id, parent.Id) result := checkPostsPostsParentIdIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) dbmap.Delete(parent) @@ -636,7 +636,7 @@ func TestCheckPostsPostsParentIdIntegrity(t *testing.T) { post := createPost(ss, model.NewId(), model.NewId(), root.Id, parent.Id) dbmap.Delete(parent) result := checkPostsPostsParentIdIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -656,7 +656,7 @@ func TestCheckPostsPostsRootIdIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkPostsPostsRootIdIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -667,7 +667,7 @@ func TestCheckPostsPostsRootIdIntegrity(t *testing.T) { post := createPost(ss, model.NewId(), model.NewId(), root.Id, root.Id) dbmap.Delete(root) result := checkPostsPostsRootIdIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -686,7 +686,7 @@ func TestCheckPostsReactionsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkPostsReactionsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -695,7 +695,7 @@ func TestCheckPostsReactionsIntegrity(t *testing.T) { postId := model.NewId() reaction := createReaction(ss, model.NewId(), postId) result := checkPostsReactionsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -713,7 +713,7 @@ func TestCheckSchemesChannelsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkSchemesChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -725,7 +725,7 @@ func TestCheckSchemesChannelsIntegrity(t *testing.T) { channel := createChannelWithSchemeId(ss, &schemeId) dbmap.Delete(scheme) result := checkSchemesChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -744,7 +744,7 @@ func TestCheckSchemesTeamsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkSchemesTeamsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -756,7 +756,7 @@ func TestCheckSchemesTeamsIntegrity(t *testing.T) { team := createTeamWithSchemeId(ss, &schemeId) dbmap.Delete(scheme) result := checkSchemesTeamsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -775,7 +775,7 @@ func TestCheckSessionsAuditsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkSessionsAuditsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -787,7 +787,7 @@ func TestCheckSessionsAuditsIntegrity(t *testing.T) { audit := createAudit(ss, userId, sessionId) dbmap.Delete(session) result := checkSessionsAuditsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -806,7 +806,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkTeamsChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -814,7 +814,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { channel := createChannelWithTeamId(ss, model.NewId()) result := checkTeamsChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -832,7 +832,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { require.NoError(t, err) require.NotNil(t, direct) result := checkTeamsChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -855,7 +855,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) { _, err = dbmap.Exec(`UPDATE Channels SET TeamId = 'test' WHERE Id = '` + direct.Id + `'`) require.NoError(t, err) result := checkTeamsChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 2) require.Equal(t, model.OrphanedRecord{ @@ -882,7 +882,7 @@ func TestCheckTeamsCommandsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkTeamsCommandsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -891,7 +891,7 @@ func TestCheckTeamsCommandsIntegrity(t *testing.T) { teamId := model.NewId() cmd := createCommand(ss, model.NewId(), teamId) result := checkTeamsCommandsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -910,7 +910,7 @@ func TestCheckTeamsIncomingWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkTeamsIncomingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -919,7 +919,7 @@ func TestCheckTeamsIncomingWebhooksIntegrity(t *testing.T) { teamId := model.NewId() wh := createIncomingWebhook(ss, model.NewId(), model.NewId(), teamId) result := checkTeamsIncomingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -938,7 +938,7 @@ func TestCheckTeamsOutgoingWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkTeamsOutgoingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -947,7 +947,7 @@ func TestCheckTeamsOutgoingWebhooksIntegrity(t *testing.T) { teamId := model.NewId() wh := createOutgoingWebhook(ss, model.NewId(), model.NewId(), teamId) result := checkTeamsOutgoingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -966,7 +966,7 @@ func TestCheckTeamsTeamMembersIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkTeamsTeamMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -976,7 +976,7 @@ func TestCheckTeamsTeamMembersIntegrity(t *testing.T) { member := createTeamMember(ss, team.Id, model.NewId()) dbmap.Delete(team) result := checkTeamsTeamMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -994,7 +994,7 @@ func TestCheckUsersAuditsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersAuditsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1005,7 +1005,7 @@ func TestCheckUsersAuditsIntegrity(t *testing.T) { audit := createAudit(ss, userId, model.NewId()) dbmap.Delete(user) result := checkUsersAuditsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1024,7 +1024,7 @@ func TestCheckUsersCommandWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersCommandWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1033,7 +1033,7 @@ func TestCheckUsersCommandWebhooksIntegrity(t *testing.T) { userId := model.NewId() cwh := createCommandWebhook(ss, model.NewId(), userId, model.NewId()) result := checkUsersCommandWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1052,7 +1052,7 @@ func TestCheckUsersChannelsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1060,7 +1060,7 @@ func TestCheckUsersChannelsIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { channel := createChannelWithCreatorId(ss, model.NewId()) result := checkUsersChannelsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1079,7 +1079,7 @@ func TestCheckUsersChannelMemberHistoryIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersChannelMemberHistoryIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1090,7 +1090,7 @@ func TestCheckUsersChannelMemberHistoryIntegrity(t *testing.T) { cmh := createChannelMemberHistory(ss, channel.Id, user.Id) dbmap.Delete(user) result := checkUsersChannelMemberHistoryIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1109,7 +1109,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersChannelMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1120,7 +1120,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) { member := createChannelMember(ss, channel.Id, user.Id) dbmap.Delete(user) result := checkUsersChannelMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1139,7 +1139,7 @@ func TestCheckUsersCommandsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersCommandsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1148,7 +1148,7 @@ func TestCheckUsersCommandsIntegrity(t *testing.T) { userId := model.NewId() cmd := createCommand(ss, userId, model.NewId()) result := checkUsersCommandsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1167,7 +1167,7 @@ func TestCheckUsersCompliancesIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersCompliancesIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1178,7 +1178,7 @@ func TestCheckUsersCompliancesIntegrity(t *testing.T) { compliance := createCompliance(ss, userId) dbmap.Delete(user) result := checkUsersCompliancesIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1197,7 +1197,7 @@ func TestCheckUsersEmojiIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersEmojiIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1208,7 +1208,7 @@ func TestCheckUsersEmojiIntegrity(t *testing.T) { emoji := createEmoji(ss, userId) dbmap.Delete(user) result := checkUsersEmojiIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1227,7 +1227,7 @@ func TestCheckUsersFileInfoIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersFileInfoIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1238,7 +1238,7 @@ func TestCheckUsersFileInfoIntegrity(t *testing.T) { info := createFileInfo(ss, model.NewId(), userId) dbmap.Delete(user) result := checkUsersFileInfoIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1257,7 +1257,7 @@ func TestCheckUsersIncomingWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersIncomingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1266,7 +1266,7 @@ func TestCheckUsersIncomingWebhooksIntegrity(t *testing.T) { userId := model.NewId() wh := createIncomingWebhook(ss, userId, model.NewId(), model.NewId()) result := checkUsersIncomingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1285,7 +1285,7 @@ func TestCheckUsersOAuthAccessDataIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersOAuthAccessDataIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1296,7 +1296,7 @@ func TestCheckUsersOAuthAccessDataIntegrity(t *testing.T) { ad := createOAuthAccessData(ss, userId) dbmap.Delete(user) result := checkUsersOAuthAccessDataIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1315,7 +1315,7 @@ func TestCheckUsersOAuthAppsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersOAuthAppsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1326,7 +1326,7 @@ func TestCheckUsersOAuthAppsIntegrity(t *testing.T) { app := createOAuthApp(ss, userId) dbmap.Delete(user) result := checkUsersOAuthAppsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1345,7 +1345,7 @@ func TestCheckUsersOAuthAuthDataIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersOAuthAuthDataIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1356,7 +1356,7 @@ func TestCheckUsersOAuthAuthDataIntegrity(t *testing.T) { ad := createOAuthAuthData(ss, userId) dbmap.Delete(user) result := checkUsersOAuthAuthDataIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1375,7 +1375,7 @@ func TestCheckUsersOutgoingWebhooksIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersOutgoingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1384,7 +1384,7 @@ func TestCheckUsersOutgoingWebhooksIntegrity(t *testing.T) { userId := model.NewId() wh := createOutgoingWebhook(ss, userId, model.NewId(), model.NewId()) result := checkUsersOutgoingWebhooksIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1403,7 +1403,7 @@ func TestCheckUsersPostsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersPostsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1411,7 +1411,7 @@ func TestCheckUsersPostsIntegrity(t *testing.T) { t.Run("should generate a report with one record", func(t *testing.T) { post := createPostWithUserId(ss, model.NewId()) result := checkUsersPostsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1430,7 +1430,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersPreferencesIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1442,7 +1442,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) { preferences := createPreferences(ss, userId) require.NotNil(t, preferences) result := checkUsersPreferencesIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) dbmap.Exec(`DELETE FROM Preferences`) @@ -1457,7 +1457,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) { require.NotNil(t, preferences) dbmap.Delete(user) result := checkUsersPreferencesIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1476,7 +1476,7 @@ func TestCheckUsersReactionsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersReactionsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1487,7 +1487,7 @@ func TestCheckUsersReactionsIntegrity(t *testing.T) { reaction := createReaction(ss, user.Id, model.NewId()) dbmap.Delete(user) result := checkUsersReactionsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1505,7 +1505,7 @@ func TestCheckUsersSessionsIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersSessionsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1514,7 +1514,7 @@ func TestCheckUsersSessionsIntegrity(t *testing.T) { userId := model.NewId() session := createSession(ss, userId) result := checkUsersSessionsIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1533,7 +1533,7 @@ func TestCheckUsersStatusIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersStatusIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1544,7 +1544,7 @@ func TestCheckUsersStatusIntegrity(t *testing.T) { status := createStatus(ss, user.Id) dbmap.Delete(user) result := checkUsersStatusIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1562,7 +1562,7 @@ func TestCheckUsersTeamMembersIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersTeamMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1573,7 +1573,7 @@ func TestCheckUsersTeamMembersIntegrity(t *testing.T) { member := createTeamMember(ss, team.Id, user.Id) dbmap.Delete(user) result := checkUsersTeamMembersIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ @@ -1592,7 +1592,7 @@ func TestCheckUsersUserAccessTokensIntegrity(t *testing.T) { t.Run("should generate a report with no records", func(t *testing.T) { result := checkUsersUserAccessTokensIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Empty(t, data.Records) }) @@ -1603,7 +1603,7 @@ func TestCheckUsersUserAccessTokensIntegrity(t *testing.T) { uat := createUserAccessToken(ss, user.Id) dbmap.Delete(user) result := checkUsersUserAccessTokensIntegrity(store) - require.Nil(t, result.Err) + require.NoError(t, result.Err) data := result.Data.(model.RelationalIntegrityCheckData) require.Len(t, data.Records, 1) require.Equal(t, model.OrphanedRecord{ diff --git a/store/sqlstore/preference_store_test.go b/store/sqlstore/preference_store_test.go index 90691c9329..e8c123eb20 100644 --- a/store/sqlstore/preference_store_test.go +++ b/store/sqlstore/preference_store_test.go @@ -53,7 +53,7 @@ func TestDeleteUnusedFeatures(t *testing.T) { } err := ss.Preference().Save(&features) - require.Nil(t, err) + require.NoError(t, err) ss.Preference().(*SqlPreferenceStore).deleteUnusedFeatures() @@ -63,7 +63,7 @@ func TestDeleteUnusedFeatures(t *testing.T) { WHERE Category = :Category AND Value = :Val AND Name LIKE '`+store.FeatureTogglePrefix+`%'`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Val": "false"}); err != nil { - require.Nil(t, err) + require.NoError(t, err) } else if val != 0 { require.Fail(t, "Found %d features with value 'false', expected all to be deleted", val) } @@ -74,7 +74,7 @@ func TestDeleteUnusedFeatures(t *testing.T) { WHERE Category = :Category AND Value = :Val AND Name LIKE '`+store.FeatureTogglePrefix+`%'`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Val": "true"}); err != nil { - require.Nil(t, err) + require.NoError(t, err) } else if val == 0 { require.Fail(t, "Found %d features with value 'true', expected to find at least %d features", val, 2) } diff --git a/store/sqlstore/scheme_store.go b/store/sqlstore/scheme_store.go index cd13bad1dc..b97f8cb51d 100644 --- a/store/sqlstore/scheme_store.go +++ b/store/sqlstore/scheme_store.go @@ -85,9 +85,9 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr // Fetch the default system scheme roles to populate default permissions. defaultRoleNames := []string{model.TEAM_ADMIN_ROLE_ID, model.TEAM_USER_ROLE_ID, model.TEAM_GUEST_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID, model.CHANNEL_USER_ROLE_ID, model.CHANNEL_GUEST_ROLE_ID} defaultRoles := make(map[string]*model.Role) - roles, appErr := s.SqlStore.Role().GetByNames(defaultRoleNames) - if appErr != nil { - return nil, appErr + roles, err := s.SqlStore.Role().GetByNames(defaultRoleNames) + if err != nil { + return nil, err } for _, role := range roles { diff --git a/store/sqlstore/session_store.go b/store/sqlstore/session_store.go index c670c729e4..fc339281b5 100644 --- a/store/sqlstore/session_store.go +++ b/store/sqlstore/session_store.go @@ -249,9 +249,9 @@ func (me SqlSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt i } func (me SqlSessionStore) UpdateProps(session *model.Session) error { - oldSession, appErr := me.Get(session.Id) - if appErr != nil { - return appErr + oldSession, err := me.Get(session.Id) + if err != nil { + return err } oldSession.Props = session.Props diff --git a/store/sqlstore/store_test.go b/store/sqlstore/store_test.go index 282628c59e..06e3f07940 100644 --- a/store/sqlstore/store_test.go +++ b/store/sqlstore/store_test.go @@ -371,7 +371,7 @@ func TestGetDbVersion(t *testing.T) { store := New(*settings, nil) version, err := store.GetDbVersion(false) - require.Nil(t, err) + require.NoError(t, err) require.Regexp(t, regexp.MustCompile(`\d+\.\d+(\.\d+)?`), version) }) } diff --git a/store/sqlstore/upgrade_test.go b/store/sqlstore/upgrade_test.go index acd0cff825..e3eee3d538 100644 --- a/store/sqlstore/upgrade_test.go +++ b/store/sqlstore/upgrade_test.go @@ -87,7 +87,7 @@ func TestSaveSchemaVersion(t *testing.T) { t.Run("set earliest version", func(t *testing.T) { saveSchemaVersion(sqlStore, Version300) props, err := ss.System().Get() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, Version300, props["Version"]) require.Equal(t, Version300, sqlStore.GetCurrentSchemaVersion()) @@ -96,7 +96,7 @@ func TestSaveSchemaVersion(t *testing.T) { t.Run("set current version", func(t *testing.T) { saveSchemaVersion(sqlStore, CurrentSchemaVersion) props, err := ss.System().Get() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, CurrentSchemaVersion, props["Version"]) require.Equal(t, CurrentSchemaVersion, sqlStore.GetCurrentSchemaVersion()) diff --git a/store/storetest/audit_store.go b/store/storetest/audit_store.go index ea337aaa74..7087636df9 100644 --- a/store/storetest/audit_store.go +++ b/store/storetest/audit_store.go @@ -20,32 +20,32 @@ func TestAuditStore(t *testing.T, ss store.Store) { func testAuditStore(t *testing.T, ss store.Store) { audit := &model.Audit{UserId: model.NewId(), IpAddress: "ipaddress", Action: "Action"} - require.Nil(t, ss.Audit().Save(audit)) + require.NoError(t, ss.Audit().Save(audit)) time.Sleep(100 * time.Millisecond) - require.Nil(t, ss.Audit().Save(audit)) + require.NoError(t, ss.Audit().Save(audit)) time.Sleep(100 * time.Millisecond) - require.Nil(t, ss.Audit().Save(audit)) + require.NoError(t, ss.Audit().Save(audit)) time.Sleep(100 * time.Millisecond) audit.ExtraInfo = "extra" time.Sleep(100 * time.Millisecond) - require.Nil(t, ss.Audit().Save(audit)) + require.NoError(t, ss.Audit().Save(audit)) time.Sleep(100 * time.Millisecond) audits, err := ss.Audit().Get(audit.UserId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, audits, 4) assert.Equal(t, "extra", audits[0].ExtraInfo) audits, err = ss.Audit().Get("missing", 0, 100) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, audits) audits, err = ss.Audit().Get("", 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, audits, 4, "Failed to save and retrieve 4 audit logs") - require.Nil(t, ss.Audit().PermanentDeleteByUser(audit.UserId)) + require.NoError(t, ss.Audit().PermanentDeleteByUser(audit.UserId)) } diff --git a/store/storetest/bot_store.go b/store/storetest/bot_store.go index 3fd50d7cf9..3ef4cc12f6 100644 --- a/store/storetest/bot_store.go +++ b/store/storetest/bot_store.go @@ -15,11 +15,11 @@ import ( func makeBotWithUser(t *testing.T, ss store.Store, bot *model.Bot) (*model.Bot, *model.User) { user, err := ss.User().Save(model.UserFromBot(bot)) - require.Nil(t, err) + require.NoError(t, err) bot.UserId = user.Id bot, nErr := ss.Bot().Save(bot) - require.Nil(t, nErr) + require.NoError(t, nErr) return bot, user } @@ -41,9 +41,9 @@ func testBotStoreGet(t *testing.T, ss store.Store, s SqlStore) { }) deletedBot.DeleteAt = 1 deletedBot, err := ss.Bot().Update(deletedBot) - require.Nil(t, err) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(deletedBot.UserId)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(deletedBot.UserId)) }() permanentlyDeletedBot, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "permanently_deleted_bot", @@ -52,8 +52,8 @@ func testBotStoreGet(t *testing.T, ss store.Store, s SqlStore) { LastIconUpdate: model.GetMillis(), DeleteAt: 0, }) - require.Nil(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId)) - defer func() { require.Nil(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }() + require.NoError(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId)) + defer func() { require.NoError(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }() b1, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "b1", @@ -61,8 +61,8 @@ func testBotStoreGet(t *testing.T, ss store.Store, s SqlStore) { OwnerId: model.NewId(), LastIconUpdate: model.GetMillis(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b1.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b1.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }() b2, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "b2", @@ -70,8 +70,8 @@ func testBotStoreGet(t *testing.T, ss store.Store, s SqlStore) { OwnerId: model.NewId(), LastIconUpdate: 0, }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b2.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b2.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b2.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b2.UserId)) }() // Artificially set b2.LastIconUpdate to NULL to verify handling of same. _, sqlErr := s.GetMaster().Exec("UPDATE Bots SET LastIconUpdate = NULL WHERE UserId = '" + b2.UserId + "'") @@ -79,40 +79,40 @@ func testBotStoreGet(t *testing.T, ss store.Store, s SqlStore) { t.Run("get non-existent bot", func(t *testing.T) { _, err := ss.Bot().Get("unknown", false) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) t.Run("get deleted bot", func(t *testing.T) { _, err := ss.Bot().Get(deletedBot.UserId, false) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) t.Run("get deleted bot, include deleted", func(t *testing.T) { bot, err := ss.Bot().Get(deletedBot.UserId, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, deletedBot, bot) }) t.Run("get permanently deleted bot", func(t *testing.T) { _, err := ss.Bot().Get(permanentlyDeletedBot.UserId, false) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) t.Run("get bot 1", func(t *testing.T) { bot, err := ss.Bot().Get(b1.UserId, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, b1, bot) }) t.Run("get bot 2", func(t *testing.T) { bot, err := ss.Bot().Get(b2.UserId, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, b2, bot) }) } @@ -129,9 +129,9 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { }) deletedBot.DeleteAt = 1 deletedBot, err := ss.Bot().Update(deletedBot) - require.Nil(t, err) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(deletedBot.UserId)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.Bot().PermanentDelete(deletedBot.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(deletedBot.UserId)) }() permanentlyDeletedBot, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "permanently_deleted_bot", @@ -140,8 +140,8 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { LastIconUpdate: model.GetMillis(), DeleteAt: 0, }) - require.Nil(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId)) - defer func() { require.Nil(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }() + require.NoError(t, ss.Bot().PermanentDelete(permanentlyDeletedBot.UserId)) + defer func() { require.NoError(t, ss.User().PermanentDelete(permanentlyDeletedBot.UserId)) }() b1, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "b1", @@ -149,8 +149,8 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { OwnerId: OwnerId1, LastIconUpdate: model.GetMillis(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b1.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b1.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }() b2, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "b2", @@ -158,8 +158,8 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { OwnerId: OwnerId1, LastIconUpdate: 0, }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b2.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b2.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b2.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b2.UserId)) }() // Artificially set b2.LastIconUpdate to NULL to verify handling of same. _, sqlErr := s.GetMaster().Exec("UPDATE Bots SET LastIconUpdate = NULL WHERE UserId = '" + b2.UserId + "'") @@ -167,7 +167,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get original bots", func(t *testing.T) { bot, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b1, b2, @@ -179,40 +179,40 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { Description: "The third bot", OwnerId: OwnerId1, }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b3.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b3.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b3.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b3.UserId)) }() b4, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "b4", Description: "The fourth bot", OwnerId: OwnerId2, }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b4.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b4.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b4.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b4.UserId)) }() deletedUser := model.User{ Email: MakeEmail(), Username: model.NewId(), } _, err1 := ss.User().Save(&deletedUser) - require.Nil(t, err1, "couldn't save user") + require.NoError(t, err1, "couldn't save user") deletedUser.DeleteAt = model.GetMillis() _, err2 := ss.User().Update(&deletedUser, true) - require.Nil(t, err2, "couldn't delete user") + require.NoError(t, err2, "couldn't delete user") - defer func() { require.Nil(t, ss.User().PermanentDelete(deletedUser.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(deletedUser.Id)) }() ob5, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "ob5", Description: "Orphaned bot 5", OwnerId: deletedUser.Id, }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b4.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b4.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b4.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b4.UserId)) }() t.Run("get newly created bot stoo", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b1, b2, @@ -224,7 +224,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get orphaned", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10, OnlyOrphaned: true}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ ob5, }, bots) @@ -232,7 +232,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get page=0, per_page=2", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 2}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b1, b2, @@ -241,7 +241,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get page=1, limit=2", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 1, PerPage: 2}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b3, b4, @@ -250,13 +250,13 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get page=5, perpage=1000", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 5, PerPage: 1000}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{}, bots) }) t.Run("get offset=0, limit=2, include deleted", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 2, IncludeDeleted: true}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ deletedBot, b1, @@ -265,7 +265,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get offset=2, limit=2, include deleted", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 1, PerPage: 2, IncludeDeleted: true}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b2, b3, @@ -274,7 +274,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get offset=0, limit=10, creator id 1", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10, OwnerId: OwnerId1}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b1, b2, @@ -284,7 +284,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get offset=0, limit=10, creator id 2", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10, OwnerId: OwnerId2}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b4, }, bots) @@ -292,7 +292,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get offset=0, limit=10, include deleted, creator id 1", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10, IncludeDeleted: true, OwnerId: OwnerId1}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ deletedBot, b1, @@ -303,7 +303,7 @@ func testBotStoreGetAll(t *testing.T, ss store.Store, s SqlStore) { t.Run("get offset=0, limit=10, include deleted, creator id 2", func(t *testing.T) { bots, err := ss.Bot().GetAll(&model.BotGetOptions{Page: 0, PerPage: 10, IncludeDeleted: true, OwnerId: OwnerId2}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.Bot{ b4, }, bots) @@ -319,7 +319,7 @@ func testBotStoreSave(t *testing.T, ss store.Store) { } _, err := ss.Bot().Save(bot) - require.NotNil(t, err) + require.Error(t, err) var appErr *model.AppError require.True(t, errors.As(err, &appErr)) // require.Equal(t, "model.bot.is_valid.username.app_error", err.Id) @@ -333,13 +333,13 @@ func testBotStoreSave(t *testing.T, ss store.Store) { } user, err := ss.User().Save(model.UserFromBot(bot)) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() bot.UserId = user.Id returnedNewBot, nErr := ss.Bot().Save(bot) - require.Nil(t, nErr) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(bot.UserId)) }() + require.NoError(t, nErr) + defer func() { require.NoError(t, ss.Bot().PermanentDelete(bot.UserId)) }() // Verify the returned bot matches the saved bot, modulo expected changes require.NotEqual(t, 0, returnedNewBot.CreateAt) @@ -353,7 +353,7 @@ func testBotStoreSave(t *testing.T, ss store.Store) { // Verify the actual bot in the database matches the saved bot. actualNewBot, nErr := ss.Bot().Get(bot.UserId, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, bot, actualNewBot) }) } @@ -364,13 +364,13 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) { Username: "existing_bot", OwnerId: model.NewId(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(existingBot.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(existingBot.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(existingBot.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(existingBot.UserId)) }() bot := existingBot.Clone() bot.Username = "invalid username" _, err := ss.Bot().Update(bot) - require.NotNil(t, err) + require.Error(t, err) var appErr *model.AppError require.True(t, errors.As(err, &appErr)) require.Equal(t, "model.bot.is_valid.username.app_error", appErr.Id) @@ -381,8 +381,8 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) { Username: "existing_bot", OwnerId: model.NewId(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(existingBot.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(existingBot.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(existingBot.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(existingBot.UserId)) }() bot := existingBot.Clone() bot.OwnerId = model.NewId() @@ -393,7 +393,7 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) { bot.DeleteAt = 100000 // Allowed returnedBot, err := ss.Bot().Update(bot) - require.Nil(t, err) + require.NoError(t, err) // Verify the returned bot matches the updated bot, modulo expected timestamp changes require.Equal(t, existingBot.CreateAt, returnedBot.CreateAt) @@ -407,7 +407,7 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) { // Verify the actual (now deleted) bot in the database actualBot, err := ss.Bot().Get(bot.UserId, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, bot, actualBot) }) @@ -416,18 +416,18 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) { Username: "existing_bot", OwnerId: model.NewId(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(existingBot.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(existingBot.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(existingBot.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(existingBot.UserId)) }() existingBot.DeleteAt = 100000 existingBot, err := ss.Bot().Update(existingBot) - require.Nil(t, err) + require.NoError(t, err) bot := existingBot.Clone() bot.DeleteAt = 0 returnedBot, err := ss.Bot().Update(bot) - require.Nil(t, err) + require.NoError(t, err) // Verify the returned bot matches the updated bot, modulo expected timestamp changes require.EqualValues(t, 0, returnedBot.DeleteAt) @@ -435,7 +435,7 @@ func testBotStoreUpdate(t *testing.T, ss store.Store) { // Verify the actual bot in the database actualBot, err := ss.Bot().Get(bot.UserId, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, bot, actualBot) }) } @@ -445,24 +445,24 @@ func testBotStorePermanentDelete(t *testing.T, ss store.Store) { Username: "b1", OwnerId: model.NewId(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b1.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b1.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b1.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b1.UserId)) }() b2, _ := makeBotWithUser(t, ss, &model.Bot{ Username: "b2", OwnerId: model.NewId(), }) - defer func() { require.Nil(t, ss.Bot().PermanentDelete(b2.UserId)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(b2.UserId)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(b2.UserId)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(b2.UserId)) }() t.Run("permanently delete a non-existent bot", func(t *testing.T) { err := ss.Bot().PermanentDelete("unknown") - require.Nil(t, err) + require.NoError(t, err) }) t.Run("permanently delete bot", func(t *testing.T) { err := ss.Bot().PermanentDelete(b1.UserId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Bot().Get(b1.UserId, false) require.Error(t, err) diff --git a/store/storetest/channel_member_history_store.go b/store/storetest/channel_member_history_store.go index a3b58af2fa..8e14d47607 100644 --- a/store/storetest/channel_member_history_store.go +++ b/store/storetest/channel_member_history_store.go @@ -32,7 +32,7 @@ func testLogJoinEvent(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, err := ss.Channel().Save(&ch, -1) - require.Nil(t, err) + require.NoError(t, err) // and a test user user := model.User{ @@ -41,12 +41,12 @@ func testLogJoinEvent(t *testing.T, ss store.Store) { Username: model.NewId(), } userPtr, err := ss.User().Save(&user) - require.Nil(t, err) + require.NoError(t, err) user = *userPtr // log a join event err = ss.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()) - assert.Nil(t, err) + assert.NoError(t, err) } func testLogLeaveEvent(t *testing.T, ss store.Store) { @@ -58,7 +58,7 @@ func testLogLeaveEvent(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, err := ss.Channel().Save(&ch, -1) - require.Nil(t, err) + require.NoError(t, err) // and a test user user := model.User{ @@ -67,15 +67,15 @@ func testLogLeaveEvent(t *testing.T, ss store.Store) { Username: model.NewId(), } userPtr, err := ss.User().Save(&user) - require.Nil(t, err) + require.NoError(t, err) user = *userPtr // log a join event, followed by a leave event err = ss.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()) - assert.Nil(t, err) + assert.NoError(t, err) err = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, model.GetMillis()) - assert.Nil(t, err) + assert.NoError(t, err) } func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { @@ -87,7 +87,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, err := ss.Channel().Save(ch, -1) - require.Nil(t, err) + require.NoError(t, err) // and a test user user := model.User{ @@ -96,7 +96,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { Username: model.NewId(), } userPtr, err := ss.User().Save(&user) - require.Nil(t, err) + require.NoError(t, err) user = *userPtr // the user was previously in the channel a long time ago, before the export period starts @@ -105,24 +105,24 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { leaveTime := model.GetMillis() - 20000 joinTime := leaveTime - 10000 err = ss.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, joinTime) - require.Nil(t, err) + require.NoError(t, err) err = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, leaveTime) - require.Nil(t, err) + require.NoError(t, err) // log a join event leaveTime = model.GetMillis() joinTime = leaveTime - 10000 err = ss.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, joinTime) - require.Nil(t, err) + require.NoError(t, err) // case 1: user joins and leaves the channel before the export period begins channelMembers, err := ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime-500, joinTime-100, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, channelMembers) // case 2: user joins the channel after the export period begins, but has not yet left the channel when the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime-100, joinTime+500, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -133,7 +133,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { // case 3: user joins the channel before the export period begins, but has not yet left the channel when the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime+100, joinTime+500, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -144,11 +144,11 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { // add a leave time for the user err = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, leaveTime) - require.Nil(t, err) + require.NoError(t, err) // case 4: user joins the channel before the export period begins, but has not yet left the channel when the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime+100, leaveTime-100, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -159,7 +159,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { // case 5: user joins the channel after the export period begins, and leaves the channel before the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime-100, leaveTime+100, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -170,7 +170,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) { // case 6: user has joined and left the channel long before the export period begins channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(leaveTime+100, leaveTime+200, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, channelMembers) } @@ -183,7 +183,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, err := ss.Channel().Save(channel, -1) - require.Nil(t, err) + require.NoError(t, err) // and a test user user := model.User{ @@ -192,7 +192,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { Username: model.NewId(), } userPtr, err := ss.User().Save(&user) - require.Nil(t, err) + require.NoError(t, err) user = *userPtr // clear any existing ChannelMemberHistory data that might interfere with our test @@ -200,7 +200,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { for !tableDataTruncated { var count int64 count, err = ss.ChannelMemberHistory().PermanentDeleteBatch(model.GetMillis(), 1000) - require.Nil(t, err, "Failed to truncate ChannelMemberHistory contents") + require.NoError(t, err, "Failed to truncate ChannelMemberHistory contents") tableDataTruncated = count == int64(0) } @@ -213,14 +213,14 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // in every single case, the user will be included in the export, because ChannelMembers says they were in the channel at some point in // the past, even though the time that they were actually in the channel doesn't necessarily overlap with the export period // case 1: user joins and leaves the channel before the export period begins channelMembers, err := ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime-500, joinTime-100, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -231,7 +231,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { // case 2: user joins the channel after the export period begins, but has not yet left the channel when the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime-100, joinTime+500, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -242,7 +242,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { // case 3: user joins the channel before the export period begins, but has not yet left the channel when the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime+100, joinTime+500, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -253,7 +253,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { // case 4: user joins the channel before the export period begins, but has not yet left the channel when the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime+100, leaveTime-100, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -264,7 +264,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { // case 5: user joins the channel after the export period begins, and leaves the channel before the export period ends channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime-100, leaveTime+100, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -275,7 +275,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) { // case 6: user has joined and left the channel long before the export period begins channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(leaveTime+100, leaveTime+200, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, channel.Id, channelMembers[0].ChannelId) assert.Equal(t, user.Id, channelMembers[0].UserId) @@ -294,7 +294,7 @@ func testPermanentDeleteBatch(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, err := ss.Channel().Save(channel, -1) - require.Nil(t, err) + require.NoError(t, err) // and two test users user := model.User{ @@ -303,7 +303,7 @@ func testPermanentDeleteBatch(t *testing.T, ss store.Store) { Username: model.NewId(), } userPtr, err := ss.User().Save(&user) - require.Nil(t, err) + require.NoError(t, err) user = *userPtr user2 := model.User{ @@ -312,34 +312,34 @@ func testPermanentDeleteBatch(t *testing.T, ss store.Store) { Username: model.NewId(), } user2Ptr, err := ss.User().Save(&user2) - require.Nil(t, err) + require.NoError(t, err) user2 = *user2Ptr // user1 joins and leaves the channel leaveTime := model.GetMillis() joinTime := leaveTime - 10000 err = ss.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, joinTime) - require.Nil(t, err) + require.NoError(t, err) err = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, leaveTime) - require.Nil(t, err) + require.NoError(t, err) // user2 joins the channel but never leaves err = ss.ChannelMemberHistory().LogJoinEvent(user2.Id, channel.Id, joinTime) - require.Nil(t, err) + require.NoError(t, err) // in between the join time and the leave time, both users were members of the channel channelMembers, err := ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime+10, leaveTime-10, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 2) // the permanent delete should delete at least one record rowsDeleted, err := ss.ChannelMemberHistory().PermanentDeleteBatch(leaveTime, math.MaxInt64) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, int64(0), rowsDeleted) // after the delete, there should be one less member in the channel channelMembers, err = ss.ChannelMemberHistory().GetUsersInChannelDuring(joinTime+10, leaveTime-10, channel.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, channelMembers, 1) assert.Equal(t, user2.Id, channelMembers[0].UserId) } diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go index 3a486de127..81199e81d7 100644 --- a/store/storetest/channel_store.go +++ b/store/storetest/channel_store.go @@ -28,7 +28,7 @@ type SqlStore interface { func cleanupChannels(t *testing.T, ss store.Store) { list, err := ss.Channel().GetAllChannels(0, 100000, store.ChannelSearchOpts{IncludeDeleted: true}) - require.Nilf(t, err, "error cleaning all channels: %v", err) + require.NoError(t, err, "error cleaning all channels", err) for _, channel := range *list { err = ss.Channel().PermanentDelete(channel.Id) assert.NoError(t, err) @@ -122,20 +122,20 @@ func testChannelStoreSave(t *testing.T, ss store.Store) { o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr, "couldn't save item", nErr) + require.NoError(t, nErr, "couldn't save item", nErr) _, nErr = ss.Channel().Save(&o1, -1) - require.NotNil(t, nErr, "shouldn't be able to update from save") + require.Error(t, nErr, "shouldn't be able to update from save") o1.Id = "" _, nErr = ss.Channel().Save(&o1, -1) - require.NotNil(t, nErr, "should be unique name") + require.Error(t, nErr, "should be unique name") o1.Id = "" o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_DIRECT _, nErr = ss.Channel().Save(&o1, -1) - require.NotNil(t, nErr, "should not be able to save direct channel") + require.Error(t, nErr, "should not be able to save direct channel") o1 = model.Channel{} o1.TeamId = teamId @@ -144,22 +144,22 @@ func testChannelStoreSave(t *testing.T, ss store.Store) { o1.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o1, -1) - require.Nil(t, nErr, "should have saved channel") + require.NoError(t, nErr, "should have saved channel") o2 := o1 o2.Id = "" _, nErr = ss.Channel().Save(&o2, -1) - require.NotNil(t, nErr, "should have failed to save a duplicate channel") + require.Error(t, nErr, "should have failed to save a duplicate channel") var cErr *store.ErrConflict require.True(t, errors.As(nErr, &cErr)) err := ss.Channel().Delete(o1.Id, 100) - require.Nil(t, err, "should have deleted channel") + require.NoError(t, err, "should have deleted channel") o2.Id = "" _, nErr = ss.Channel().Save(&o2, -1) - require.NotNil(t, nErr, "should have failed to save a duplicate of an archived channel") + require.Error(t, nErr, "should have failed to save a duplicate of an archived channel") require.True(t, errors.As(nErr, &cErr)) } @@ -176,17 +176,17 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlStore) u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -199,14 +199,14 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlStore) m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2) - require.Nil(t, nErr, "couldn't save direct channel", nErr) + require.NoError(t, nErr, "couldn't save direct channel", nErr) members, nErr := ss.Channel().GetMembers(o1.Id, 0, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *members, 2, "should have saved 2 members") _, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2) - require.NotNil(t, nErr, "shoudn't be a able to update from save") + require.Error(t, nErr, "shoudn't be a able to update from save") // Attempt to save a direct channel that already exists o1a := model.Channel{ @@ -217,7 +217,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlStore) } returnedChannel, nErr := ss.Channel().SaveDirectChannel(&o1a, &m1, &m2) - require.NotNil(t, nErr, "should've failed to save a duplicate direct channel") + require.Error(t, nErr, "should've failed to save a duplicate direct channel") var cErr *store.ErrConflict require.Truef(t, errors.As(nErr, &cErr), "should've returned ChannelExistsError") require.Equal(t, o1.Id, returnedChannel.Id, "should've failed to save a duplicate direct channel") @@ -227,7 +227,7 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlStore) o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m2) - require.NotNil(t, nErr, "Should not be able to save non-direct channel") + require.Error(t, nErr, "Should not be able to save non-direct channel") // Save yourself Direct Message o1.Id = "" @@ -235,10 +235,10 @@ func testChannelStoreSaveDirectChannel(t *testing.T, ss store.Store, s SqlStore) o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_DIRECT _, nErr = ss.Channel().SaveDirectChannel(&o1, &m1, &m1) - require.Nil(t, nErr, "couldn't save direct channel", nErr) + require.NoError(t, nErr, "couldn't save direct channel", nErr) members, nErr = ss.Channel().GetMembers(o1.Id, 0, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *members, 1, "should have saved just 1 member") // Manually truncate Channels table until testlib can handle cleanups @@ -250,27 +250,27 @@ func testChannelStoreCreateDirectChannel(t *testing.T, ss store.Store) { u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1, nErr := ss.Channel().CreateDirectChannel(u1, u2) - require.Nil(t, nErr, "couldn't create direct channel", nErr) + require.NoError(t, nErr, "couldn't create direct channel", nErr) defer func() { ss.Channel().PermanentDeleteMembersByChannel(c1.Id) ss.Channel().PermanentDelete(c1.Id) }() members, nErr := ss.Channel().GetMembers(c1.Id, 0, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *members, 2, "should have saved 2 members") } @@ -282,7 +282,7 @@ func testChannelStoreUpdate(t *testing.T, ss store.Store) { o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = o1.TeamId @@ -291,25 +291,25 @@ func testChannelStoreUpdate(t *testing.T, ss store.Store) { o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(100 * time.Millisecond) _, err := ss.Channel().Update(&o1) - require.Nil(t, err, err) + require.NoError(t, err, err) o1.DeleteAt = 100 _, err = ss.Channel().Update(&o1) - require.NotNil(t, err, "update should have failed because channel is archived") + require.Error(t, err, "update should have failed because channel is archived") o1.DeleteAt = 0 o1.Id = "missing" _, err = ss.Channel().Update(&o1) - require.NotNil(t, err, "Update should have failed because of missing key") + require.Error(t, err, "Update should have failed because of missing key") o2.Name = o1.Name _, err = ss.Channel().Update(&o2) - require.NotNil(t, err, "update should have failed because of existing name") + require.Error(t, err, "update should have failed because of existing name") } func testGetChannelUnread(t *testing.T, ss store.Store) { @@ -320,33 +320,33 @@ func testGetChannelUnread(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) notifyPropsModel := model.GetDefaultChannelNotifyProps() // Setup Channel 1 c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Downtown", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} _, nErr = ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: notifyPropsModel, MsgCount: 90} _, err := ss.Channel().SaveMember(cm1) - require.Nil(t, err) + require.NoError(t, err) // Setup Channel 2 c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Cultural", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} _, nErr = ss.Channel().Save(c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) cm2 := &model.ChannelMember{ChannelId: c2.Id, UserId: m2.UserId, NotifyProps: notifyPropsModel, MsgCount: 90, MentionCount: 5} _, err = ss.Channel().SaveMember(cm2) - require.Nil(t, err) + require.NoError(t, err) // Check for Channel 1 ch, nErr := ss.Channel().GetChannelUnread(c1.Id, uid) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Equal(t, c1.Id, ch.ChannelId, "Wrong channel id") require.Equal(t, teamId1, ch.TeamId, "Wrong team id for channel 1") require.NotNil(t, ch.NotifyProps, "wrong props for channel 1") @@ -356,7 +356,7 @@ func testGetChannelUnread(t *testing.T, ss store.Store) { // Check for Channel 2 ch2, nErr := ss.Channel().GetChannelUnread(c2.Id, uid) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Equal(t, c2.Id, ch2.ChannelId, "Wrong channel id") require.Equal(t, teamId2, ch2.TeamId, "Wrong team id") require.EqualValues(t, 5, ch2.MentionCount, "wrong MentionCount for channel 2") @@ -370,31 +370,31 @@ func testChannelStoreGet(t *testing.T, ss store.Store, s SqlStore) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1 := &model.Channel{} c1, err := ss.Channel().Get(o1.Id, false) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Equal(t, o1.ToJson(), c1.ToJson(), "invalid returned channel") _, err = ss.Channel().Get("", false) - require.NotNil(t, err, "missing id should have failed") + require.Error(t, err, "missing id should have failed") u1 := &model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err = ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -413,22 +413,22 @@ func testChannelStoreGet(t *testing.T, ss store.Store, s SqlStore) { m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveDirectChannel(&o2, &m1, &m2) - require.Nil(t, nErr) + require.NoError(t, nErr) c2, err := ss.Channel().Get(o2.Id, false) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Equal(t, o2.ToJson(), c2.ToJson(), "invalid returned channel") c4, err := ss.Channel().Get(o2.Id, true) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Equal(t, o2.ToJson(), c4.ToJson(), "invalid returned channel") channels, chanErr := ss.Channel().GetAll(o1.TeamId) - require.Nil(t, chanErr, chanErr) + require.NoError(t, chanErr, chanErr) require.Greater(t, len(channels), 0, "too little") channelsTeam, err := ss.Channel().GetTeamChannels(o1.TeamId) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Greater(t, len(*channelsTeam), 0, "too little") // Manually truncate Channels table until testlib can handle cleanups @@ -442,23 +442,23 @@ func testChannelStoreGetChannelsByIds(t *testing.T, ss store.Store) { o1.Name = "aa" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := &model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -472,9 +472,9 @@ func testChannelStoreGetChannelsByIds(t *testing.T, ss store.Store) { o3.Name = "cc" + model.NewId() + "b" o3.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().Delete(o3.Id, 123) - require.Nil(t, nErr) + require.NoError(t, nErr) o3.DeleteAt = 123 o3.UpdateAt = 123 @@ -489,11 +489,11 @@ func testChannelStoreGetChannelsByIds(t *testing.T, ss store.Store) { m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveDirectChannel(&o2, &m1, &m2) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("Get 2 existing channels", func(t *testing.T) { r1, err := ss.Channel().GetChannelsByIds([]string{o1.Id, o2.Id}, false) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Len(t, r1, 2, "invalid returned channels, exepected 2 and got "+strconv.Itoa(len(r1))) require.Equal(t, o1.ToJson(), r1[0].ToJson()) require.Equal(t, o2.ToJson(), r1[1].ToJson()) @@ -502,14 +502,14 @@ func testChannelStoreGetChannelsByIds(t *testing.T, ss store.Store) { t.Run("Get 1 existing and 1 not existing channel", func(t *testing.T) { nonexistentId := "abcd1234" r2, err := ss.Channel().GetChannelsByIds([]string{o1.Id, nonexistentId}, false) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Len(t, r2, 1, "invalid returned channels, expected 1 and got "+strconv.Itoa(len(r2))) require.Equal(t, o1.ToJson(), r2[0].ToJson(), "invalid returned channel") }) t.Run("Get 2 existing and 1 deleted channel", func(t *testing.T) { r1, err := ss.Channel().GetChannelsByIds([]string{o1.Id, o2.Id, o3.Id}, true) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Len(t, r1, 3, "invalid returned channels, exepected 3 and got "+strconv.Itoa(len(r1))) require.Equal(t, o1.ToJson(), r1[0].ToJson()) require.Equal(t, o2.ToJson(), r1[1].ToJson()) @@ -526,17 +526,17 @@ func testChannelStoreGetForPost(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } o1, nErr := ss.Channel().Save(ch, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) p1, err := ss.Post().Save(&model.Post{ UserId: model.NewId(), ChannelId: o1.Id, Message: "test", }) - require.Nil(t, err) + require.NoError(t, err) channel, chanErr := ss.Channel().GetForPost(p1.Id) - require.Nil(t, chanErr, chanErr) + require.NoError(t, chanErr, chanErr) require.Equal(t, o1.Id, channel.Id, "incorrect channel returned") } @@ -547,16 +547,16 @@ func testChannelStoreRestore(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err := ss.Channel().Delete(o1.Id, model.GetMillis()) - require.Nil(t, err, err) + require.NoError(t, err, err) c, _ := ss.Channel().Get(o1.Id, false) require.NotEqual(t, 0, c.DeleteAt, "should have been deleted") err = ss.Channel().Restore(o1.Id, model.GetMillis()) - require.Nil(t, err, err) + require.NoError(t, err, err) c, _ = ss.Channel().Get(o1.Id, false) require.EqualValues(t, 0, c.DeleteAt, "should have been restored") @@ -569,7 +569,7 @@ func testChannelStoreDelete(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = o1.TeamId @@ -577,7 +577,7 @@ func testChannelStoreDelete(t *testing.T, ss store.Store) { o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o3 := model.Channel{} o3.TeamId = o1.TeamId @@ -585,7 +585,7 @@ func testChannelStoreDelete(t *testing.T, ss store.Store) { o3.Name = "zz" + model.NewId() + "b" o3.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o4 := model.Channel{} o4.TeamId = o1.TeamId @@ -593,44 +593,44 @@ func testChannelStoreDelete(t *testing.T, ss store.Store) { o4.Name = "zz" + model.NewId() + "b" o4.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = o2.Id m2.UserId = m1.UserId m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) nErr = ss.Channel().Delete(o1.Id, model.GetMillis()) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) c, _ := ss.Channel().Get(o1.Id, false) require.NotEqual(t, 0, c.DeleteAt, "should have been deleted") nErr = ss.Channel().Delete(o3.Id, model.GetMillis()) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) list, nErr := ss.Channel().GetChannels(o1.TeamId, m1.UserId, false, 0) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 1, "invalid number of channels") list, nErr = ss.Channel().GetMoreChannels(o1.TeamId, m1.UserId, 0, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 1, "invalid number of channels") cresult := ss.Channel().PermanentDelete(o2.Id) - require.Nil(t, cresult) + require.NoError(t, cresult) list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, false, 0) - if assert.NotNil(t, nErr) { + if assert.Error(t, nErr) { var nfErr *store.ErrNotFound require.True(t, errors.As(nErr, &nfErr)) } else { @@ -638,7 +638,7 @@ func testChannelStoreDelete(t *testing.T, ss store.Store) { } nErr = ss.Channel().PermanentDeleteByTeam(o1.TeamId) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) } func testChannelStoreGetByName(t *testing.T, ss store.Store) { @@ -648,29 +648,29 @@ func testChannelStoreGetByName(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) result, err := ss.Channel().GetByName(o1.TeamId, o1.Name, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, o1.ToJson(), result.ToJson(), "invalid returned channel") channelID := result.Id result, err = ss.Channel().GetByName(o1.TeamId, "", true) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") result, err = ss.Channel().GetByName(o1.TeamId, o1.Name, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, o1.ToJson(), result.ToJson(), "invalid returned channel") result, err = ss.Channel().GetByName(o1.TeamId, "", false) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") nErr = ss.Channel().Delete(channelID, model.GetMillis()) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") result, err = ss.Channel().GetByName(o1.TeamId, o1.Name, false) - require.NotNil(t, err, "Deleted channel should not be returned by GetByName()") + require.Error(t, err, "Deleted channel should not be returned by GetByName()") } func testChannelStoreGetByNames(t *testing.T, ss store.Store) { @@ -681,7 +681,7 @@ func testChannelStoreGetByNames(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{ TeamId: o1.TeamId, @@ -690,7 +690,7 @@ func testChannelStoreGetByNames(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) for index, tc := range []struct { TeamId string @@ -707,7 +707,7 @@ func testChannelStoreGetByNames(t *testing.T, ss store.Store) { } { var channels []*model.Channel channels, err := ss.Channel().GetByNames(tc.TeamId, tc.Names, true) - require.Nil(t, err) + require.NoError(t, err) var ids []string for _, channel := range channels { ids = append(ids, channel.Id) @@ -718,13 +718,13 @@ func testChannelStoreGetByNames(t *testing.T, ss store.Store) { } err := ss.Channel().Delete(o1.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") err = ss.Channel().Delete(o2.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") channels, nErr := ss.Channel().GetByNames(o1.TeamId, []string{o1.Name}, false) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Empty(t, channels) } @@ -735,20 +735,20 @@ func testChannelStoreGetDeletedByName(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) now := model.GetMillis() err := ss.Channel().Delete(o1.Id, now) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") o1.DeleteAt = now o1.UpdateAt = now r1, nErr := ss.Channel().GetDeletedByName(o1.TeamId, o1.Name) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, o1, r1) _, nErr = ss.Channel().GetDeletedByName(o1.TeamId, "") - require.NotNil(t, nErr, "missing id should have failed") + require.Error(t, nErr, "missing id should have failed") } func testChannelStoreGetDeleted(t *testing.T, ss store.Store) { @@ -761,13 +761,13 @@ func testChannelStoreGetDeleted(t *testing.T, ss store.Store) { userId := model.NewId() _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err := ss.Channel().Delete(o1.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") list, nErr := ss.Channel().GetDeleted(o1.TeamId, 0, 100, userId) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Len(t, *list, 1, "wrong list") require.Equal(t, o1.Name, (*list)[0].Name, "missing channel") @@ -777,10 +777,10 @@ func testChannelStoreGetDeleted(t *testing.T, ss store.Store) { o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 100, userId) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Len(t, *list, 1, "wrong list") o3 := model.Channel{} @@ -790,21 +790,21 @@ func testChannelStoreGetDeleted(t *testing.T, ss store.Store) { o3.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.Channel().Delete(o3.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 100, userId) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Len(t, *list, 2, "wrong list length") list, nErr = ss.Channel().GetDeleted(o1.TeamId, 0, 1, userId) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Len(t, *list, 1, "wrong list length") list, nErr = ss.Channel().GetDeleted(o1.TeamId, 1, 1, userId) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Len(t, *list, 1, "wrong list length") } @@ -816,7 +816,7 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1t1, _ := ss.Channel().Get(c1.Id, false) assert.EqualValues(t, 0, c1t1.ExtraUpdateAt, "ExtraUpdateAt should be 0") @@ -825,41 +825,41 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := model.ChannelMember{} o1.ChannelId = c1.Id o1.UserId = u1.Id o1.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveMember(&o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.ChannelMember{} o2.ChannelId = c1.Id o2.UserId = u2.Id o2.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveMember(&o2) - require.Nil(t, nErr) + require.NoError(t, nErr) c1t2, _ := ss.Channel().Get(c1.Id, false) assert.EqualValues(t, 0, c1t2.ExtraUpdateAt, "ExtraUpdateAt should be 0") count, nErr := ss.Channel().GetMemberCount(o1.ChannelId, true) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 2, count, "should have saved 2 members") count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, true) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 2, count, "should have saved 2 members") require.EqualValues( t, @@ -874,14 +874,14 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { "should have saved 0 members") count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 2, count, "should have saved 2 members") nErr = ss.Channel().RemoveMember(o2.ChannelId, o2.UserId) - require.Nil(t, nErr) + require.NoError(t, nErr) count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 1, count, "should have removed 1 member") c1t3, _ := ss.Channel().Get(c1.Id, false) @@ -891,7 +891,7 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { require.Equal(t, o1.ChannelId, member.ChannelId, "should have go member") _, nErr = ss.Channel().SaveMember(&o1) - require.NotNil(t, nErr, "should have been a duplicate") + require.Error(t, nErr, "should have been a duplicate") c1t4, _ := ss.Channel().Get(c1.Id, false) assert.EqualValues(t, 0, c1t4.ExtraUpdateAt, "ExtraUpdateAt should be 0") @@ -899,13 +899,13 @@ func testChannelMemberStore(t *testing.T, ss store.Store) { func testChannelSaveMember(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) defaultNotifyProps := model.GetDefaultChannelNotifyProps() t.Run("not valid channel member", func(t *testing.T) { member := &model.ChannelMember{ChannelId: "wrong", UserId: u1.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMember(member) - require.NotNil(t, nErr) + require.Error(t, nErr) var appErr *model.AppError require.True(t, errors.As(nErr, &appErr)) require.Equal(t, "model.channel_member.is_valid.channel_id.app_error", appErr.Id) @@ -915,10 +915,10 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { channelID1 := model.NewId() m1 := &model.ChannelMember{ChannelId: channelID1, UserId: u1.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMember(m1) - require.Nil(t, nErr) + require.NoError(t, nErr) m2 := &model.ChannelMember{ChannelId: channelID1, UserId: u1.Id, NotifyProps: defaultNotifyProps} _, nErr = ss.Channel().SaveMember(m2) - require.NotNil(t, nErr) + require.Error(t, nErr) require.IsType(t, &store.ErrConflict{}, nErr) }) @@ -931,7 +931,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -940,7 +940,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() testCases := []struct { @@ -1062,7 +1062,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } member, nErr = ss.Channel().SaveMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().RemoveMember(channel.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) @@ -1081,7 +1081,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -1092,7 +1092,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -1101,7 +1101,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() testCases := []struct { @@ -1223,7 +1223,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } member, nErr = ss.Channel().SaveMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().RemoveMember(channel.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) @@ -1242,7 +1242,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } cs, nErr := ss.Scheme().Save(cs) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -1252,7 +1252,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ DisplayName: "DisplayName", @@ -1261,7 +1261,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { TeamId: team.Id, SchemeId: &cs.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() testCases := []struct { @@ -1383,7 +1383,7 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } member, nErr = ss.Channel().SaveMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().RemoveMember(channel.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) @@ -1397,16 +1397,16 @@ func testChannelSaveMember(t *testing.T, ss store.Store) { func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) defaultNotifyProps := model.GetDefaultChannelNotifyProps() t.Run("any not valid channel member", func(t *testing.T) { m1 := &model.ChannelMember{ChannelId: "wrong", UserId: u1.Id, NotifyProps: defaultNotifyProps} m2 := &model.ChannelMember{ChannelId: model.NewId(), UserId: u2.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2}) - require.NotNil(t, nErr) + require.Error(t, nErr) var appErr *model.AppError require.True(t, errors.As(nErr, &appErr)) require.Equal(t, "model.channel_member.is_valid.channel_id.app_error", appErr.Id) @@ -1417,7 +1417,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { m1 := &model.ChannelMember{ChannelId: channelID1, UserId: u1.Id, NotifyProps: defaultNotifyProps} m2 := &model.ChannelMember{ChannelId: channelID1, UserId: u1.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2}) - require.NotNil(t, nErr) + require.Error(t, nErr) require.IsType(t, &store.ErrConflict{}, nErr) }) @@ -1430,7 +1430,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -1439,7 +1439,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() testCases := []struct { @@ -1571,7 +1571,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { } var members []*model.ChannelMember members, nErr = ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] defer ss.Channel().RemoveMember(channel.Id, u1.Id) @@ -1594,7 +1594,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -1605,7 +1605,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -1614,7 +1614,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() testCases := []struct { @@ -1746,7 +1746,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { } var members []*model.ChannelMember members, nErr = ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] defer ss.Channel().RemoveMember(channel.Id, u1.Id) @@ -1769,7 +1769,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } cs, nErr := ss.Scheme().Save(cs) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -1779,7 +1779,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ DisplayName: "DisplayName", @@ -1788,7 +1788,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { TeamId: team.Id, SchemeId: &cs.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() testCases := []struct { @@ -1919,7 +1919,7 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } members, err := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, members, 2) member = members[0] defer ss.Channel().RemoveMember(channel.Id, u1.Id) @@ -1937,13 +1937,13 @@ func testChannelSaveMultipleMembers(t *testing.T, ss store.Store) { func testChannelUpdateMember(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) defaultNotifyProps := model.GetDefaultChannelNotifyProps() t.Run("not valid channel member", func(t *testing.T) { member := &model.ChannelMember{ChannelId: "wrong", UserId: u1.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().UpdateMember(member) - require.NotNil(t, nErr) + require.Error(t, nErr) var appErr *model.AppError require.True(t, errors.As(nErr, &appErr)) require.Equal(t, "model.channel_member.is_valid.channel_id.app_error", appErr.Id) @@ -1958,7 +1958,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -1967,7 +1967,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() member := &model.ChannelMember{ @@ -1976,7 +1976,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } member, nErr = ss.Channel().SaveMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -2092,7 +2092,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { member.SchemeAdmin = tc.SchemeAdmin member.ExplicitRoles = tc.ExplicitRoles member, nErr = ss.Channel().UpdateMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) assert.Equal(t, tc.ExpectedSchemeGuest, member.SchemeGuest) @@ -2110,7 +2110,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -2121,7 +2121,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -2130,7 +2130,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() member := &model.ChannelMember{ @@ -2139,7 +2139,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } member, nErr = ss.Channel().SaveMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -2255,7 +2255,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { member.SchemeAdmin = tc.SchemeAdmin member.ExplicitRoles = tc.ExplicitRoles member, nErr = ss.Channel().UpdateMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) assert.Equal(t, tc.ExpectedSchemeGuest, member.SchemeGuest) @@ -2273,7 +2273,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } cs, nErr := ss.Scheme().Save(cs) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -2283,7 +2283,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ DisplayName: "DisplayName", @@ -2292,7 +2292,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { TeamId: team.Id, SchemeId: &cs.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() member := &model.ChannelMember{ @@ -2301,7 +2301,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { NotifyProps: defaultNotifyProps, } member, nErr = ss.Channel().SaveMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -2417,7 +2417,7 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { member.SchemeAdmin = tc.SchemeAdmin member.ExplicitRoles = tc.ExplicitRoles member, nErr = ss.Channel().UpdateMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) assert.Equal(t, tc.ExpectedSchemeGuest, member.SchemeGuest) @@ -2430,16 +2430,16 @@ func testChannelUpdateMember(t *testing.T, ss store.Store) { func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) defaultNotifyProps := model.GetDefaultChannelNotifyProps() t.Run("any not valid channel member", func(t *testing.T) { m1 := &model.ChannelMember{ChannelId: "wrong", UserId: u1.Id, NotifyProps: defaultNotifyProps} m2 := &model.ChannelMember{ChannelId: model.NewId(), UserId: u2.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2}) - require.NotNil(t, nErr) + require.Error(t, nErr) var appErr *model.AppError require.True(t, errors.As(nErr, &appErr)) require.Equal(t, "model.channel_member.is_valid.channel_id.app_error", appErr.Id) @@ -2450,7 +2450,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { m1 := &model.ChannelMember{ChannelId: channelID1, UserId: u1.Id, NotifyProps: defaultNotifyProps} m2 := &model.ChannelMember{ChannelId: channelID1, UserId: u1.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2}) - require.NotNil(t, nErr) + require.Error(t, nErr) require.IsType(t, &store.ErrConflict{}, nErr) }) @@ -2463,7 +2463,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -2472,14 +2472,14 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() member := &model.ChannelMember{ChannelId: channel.Id, UserId: u1.Id, NotifyProps: defaultNotifyProps} otherMember := &model.ChannelMember{ChannelId: channel.Id, UserId: u2.Id, NotifyProps: defaultNotifyProps} var members []*model.ChannelMember members, nErr = ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().RemoveMember(channel.Id, u1.Id) defer ss.Channel().RemoveMember(channel.Id, u2.Id) require.Len(t, members, 2) @@ -2601,7 +2601,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { member.ExplicitRoles = tc.ExplicitRoles var members []*model.ChannelMember members, nErr = ss.Channel().UpdateMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] @@ -2622,7 +2622,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -2633,7 +2633,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel := &model.Channel{ DisplayName: "DisplayName", @@ -2642,14 +2642,14 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { TeamId: team.Id, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() member := &model.ChannelMember{ChannelId: channel.Id, UserId: u1.Id, NotifyProps: defaultNotifyProps} otherMember := &model.ChannelMember{ChannelId: channel.Id, UserId: u2.Id, NotifyProps: defaultNotifyProps} var members []*model.ChannelMember members, nErr = ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().RemoveMember(channel.Id, u1.Id) defer ss.Channel().RemoveMember(channel.Id, u2.Id) require.Len(t, members, 2) @@ -2771,7 +2771,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { member.ExplicitRoles = tc.ExplicitRoles var members []*model.ChannelMember members, nErr = ss.Channel().UpdateMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] @@ -2792,7 +2792,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } cs, nErr := ss.Scheme().Save(cs) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -2802,7 +2802,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ DisplayName: "DisplayName", @@ -2811,13 +2811,13 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { TeamId: team.Id, SchemeId: &cs.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDelete(channel.Id) }() member := &model.ChannelMember{ChannelId: channel.Id, UserId: u1.Id, NotifyProps: defaultNotifyProps} otherMember := &model.ChannelMember{ChannelId: channel.Id, UserId: u2.Id, NotifyProps: defaultNotifyProps} members, err := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, err) + require.NoError(t, err) defer ss.Channel().RemoveMember(channel.Id, u1.Id) defer ss.Channel().RemoveMember(channel.Id, u2.Id) require.Len(t, members, 2) @@ -2938,7 +2938,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { member.SchemeAdmin = tc.SchemeAdmin member.ExplicitRoles = tc.ExplicitRoles members, err := ss.Channel().UpdateMultipleMembers([]*model.ChannelMember{member, otherMember}) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, members, 2) member = members[0] @@ -2954,13 +2954,13 @@ func testChannelUpdateMultipleMembers(t *testing.T, ss store.Store) { func testChannelRemoveMember(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) channelID := model.NewId() defaultNotifyProps := model.GetDefaultChannelNotifyProps() m1 := &model.ChannelMember{ChannelId: channelID, UserId: u1.Id, NotifyProps: defaultNotifyProps} @@ -2968,46 +2968,46 @@ func testChannelRemoveMember(t *testing.T, ss store.Store) { m3 := &model.ChannelMember{ChannelId: channelID, UserId: u3.Id, NotifyProps: defaultNotifyProps} m4 := &model.ChannelMember{ChannelId: channelID, UserId: u4.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2, m3, m4}) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("remove member from not existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMember("not-existing-channel", u1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersCount int64 membersCount, nErr = ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int64(4), membersCount) }) t.Run("remove not existing member from an existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMember(channelID, model.NewId()) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersCount int64 membersCount, nErr = ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int64(4), membersCount) }) t.Run("remove existing member from an existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMember(channelID, u1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().SaveMember(m1) var membersCount int64 membersCount, nErr = ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int64(3), membersCount) }) } func testChannelRemoveMembers(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) channelID := model.NewId() defaultNotifyProps := model.GetDefaultChannelNotifyProps() m1 := &model.ChannelMember{ChannelId: channelID, UserId: u1.Id, NotifyProps: defaultNotifyProps} @@ -3015,41 +3015,41 @@ func testChannelRemoveMembers(t *testing.T, ss store.Store) { m3 := &model.ChannelMember{ChannelId: channelID, UserId: u3.Id, NotifyProps: defaultNotifyProps} m4 := &model.ChannelMember{ChannelId: channelID, UserId: u4.Id, NotifyProps: defaultNotifyProps} _, nErr := ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2, m3, m4}) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("remove members from not existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMembers("not-existing-channel", []string{u1.Id, u2.Id, u3.Id, u4.Id}) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersCount int64 membersCount, nErr = ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int64(4), membersCount) }) t.Run("remove not existing members from an existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMembers(channelID, []string{model.NewId(), model.NewId()}) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersCount int64 membersCount, nErr = ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int64(4), membersCount) }) t.Run("remove not existing and not existing members from an existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMembers(channelID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()}) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2}) var membersCount int64 membersCount, nErr = ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int64(2), membersCount) }) t.Run("remove existing members from an existing channel", func(t *testing.T) { nErr = ss.Channel().RemoveMembers(channelID, []string{u1.Id, u2.Id, u3.Id}) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().SaveMultipleMembers([]*model.ChannelMember{m1, m2, m3}) membersCount, err := ss.Channel().GetMemberCount(channelID, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(1), membersCount) }) } @@ -3061,7 +3061,7 @@ func testChannelDeleteMemberStore(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1t1, _ := ss.Channel().Get(c1.Id, false) assert.EqualValues(t, 0, c1t1.ExtraUpdateAt, "ExtraUpdateAt should be 0") @@ -3070,51 +3070,51 @@ func testChannelDeleteMemberStore(t *testing.T, ss store.Store) { u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := model.ChannelMember{} o1.ChannelId = c1.Id o1.UserId = u1.Id o1.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveMember(&o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.ChannelMember{} o2.ChannelId = c1.Id o2.UserId = u2.Id o2.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveMember(&o2) - require.Nil(t, nErr) + require.NoError(t, nErr) c1t2, _ := ss.Channel().Get(c1.Id, false) assert.EqualValues(t, 0, c1t2.ExtraUpdateAt, "ExtraUpdateAt should be 0") count, nErr := ss.Channel().GetMemberCount(o1.ChannelId, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 2, count, "should have saved 2 members") nErr = ss.Channel().PermanentDeleteMembersByUser(o2.UserId) - require.Nil(t, nErr) + require.NoError(t, nErr) count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 1, count, "should have removed 1 member") nErr = ss.Channel().PermanentDeleteMembersByChannel(o1.ChannelId) - require.Nil(t, nErr) + require.NoError(t, nErr) count, nErr = ss.Channel().GetMemberCount(o1.ChannelId, false) - require.Nil(t, nErr) + require.NoError(t, nErr) require.EqualValues(t, 0, count, "should have removed all members") } @@ -3126,7 +3126,7 @@ func testChannelStoreGetChannels(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = team @@ -3134,7 +3134,7 @@ func testChannelStoreGetChannels(t *testing.T, ss store.Store) { o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o3 := model.Channel{} o3.TeamId = team @@ -3142,60 +3142,60 @@ func testChannelStoreGetChannels(t *testing.T, ss store.Store) { o3.Name = "zz" + model.NewId() + "b" o3.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = o1.Id m2.UserId = model.NewId() m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) m3 := model.ChannelMember{} m3.ChannelId = o2.Id m3.UserId = m1.UserId m3.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m3) - require.Nil(t, err) + require.NoError(t, err) m4 := model.ChannelMember{} m4.ChannelId = o3.Id m4.UserId = m1.UserId m4.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m4) - require.Nil(t, err) + require.NoError(t, err) list, nErr := ss.Channel().GetChannels(o1.TeamId, m1.UserId, false, 0) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 3) require.Equal(t, o1.Id, (*list)[0].Id, "missing channel") require.Equal(t, o2.Id, (*list)[1].Id, "missing channel") require.Equal(t, o3.Id, (*list)[2].Id, "missing channel") ids, err := ss.Channel().GetAllChannelMembersForUser(m1.UserId, false, false) - require.Nil(t, err) + require.NoError(t, err) _, ok := ids[o1.Id] require.True(t, ok, "missing channel") ids2, err := ss.Channel().GetAllChannelMembersForUser(m1.UserId, true, false) - require.Nil(t, err) + require.NoError(t, err) _, ok = ids2[o1.Id] require.True(t, ok, "missing channel") ids3, err := ss.Channel().GetAllChannelMembersForUser(m1.UserId, true, false) - require.Nil(t, err) + require.NoError(t, err) _, ok = ids3[o1.Id] require.True(t, ok, "missing channel") ids4, err := ss.Channel().GetAllChannelMembersForUser(m1.UserId, true, true) - require.Nil(t, err) + require.NoError(t, err) _, ok = ids4[o1.Id] require.True(t, ok, "missing channel") @@ -3207,13 +3207,13 @@ func testChannelStoreGetChannels(t *testing.T, ss store.Store) { // should return 1 list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, false, 0) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 1) require.Equal(t, o1.Id, (*list)[0].Id, "missing channel") // Should return all list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, true, 0) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 3) require.Equal(t, o1.Id, (*list)[0].Id, "missing channel") require.Equal(t, o2.Id, (*list)[1].Id, "missing channel") @@ -3221,7 +3221,7 @@ func testChannelStoreGetChannels(t *testing.T, ss store.Store) { // Should still return all list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, true, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 3) require.Equal(t, o1.Id, (*list)[0].Id, "missing channel") require.Equal(t, o2.Id, (*list)[1].Id, "missing channel") @@ -3229,7 +3229,7 @@ func testChannelStoreGetChannels(t *testing.T, ss store.Store) { // Should return 2 list, nErr = ss.Channel().GetChannels(o1.TeamId, m1.UserId, true, 20) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, *list, 2) require.Equal(t, o1.Id, (*list)[0].Id, "missing channel") require.Equal(t, o3.Id, (*list)[1].Id, "missing channel") @@ -3265,7 +3265,7 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) t2 := model.Team{} t2.DisplayName = "Name2" @@ -3273,7 +3273,7 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { t2.Email = MakeEmail() t2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&t2) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{} c1.TeamId = t1.Id @@ -3281,7 +3281,7 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) group := &model.Group{ Name: model.NewString(model.NewId()), @@ -3290,10 +3290,10 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { RemoteId: model.NewId(), } _, err = ss.Group().Create(group) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group.Id, c1.Id, true)) - require.Nil(t, err) + require.NoError(t, err) c2 := model.Channel{} c2.TeamId = t1.Id @@ -3301,11 +3301,11 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { c2.Name = "zz" + model.NewId() + "b" c2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2.DeleteAt = model.GetMillis() c2.UpdateAt = c2.DeleteAt nErr = ss.Channel().Delete(c2.Id, c2.DeleteAt) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") c3 := model.Channel{} c3.TeamId = t2.Id @@ -3313,12 +3313,12 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { c3.Name = "zz" + model.NewId() + "b" c3.Type = model.CHANNEL_PRIVATE _, nErr = ss.Channel().Save(&c3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := model.User{Id: model.NewId()} u2 := model.User{Id: model.NewId()} _, nErr = ss.Channel().CreateDirectChannel(&u1, &u2) - require.Nil(t, nErr) + require.NoError(t, nErr) userIds := []string{model.NewId(), model.NewId(), model.NewId()} @@ -3328,10 +3328,10 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { c5.Name = "zz" + model.NewId() + "b" c5.Type = model.CHANNEL_GROUP _, nErr = ss.Channel().Save(&c5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) list, nErr := ss.Channel().GetAllChannels(0, 10, store.ChannelSearchOpts{}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *list, 2) assert.Equal(t, c1.Id, (*list)[0].Id) assert.Equal(t, "Name", (*list)[0].TeamDisplayName) @@ -3339,10 +3339,10 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { assert.Equal(t, "Name2", (*list)[1].TeamDisplayName) count1, nErr := ss.Channel().GetAllChannelsCount(store.ChannelSearchOpts{}) - require.Nil(t, nErr) + require.NoError(t, nErr) list, nErr = ss.Channel().GetAllChannels(0, 10, store.ChannelSearchOpts{IncludeDeleted: true}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *list, 3) assert.Equal(t, c1.Id, (*list)[0].Id) assert.Equal(t, "Name", (*list)[0].TeamDisplayName) @@ -3350,25 +3350,25 @@ func testChannelStoreGetAllChannels(t *testing.T, ss store.Store, s SqlStore) { assert.Equal(t, c3.Id, (*list)[2].Id) count2, nErr := ss.Channel().GetAllChannelsCount(store.ChannelSearchOpts{IncludeDeleted: true}) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, func() bool { return count2 > count1 }()) list, nErr = ss.Channel().GetAllChannels(0, 1, store.ChannelSearchOpts{IncludeDeleted: true}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *list, 1) assert.Equal(t, c1.Id, (*list)[0].Id) assert.Equal(t, "Name", (*list)[0].TeamDisplayName) // Not associated to group list, nErr = ss.Channel().GetAllChannels(0, 10, store.ChannelSearchOpts{NotAssociatedToGroup: group.Id}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *list, 1) // Exclude channel names list, nErr = ss.Channel().GetAllChannels(0, 10, store.ChannelSearchOpts{ExcludeChannelNames: []string{c1.Name}}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *list, 1) // Manually truncate Channels table until testlib can handle cleanups @@ -3390,21 +3390,21 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: o1.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: o1.Id, UserId: otherUserId1, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // o2 is a channel on the other team to which the user belongs o2 := model.Channel{ @@ -3414,14 +3414,14 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: o2.Id, UserId: otherUserId2, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // o3 is a channel on the team to which the user does not belong, and thus should show up // in "more channels" @@ -3432,7 +3432,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o4 is a private channel on the team to which the user does not belong o4 := model.Channel{ @@ -3442,7 +3442,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o5 is another private channel on the team to which the user does belong o5 := model.Channel{ @@ -3452,18 +3452,18 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: o5.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) t.Run("only o3 listed in more channels", func(t *testing.T) { list, channelErr := ss.Channel().GetMoreChannels(teamId, userId, 0, 100) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o3}, list) }) @@ -3476,7 +3476,7 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o6, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o7 is another channel on the team to which the user does not belong, but is deleted, // and thus would not start showing up in "more channels" @@ -3487,38 +3487,38 @@ func testChannelStoreGetMoreChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o7, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().Delete(o7.Id, model.GetMillis()) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") t.Run("both o3 and o6 listed in more channels", func(t *testing.T) { list, err := ss.Channel().GetMoreChannels(teamId, userId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o3, &o6}, list) }) t.Run("only o3 listed in more channels with offset 0, limit 1", func(t *testing.T) { list, err := ss.Channel().GetMoreChannels(teamId, userId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o3}, list) }) t.Run("only o6 listed in more channels with offset 1, limit 1", func(t *testing.T) { list, err := ss.Channel().GetMoreChannels(teamId, userId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o6}, list) }) t.Run("verify analytics for open channels", func(t *testing.T) { count, err := ss.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, 4, count) }) t.Run("verify analytics for private channels", func(t *testing.T) { count, err := ss.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, 2, count) }) } @@ -3534,7 +3534,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr := ss.Channel().Save(&p1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // p2 is a private channel on another team p2 := model.Channel{ @@ -3544,7 +3544,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&p2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o1 is a public channel on the team o1 := model.Channel{ @@ -3554,11 +3554,11 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("only p1 initially listed in private channels", func(t *testing.T) { list, channelErr := ss.Channel().GetPrivateChannelsForTeam(teamId, 0, 100) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&p1}, list) }) @@ -3570,7 +3570,7 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&p3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // p4 is another private, but deleted channel on the team p4 := model.Channel{ @@ -3580,37 +3580,37 @@ func testChannelStoreGetPrivateChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&p4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err := ss.Channel().Delete(p4.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") t.Run("both p1 and p3 listed in private channels", func(t *testing.T) { list, err := ss.Channel().GetPrivateChannelsForTeam(teamId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&p1, &p3}, list) }) t.Run("only p1 listed in private channels with offset 0, limit 1", func(t *testing.T) { list, err := ss.Channel().GetPrivateChannelsForTeam(teamId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&p1}, list) }) t.Run("only p3 listed in private channels with offset 1, limit 1", func(t *testing.T) { list, err := ss.Channel().GetPrivateChannelsForTeam(teamId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&p3}, list) }) t.Run("verify analytics for private channels", func(t *testing.T) { count, err := ss.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, 3, count) }) t.Run("verify analytics for open open channels", func(t *testing.T) { count, err := ss.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, 1, count) }) } @@ -3626,7 +3626,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o2 is a public channel on another team o2 := model.Channel{ @@ -3636,7 +3636,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o3 is a private channel on the team o3 := model.Channel{ @@ -3646,11 +3646,11 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("only o1 initially listed in public channels", func(t *testing.T) { list, channelErr := ss.Channel().GetPublicChannelsForTeam(teamId, 0, 100) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o1}, list) }) @@ -3662,7 +3662,7 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o5 is another public, but deleted channel on the team o5 := model.Channel{ @@ -3672,37 +3672,37 @@ func testChannelStoreGetPublicChannelsForTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err := ss.Channel().Delete(o5.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") t.Run("both o1 and o4 listed in public channels", func(t *testing.T) { list, err := ss.Channel().GetPublicChannelsForTeam(teamId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o1, &o4}, list) }) t.Run("only o1 listed in public channels with offset 0, limit 1", func(t *testing.T) { list, err := ss.Channel().GetPublicChannelsForTeam(teamId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o1}, list) }) t.Run("only o4 listed in public channels with offset 1, limit 1", func(t *testing.T) { list, err := ss.Channel().GetPublicChannelsForTeam(teamId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o4}, list) }) t.Run("verify analytics for open channels", func(t *testing.T) { count, err := ss.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_OPEN) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, 3, count) }) t.Run("verify analytics for private channels", func(t *testing.T) { count, err := ss.Channel().AnalyticsTypeCount(teamId, model.CHANNEL_PRIVATE) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, 1, count) }) } @@ -3718,7 +3718,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, ss store.Store) Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&oc1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // oc2 is a public channel on another team oc2 := model.Channel{ @@ -3728,7 +3728,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, ss store.Store) Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&oc2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // pc3 is a private channel on the team pc3 := model.Channel{ @@ -3738,17 +3738,17 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, ss store.Store) Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&pc3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("oc1 by itself should be found as a public channel in the team", func(t *testing.T) { list, channelErr := ss.Channel().GetPublicChannelsByIdsForTeam(teamId, []string{oc1.Id}) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&oc1}, list) }) t.Run("only oc1, among others, should be found as a public channel in the team", func(t *testing.T) { list, channelErr := ss.Channel().GetPublicChannelsByIdsForTeam(teamId, []string{oc1.Id, oc2.Id, model.NewId(), pc3.Id}) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&oc1}, list) }) @@ -3760,7 +3760,7 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, ss store.Store) Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&oc4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // oc4 is another public, but deleted channel on the team oc5 := model.Channel{ @@ -3770,20 +3770,20 @@ func testChannelStoreGetPublicChannelsByIdsForTeam(t *testing.T, ss store.Store) Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&oc5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err := ss.Channel().Delete(oc5.Id, model.GetMillis()) - require.Nil(t, err, "channel should have been deleted") + require.NoError(t, err, "channel should have been deleted") t.Run("only oc1 and oc4, among others, should be found as a public channel in the team", func(t *testing.T) { list, err := ss.Channel().GetPublicChannelsByIdsForTeam(teamId, []string{oc1.Id, oc2.Id, model.NewId(), pc3.Id, oc4.Id}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&oc1, &oc4}, list) }) t.Run("random channel id should not be found as a public channel in the team", func(t *testing.T) { _, err := ss.Channel().GetPublicChannelsByIdsForTeam(teamId, []string{model.NewId()}) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) @@ -3796,7 +3796,7 @@ func testChannelStoreGetChannelCounts(t *testing.T, ss store.Store) { o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := model.Channel{} o1.TeamId = model.NewId() @@ -3804,28 +3804,28 @@ func testChannelStoreGetChannelCounts(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = o1.Id m2.UserId = model.NewId() m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) m3 := model.ChannelMember{} m3.ChannelId = o2.Id m3.UserId = model.NewId() m3.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m3) - require.Nil(t, err) + require.NoError(t, err) counts, _ := ss.Channel().GetChannelCounts(o1.TeamId, m1.UserId) @@ -3840,7 +3840,7 @@ func testChannelStoreGetMembersForUser(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) o1 := model.Channel{} o1.TeamId = t1.Id @@ -3848,7 +3848,7 @@ func testChannelStoreGetMembersForUser(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = o1.TeamId @@ -3856,26 +3856,26 @@ func testChannelStoreGetMembersForUser(t *testing.T, ss store.Store) { o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = o2.Id m2.UserId = m1.UserId m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) t.Run("with channels", func(t *testing.T) { var members *model.ChannelMembers members, err = ss.Channel().GetMembersForUser(o1.TeamId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, *members, 2) }) @@ -3887,16 +3887,16 @@ func testChannelStoreGetMembersForUser(t *testing.T, ss store.Store) { u3 := model.User{Id: model.NewId()} u4 := model.User{Id: model.NewId()} _, nErr = ss.Channel().CreateDirectChannel(&u1, &user) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().CreateDirectChannel(&u2, &user) - require.Nil(t, nErr) + require.NoError(t, nErr) // other user direct message _, nErr = ss.Channel().CreateDirectChannel(&u3, &u4) - require.Nil(t, nErr) + require.NoError(t, nErr) var members *model.ChannelMembers members, err = ss.Channel().GetMembersForUser(o1.TeamId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, *members, 4) }) @@ -3910,7 +3910,7 @@ func testChannelStoreGetMembersForUser(t *testing.T, ss store.Store) { } var channel *model.Channel channel, nErr = ss.Channel().Save(group, 10000) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, userId := range userIds { cm := &model.ChannelMember{ UserId: userId, @@ -3920,11 +3920,11 @@ func testChannelStoreGetMembersForUser(t *testing.T, ss store.Store) { } _, err = ss.Channel().SaveMember(cm) - require.Nil(t, err) + require.NoError(t, err) } var members *model.ChannelMembers members, err = ss.Channel().GetMembersForUser(o1.TeamId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, *members, 5) }) @@ -3937,7 +3937,7 @@ func testChannelStoreGetMembersForUserWithPagination(t *testing.T, ss store.Stor t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) o1 := model.Channel{} o1.TeamId = t1.Id @@ -3945,7 +3945,7 @@ func testChannelStoreGetMembersForUserWithPagination(t *testing.T, ss store.Stor o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = o1.TeamId @@ -3953,28 +3953,28 @@ func testChannelStoreGetMembersForUserWithPagination(t *testing.T, ss store.Stor o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = o2.Id m2.UserId = m1.UserId m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) members, err := ss.Channel().GetMembersForUserWithPagination(o1.TeamId, m1.UserId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, *members, 1) members, err = ss.Channel().GetMembersForUserWithPagination(o1.TeamId, m1.UserId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, *members, 1) } @@ -3990,36 +3990,36 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { ChannelId: channelId, CreateAt: 1000, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId1, ChannelId: channelId, CreateAt: 1001, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId2, ChannelId: channelId, CreateAt: 1002, }) - require.Nil(t, err) + require.NoError(t, err) count, err := ss.Channel().CountPostsAfter(channelId, p1.CreateAt-1, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 3, count) count, err = ss.Channel().CountPostsAfter(channelId, p1.CreateAt, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, count) count, err = ss.Channel().CountPostsAfter(channelId, p1.CreateAt-1, userId1) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, count) count, err = ss.Channel().CountPostsAfter(channelId, p1.CreateAt, userId1) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, count) }) @@ -4033,7 +4033,7 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { ChannelId: channelId, CreateAt: 1000, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId1, @@ -4041,14 +4041,14 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { CreateAt: 1001, DeleteAt: 1001, }) - require.Nil(t, err) + require.NoError(t, err) count, err := ss.Channel().CountPostsAfter(channelId, p1.CreateAt-1, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, count) count, err = ss.Channel().CountPostsAfter(channelId, p1.CreateAt, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, count) }) @@ -4062,7 +4062,7 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { ChannelId: channelId, CreateAt: 1000, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId1, @@ -4070,7 +4070,7 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { CreateAt: 1001, Type: model.POST_JOIN_CHANNEL, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId1, @@ -4078,7 +4078,7 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { CreateAt: 1002, Type: model.POST_REMOVE_FROM_CHANNEL, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId1, @@ -4086,7 +4086,7 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { CreateAt: 1003, Type: model.POST_LEAVE_TEAM, }) - require.Nil(t, err) + require.NoError(t, err) p5, err := ss.Post().Save(&model.Post{ UserId: userId1, @@ -4094,7 +4094,7 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { CreateAt: 1004, Type: model.POST_HEADER_CHANGE, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: userId1, @@ -4102,22 +4102,22 @@ func testCountPostsAfter(t *testing.T, ss store.Store) { CreateAt: 1005, Type: "custom_nps_survey", }) - require.Nil(t, err) + require.NoError(t, err) count, err := ss.Channel().CountPostsAfter(channelId, p1.CreateAt-1, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 3, count) count, err = ss.Channel().CountPostsAfter(channelId, p1.CreateAt, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, count) count, err = ss.Channel().CountPostsAfter(channelId, p5.CreateAt-1, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, count) count, err = ss.Channel().CountPostsAfter(channelId, p5.CreateAt, "") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, count) }) } @@ -4131,14 +4131,14 @@ func testChannelStoreUpdateLastViewedAt(t *testing.T, ss store.Store) { o1.TotalMsgCount = 25 o1.LastPostAt = 12345 _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -4148,38 +4148,38 @@ func testChannelStoreUpdateLastViewedAt(t *testing.T, ss store.Store) { o2.TotalMsgCount = 26 o2.LastPostAt = 123456 _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m2 := model.ChannelMember{} m2.ChannelId = o2.Id m2.UserId = m1.UserId m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) var times map[string]int64 times, err = ss.Channel().UpdateLastViewedAt([]string{m1.ChannelId}, m1.UserId, false) - require.Nil(t, err, "failed to update ", err) + require.NoError(t, err, "failed to update ", err) require.Equal(t, o1.LastPostAt, times[o1.Id], "last viewed at time incorrect") times, err = ss.Channel().UpdateLastViewedAt([]string{m1.ChannelId, m2.ChannelId}, m1.UserId, false) - require.Nil(t, err, "failed to update ", err) + require.NoError(t, err, "failed to update ", err) require.Equal(t, o2.LastPostAt, times[o2.Id], "last viewed at time incorrect") rm1, err := ss.Channel().GetMember(m1.ChannelId, m1.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, o1.LastPostAt, rm1.LastViewedAt) assert.Equal(t, o1.LastPostAt, rm1.LastUpdateAt) assert.Equal(t, o1.TotalMsgCount, rm1.MsgCount) rm2, err := ss.Channel().GetMember(m2.ChannelId, m2.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, o2.LastPostAt, rm2.LastViewedAt) assert.Equal(t, o2.LastPostAt, rm2.LastUpdateAt) assert.Equal(t, o2.TotalMsgCount, rm2.MsgCount) _, err = ss.Channel().UpdateLastViewedAt([]string{m1.ChannelId}, "missing id", false) - require.Nil(t, err, "failed to update") + require.NoError(t, err, "failed to update") } func testChannelStoreIncrementMentionCount(t *testing.T, ss store.Store) { @@ -4190,26 +4190,26 @@ func testChannelStoreIncrementMentionCount(t *testing.T, ss store.Store) { o1.Type = model.CHANNEL_OPEN o1.TotalMsgCount = 25 _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id m1.UserId = model.NewId() m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) err = ss.Channel().IncrementMentionCount(m1.ChannelId, m1.UserId, false) - require.Nil(t, err, "failed to update") + require.NoError(t, err, "failed to update") err = ss.Channel().IncrementMentionCount(m1.ChannelId, "missing id", false) - require.Nil(t, err, "failed to update") + require.NoError(t, err, "failed to update") err = ss.Channel().IncrementMentionCount("missing id", m1.UserId, false) - require.Nil(t, err, "failed to update") + require.NoError(t, err, "failed to update") err = ss.Channel().IncrementMentionCount("missing id", "missing id", false) - require.Nil(t, err, "failed to update") + require.NoError(t, err, "failed to update") } func testUpdateChannelMember(t *testing.T, ss store.Store) { @@ -4222,7 +4222,7 @@ func testUpdateChannelMember(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := &model.ChannelMember{ ChannelId: c1.Id, @@ -4230,15 +4230,15 @@ func testUpdateChannelMember(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err := ss.Channel().SaveMember(m1) - require.Nil(t, err) + require.NoError(t, err) m1.NotifyProps["test"] = "sometext" _, err = ss.Channel().UpdateMember(m1) - require.Nil(t, err, err) + require.NoError(t, err, err) m1.UserId = "" _, err = ss.Channel().UpdateMember(m1) - require.NotNil(t, err, "bad user id - should fail") + require.Error(t, err, "bad user id - should fail") } func testGetMember(t *testing.T, ss store.Store) { @@ -4251,7 +4251,7 @@ func testGetMember(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2 := &model.Channel{ TeamId: c1.TeamId, @@ -4260,7 +4260,7 @@ func testGetMember(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := &model.ChannelMember{ ChannelId: c1.Id, @@ -4268,7 +4268,7 @@ func testGetMember(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err := ss.Channel().SaveMember(m1) - require.Nil(t, err) + require.NoError(t, err) m2 := &model.ChannelMember{ ChannelId: c2.Id, @@ -4276,30 +4276,30 @@ func testGetMember(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(m2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().GetMember(model.NewId(), userId) - require.NotNil(t, err, "should've failed to get member for non-existent channel") + require.Error(t, err, "should've failed to get member for non-existent channel") _, err = ss.Channel().GetMember(c1.Id, model.NewId()) - require.NotNil(t, err, "should've failed to get member for non-existent user") + require.Error(t, err, "should've failed to get member for non-existent user") member, err := ss.Channel().GetMember(c1.Id, userId) - require.Nil(t, err, "shouldn't have errored when getting member", err) + require.NoError(t, err, "shouldn't have errored when getting member", err) require.Equal(t, c1.Id, member.ChannelId, "should've gotten member of channel 1") require.Equal(t, userId, member.UserId, "should've have gotten member for user") member, err = ss.Channel().GetMember(c2.Id, userId) - require.Nil(t, err, "should'nt have errored when getting member", err) + require.NoError(t, err, "should'nt have errored when getting member", err) require.Equal(t, c2.Id, member.ChannelId, "should've gotten member of channel 2") require.Equal(t, userId, member.UserId, "should've gotten member for user") props, err := ss.Channel().GetAllChannelMembersNotifyPropsForChannel(c2.Id, false) - require.Nil(t, err, err) + require.NoError(t, err, err) require.NotEqual(t, 0, len(props), "should not be empty") props, err = ss.Channel().GetAllChannelMembersNotifyPropsForChannel(c2.Id, true) - require.Nil(t, err, err) + require.NoError(t, err, err) require.NotEqual(t, 0, len(props), "should not be empty") ss.Channel().InvalidateCacheForChannelMembersNotifyProps(c2.Id) @@ -4314,28 +4314,28 @@ func testChannelStoreGetMemberForPost(t *testing.T, ss store.Store) { } o1, nErr := ss.Channel().Save(ch, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1, err := ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: o1.Id, UserId: model.NewId(), NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) p1, nErr := ss.Post().Save(&model.Post{ UserId: model.NewId(), ChannelId: o1.Id, Message: "test", }) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, err := ss.Channel().GetMemberForPost(p1.Id, m1.UserId) - require.Nil(t, err, err) + require.NoError(t, err, err) require.Equal(t, m1.ToJson(), r1.ToJson(), "invalid returned channel member") _, err = ss.Channel().GetMemberForPost(p1.Id, model.NewId()) - require.NotNil(t, err, "shouldn't have returned a member") + require.Error(t, err, "shouldn't have returned a member") } func testGetMemberCount(t *testing.T, ss store.Store) { @@ -4348,7 +4348,7 @@ func testGetMemberCount(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2 := model.Channel{ TeamId: teamId, @@ -4357,16 +4357,16 @@ func testGetMemberCount(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := &model.User{ Email: MakeEmail(), DeleteAt: 0, } _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -4374,10 +4374,10 @@ func testGetMemberCount(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m1) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr := ss.Channel().GetMemberCount(c1.Id, false) - require.Nilf(t, channelErr, "failed to get member count: %v", channelErr) + require.NoError(t, channelErr, "failed to get member count", channelErr) require.EqualValuesf(t, 1, count, "got incorrect member count %v", count) u2 := model.User{ @@ -4385,9 +4385,9 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 0, } _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m2 := model.ChannelMember{ ChannelId: c1.Id, @@ -4395,10 +4395,10 @@ func testGetMemberCount(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m2) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr = ss.Channel().GetMemberCount(c1.Id, false) - require.Nilf(t, channelErr, "failed to get member count: %v", channelErr) + require.NoErrorf(t, channelErr, "failed to get member count: %v", channelErr) require.EqualValuesf(t, 2, count, "got incorrect member count %v", count) // make sure members of other channels aren't counted @@ -4407,9 +4407,9 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 0, } _, err = ss.User().Save(&u3) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m3 := model.ChannelMember{ ChannelId: c2.Id, @@ -4417,10 +4417,10 @@ func testGetMemberCount(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m3) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr = ss.Channel().GetMemberCount(c1.Id, false) - require.Nilf(t, channelErr, "failed to get member count: %v", channelErr) + require.NoErrorf(t, channelErr, "failed to get member count: %v", channelErr) require.EqualValuesf(t, 2, count, "got incorrect member count %v", count) // make sure inactive users aren't counted @@ -4429,9 +4429,9 @@ func testGetMemberCount(t *testing.T, ss store.Store) { DeleteAt: 10000, } _, err = ss.User().Save(u4) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m4 := model.ChannelMember{ ChannelId: c1.Id, @@ -4439,10 +4439,10 @@ func testGetMemberCount(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m4) - require.Nil(t, nErr) + require.NoError(t, nErr) count, nErr = ss.Channel().GetMemberCount(c1.Id, false) - require.Nilf(t, nErr, "failed to get member count: %v", nErr) + require.NoError(t, nErr, "failed to get member count", nErr) require.EqualValuesf(t, 2, count, "got incorrect member count %v", count) } @@ -4456,7 +4456,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } _, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{ TeamId: teamId, @@ -4465,7 +4465,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := &model.User{ Timezone: timezones.DefaultUserTimezone(), @@ -4473,9 +4473,9 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { DeleteAt: 0, } _, nErr = ss.User().Save(u1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -4483,17 +4483,17 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("empty slice for channel with no groups", func(t *testing.T) { memberCounts, nErr = ss.Channel().GetMemberCountsByGroup(c1.Id, false) expectedMemberCounts := []*model.ChannelMemberCountByGroup{} - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, expectedMemberCounts, memberCounts) }) _, err = ss.Group().UpsertMember(g1.Id, u1.Id) - require.Nil(t, err) + require.NoError(t, err) t.Run("returns memberCountsByGroup without timezones", func(t *testing.T) { memberCounts, nErr = ss.Channel().GetMemberCountsByGroup(c1.Id, false) @@ -4504,7 +4504,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { ChannelMemberTimezonesCount: 0, }, } - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, expectedMemberCounts, memberCounts) }) @@ -4517,7 +4517,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { ChannelMemberTimezonesCount: 0, }, } - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, expectedMemberCounts, memberCounts) }) @@ -4528,7 +4528,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } _, err = ss.Group().Create(g2) - require.Nil(t, err) + require.NoError(t, err) // create 5 different users with 2 different timezones for group 2 for i := 1; i <= 5; i++ { @@ -4544,9 +4544,9 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { DeleteAt: 0, } _, nErr = ss.User().Save(u) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m := model.ChannelMember{ ChannelId: c1.Id, @@ -4554,10 +4554,10 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(g2.Id, u.Id) - require.Nil(t, err) + require.NoError(t, err) } g3 := &model.Group{ @@ -4568,7 +4568,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { } _, err = ss.Group().Create(g3) - require.Nil(t, err) + require.NoError(t, err) // create 10 different users with 3 different timezones for group 3 for i := 1; i <= 10; i++ { @@ -4595,9 +4595,9 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { DeleteAt: 0, } _, nErr = ss.User().Save(u) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m := model.ChannelMember{ ChannelId: c1.Id, @@ -4605,10 +4605,10 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, nErr = ss.Channel().SaveMember(&m) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(g3.Id, u.Id) - require.Nil(t, err) + require.NoError(t, err) } t.Run("returns memberCountsByGroup for multiple groups with lots of users without timezones", func(t *testing.T) { @@ -4630,7 +4630,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { ChannelMemberTimezonesCount: 0, }, } - require.Nil(t, nErr) + require.NoError(t, nErr) require.ElementsMatch(t, expectedMemberCounts, memberCounts) }) @@ -4653,7 +4653,7 @@ func testGetMemberCountsByGroup(t *testing.T, ss store.Store) { ChannelMemberTimezonesCount: 3, }, } - require.Nil(t, nErr) + require.NoError(t, nErr) require.ElementsMatch(t, expectedMemberCounts, memberCounts) }) } @@ -4668,7 +4668,7 @@ func testGetGuestCount(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2 := model.Channel{ TeamId: teamId, @@ -4677,7 +4677,7 @@ func testGetGuestCount(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("Regular member doesn't count", func(t *testing.T) { u1 := &model.User{ @@ -4686,9 +4686,9 @@ func testGetGuestCount(t *testing.T, ss store.Store) { Roles: model.SYSTEM_USER_ROLE_ID, } _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{ ChannelId: c1.Id, @@ -4697,10 +4697,10 @@ func testGetGuestCount(t *testing.T, ss store.Store) { SchemeGuest: false, } _, nErr = ss.Channel().SaveMember(&m1) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr := ss.Channel().GetGuestCount(c1.Id, false) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, int64(0), count) }) @@ -4711,9 +4711,9 @@ func testGetGuestCount(t *testing.T, ss store.Store) { Roles: model.SYSTEM_GUEST_ROLE_ID, } _, err := ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m2 := model.ChannelMember{ ChannelId: c1.Id, @@ -4722,10 +4722,10 @@ func testGetGuestCount(t *testing.T, ss store.Store) { SchemeGuest: true, } _, nErr = ss.Channel().SaveMember(&m2) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr := ss.Channel().GetGuestCount(c1.Id, false) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, int64(1), count) }) @@ -4736,9 +4736,9 @@ func testGetGuestCount(t *testing.T, ss store.Store) { Roles: model.SYSTEM_GUEST_ROLE_ID, } _, err := ss.User().Save(&u3) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m3 := model.ChannelMember{ ChannelId: c2.Id, @@ -4747,10 +4747,10 @@ func testGetGuestCount(t *testing.T, ss store.Store) { SchemeGuest: true, } _, nErr = ss.Channel().SaveMember(&m3) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr := ss.Channel().GetGuestCount(c1.Id, false) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, int64(1), count) }) @@ -4761,9 +4761,9 @@ func testGetGuestCount(t *testing.T, ss store.Store) { Roles: model.SYSTEM_GUEST_ROLE_ID, } _, err := ss.User().Save(u4) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m4 := model.ChannelMember{ ChannelId: c1.Id, @@ -4772,10 +4772,10 @@ func testGetGuestCount(t *testing.T, ss store.Store) { SchemeGuest: true, } _, nErr = ss.Channel().SaveMember(&m4) - require.Nil(t, nErr) + require.NoError(t, nErr) count, channelErr := ss.Channel().GetGuestCount(c1.Id, false) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, int64(1), count) }) } @@ -4791,7 +4791,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{ ChannelId: o1.Id, @@ -4799,7 +4799,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{ ChannelId: o1.Id, @@ -4807,7 +4807,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Channel{ TeamId: otherTeamId, @@ -4816,7 +4816,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m3 := model.ChannelMember{ ChannelId: o2.Id, @@ -4824,7 +4824,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m3) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Channel{ TeamId: teamId, @@ -4833,7 +4833,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o4 := model.Channel{ TeamId: teamId, @@ -4842,7 +4842,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o5 := model.Channel{ TeamId: teamId, @@ -4851,7 +4851,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o6 := model.Channel{ TeamId: teamId, @@ -4860,7 +4860,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o6, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o7 := model.Channel{ TeamId: teamId, @@ -4869,7 +4869,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o7, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o8 := model.Channel{ TeamId: teamId, @@ -4878,7 +4878,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o8, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o9 := model.Channel{ TeamId: teamId, @@ -4888,7 +4888,7 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o9, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o10 := model.Channel{ TeamId: teamId, @@ -4897,40 +4897,40 @@ func testChannelStoreSearchMore(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o10, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o10.DeleteAt = model.GetMillis() o10.UpdateAt = o10.DeleteAt nErr = ss.Channel().Delete(o10.Id, o10.DeleteAt) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") t.Run("three public channels matching 'ChannelA', but already a member of one and one deleted", func(t *testing.T) { channels, err := ss.Channel().SearchMore(m1.UserId, teamId, "ChannelA") - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o3}, channels) }) t.Run("one public channels, but already a member", func(t *testing.T) { channels, err := ss.Channel().SearchMore(m1.UserId, teamId, o4.Name) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{}, channels) }) t.Run("three matching channels, but only two public", func(t *testing.T) { channels, err := ss.Channel().SearchMore(m1.UserId, teamId, "off-") - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o7, &o6}, channels) }) t.Run("one channel matching 'off-topic'", func(t *testing.T) { channels, err := ss.Channel().SearchMore(m1.UserId, teamId, "off-topic") - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o6}, channels) }) t.Run("search purpose", func(t *testing.T) { channels, err := ss.Channel().SearchMore(m1.UserId, teamId, "now searchable") - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o9}, channels) }) } @@ -4955,7 +4955,7 @@ func testChannelStoreSearchArchivedInTeam(t *testing.T, ss store.Store, s SqlSto t.Run("empty result", func(t *testing.T) { list, err := ss.Channel().SearchArchivedInTeam(teamId, "term", userId) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, list) require.Empty(t, list) }) @@ -4966,7 +4966,7 @@ func testChannelStoreSearchArchivedInTeam(t *testing.T, ss store.Store, s SqlSto defer s.GetMaster().Exec("ALTER TABLE Channels_renamed RENAME TO Channels") list, err := ss.Channel().SearchArchivedInTeam(teamId, "term", userId) - require.NotNil(t, err) + require.Error(t, err) require.Nil(t, list) }) } @@ -4982,7 +4982,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{ TeamId: otherTeamId, @@ -4991,7 +4991,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{ ChannelId: o1.Id, @@ -4999,7 +4999,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err := ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{ ChannelId: o1.Id, @@ -5007,7 +5007,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) m3 := model.ChannelMember{ ChannelId: o2.Id, @@ -5015,7 +5015,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m3) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Channel{ TeamId: teamId, @@ -5024,7 +5024,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o4 := model.Channel{ TeamId: teamId, @@ -5033,7 +5033,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o5 := model.Channel{ TeamId: teamId, @@ -5042,7 +5042,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o6 := model.Channel{ TeamId: teamId, @@ -5051,7 +5051,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o6, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o7 := model.Channel{ TeamId: teamId, @@ -5060,7 +5060,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o7, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o8 := model.Channel{ TeamId: teamId, @@ -5069,7 +5069,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o8, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o9 := model.Channel{ TeamId: teamId, @@ -5078,7 +5078,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o9, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o10 := model.Channel{ TeamId: teamId, @@ -5087,7 +5087,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o10, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o11 := model.Channel{ TeamId: teamId, @@ -5096,7 +5096,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o11, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o12 := model.Channel{ TeamId: teamId, @@ -5106,7 +5106,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o12, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o13 := model.Channel{ TeamId: teamId, @@ -5115,11 +5115,11 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o13, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o13.DeleteAt = model.GetMillis() o13.UpdateAt = o13.DeleteAt nErr = ss.Channel().Delete(o13.Id, o13.DeleteAt) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") testCases := []struct { Description string @@ -5149,7 +5149,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) { for _, testCase := range testCases { t.Run(name+"/"+testCase.Description, func(t *testing.T) { channels, err := search(testCase.TeamId, testCase.Term, testCase.IncludeDeleted) - require.Nil(t, err) + require.NoError(t, err) // AutoCompleteInTeam doesn't currently sort its output results. if name == "AutocompleteInTeam" { @@ -5175,7 +5175,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{ TeamId: teamId, @@ -5184,7 +5184,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o3 := model.Channel{ TeamId: teamId, @@ -5193,7 +5193,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o4 := model.Channel{ TeamId: teamId, @@ -5202,7 +5202,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o5 := model.Channel{ TeamId: otherTeamId, @@ -5211,7 +5211,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // add the user to the first 3 channels and the other team channel for _, c := range []model.Channel{o1, o2, o3, o5} { @@ -5220,12 +5220,12 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) } searchAndCheck := func(t *testing.T, term string, includeDeleted bool, expectedDisplayNames []string) { res, searchErr := ss.Channel().SearchForUserInTeam(userId, teamId, term, includeDeleted) - require.Nil(t, searchErr) + require.NoError(t, searchErr) require.Len(t, *res, len(expectedDisplayNames)) resultDisplayNames := []string{} @@ -5249,7 +5249,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) searchAndCheck(t, "dev", false, []string{o1.DisplayName, o2.DisplayName, o3.DisplayName, o4.DisplayName}) }) @@ -5258,7 +5258,7 @@ func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) { o1.DeleteAt = model.GetMillis() o1.UpdateAt = o1.DeleteAt err := ss.Channel().Delete(o1.Id, o1.DeleteAt) - require.Nil(t, err) + require.NoError(t, err) searchAndCheck(t, "dev", false, []string{o2.DisplayName, o3.DisplayName, o4.DisplayName}) }) @@ -5277,7 +5277,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) t2 := model.Team{} t2.DisplayName = "Name2" @@ -5285,7 +5285,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { t2.Email = MakeEmail() t2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&t2) - require.Nil(t, err) + require.NoError(t, err) o1 := model.Channel{ TeamId: t1.Id, @@ -5294,7 +5294,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{ TeamId: t2.Id, @@ -5303,7 +5303,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{ ChannelId: o1.Id, @@ -5311,7 +5311,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{ ChannelId: o1.Id, @@ -5319,7 +5319,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) m3 := model.ChannelMember{ ChannelId: o2.Id, @@ -5327,7 +5327,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(&m3) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Channel{ TeamId: t1.Id, @@ -5336,7 +5336,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o4 := model.Channel{ TeamId: t1.Id, @@ -5345,7 +5345,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o5 := model.Channel{ TeamId: t1.Id, @@ -5355,7 +5355,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } _, nErr = ss.Channel().Save(&o5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o6 := model.Channel{ TeamId: t1.Id, @@ -5364,7 +5364,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o6, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o7 := model.Channel{ TeamId: t1.Id, @@ -5373,7 +5373,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o7, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) group := &model.Group{ Name: model.NewString(model.NewId()), @@ -5382,10 +5382,10 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } _, err = ss.Group().Create(group) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group.Id, o7.Id, true)) - require.Nil(t, err) + require.NoError(t, err) o8 := model.Channel{ TeamId: t1.Id, @@ -5394,7 +5394,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } _, nErr = ss.Channel().Save(&o8, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o9 := model.Channel{ TeamId: t1.Id, @@ -5403,7 +5403,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o9, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o10 := model.Channel{ TeamId: t1.Id, @@ -5412,7 +5412,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o10, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o11 := model.Channel{ TeamId: t1.Id, @@ -5421,7 +5421,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o11, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o12 := model.Channel{ TeamId: t1.Id, @@ -5431,7 +5431,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o12, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o13 := model.Channel{ TeamId: t1.Id, @@ -5440,12 +5440,12 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o13, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o13.DeleteAt = model.GetMillis() o13.UpdateAt = o13.DeleteAt nErr = ss.Channel().Delete(o13.Id, o13.DeleteAt) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") o14 := model.Channel{ TeamId: t2.Id, @@ -5454,7 +5454,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o14, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Description string Term string @@ -5502,7 +5502,7 @@ func testChannelStoreSearchAllChannels(t *testing.T, ss store.Store) { for _, testCase := range testCases { t.Run(testCase.Description, func(t *testing.T) { channels, count, err := ss.Channel().SearchAllChannels(testCase.Term, testCase.Opts) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, len(*testCase.ExpectedResults), len(*channels)) for i, expected := range *testCase.ExpectedResults { require.Equal(t, expected.Id, (*channels)[i].Id) @@ -5521,15 +5521,15 @@ func testChannelStoreGetMembersByIds(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := &model.ChannelMember{ChannelId: o1.Id, UserId: model.NewId(), NotifyProps: model.GetDefaultChannelNotifyProps()} _, err := ss.Channel().SaveMember(m1) - require.Nil(t, err) + require.NoError(t, err) var members *model.ChannelMembers members, nErr = ss.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId}) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) rm1 := (*members)[0] require.Equal(t, m1.ChannelId, rm1.ChannelId, "bad team id") @@ -5537,14 +5537,14 @@ func testChannelStoreGetMembersByIds(t *testing.T, ss store.Store) { m2 := &model.ChannelMember{ChannelId: o1.Id, UserId: model.NewId(), NotifyProps: model.GetDefaultChannelNotifyProps()} _, err = ss.Channel().SaveMember(m2) - require.Nil(t, err) + require.NoError(t, err) members, nErr = ss.Channel().GetMembersByIds(m1.ChannelId, []string{m1.UserId, m2.UserId, model.NewId()}) - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) require.Len(t, *members, 2, "return wrong number of results") _, nErr = ss.Channel().GetMembersByIds(m1.ChannelId, []string{}) - require.NotNil(t, nErr, "empty user ids - should have failed") + require.Error(t, nErr, "empty user ids - should have failed") } func testChannelStoreGetMembersByChannelIds(t *testing.T, ss store.Store) { @@ -5557,7 +5557,7 @@ func testChannelStoreGetMembersByChannelIds(t *testing.T, ss store.Store) { Name: model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, err) + require.NoError(t, err) channel2, err := ss.Channel().Save(&model.Channel{ TeamId: model.NewId(), @@ -5565,25 +5565,25 @@ func testChannelStoreGetMembersByChannelIds(t *testing.T, ss store.Store) { Name: model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel1.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel2.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) t.Run("should return the user's members for the given channels", func(t *testing.T) { result, nErr := ss.Channel().GetMembersByChannelIds([]string{channel1.Id, channel2.Id}, userId) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *result, 2) assert.Equal(t, userId, (*result)[0].UserId) @@ -5594,13 +5594,13 @@ func testChannelStoreGetMembersByChannelIds(t *testing.T, ss store.Store) { t.Run("should not error or return anything for invalid channel IDs", func(t *testing.T) { result, nErr := ss.Channel().GetMembersByChannelIds([]string{model.NewId(), model.NewId()}, userId) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *result, 0) }) t.Run("should not error or return anything for invalid user IDs", func(t *testing.T) { result, nErr := ss.Channel().GetMembersByChannelIds([]string{channel1.Id, channel2.Id}, model.NewId()) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, *result, 0) }) } @@ -5612,28 +5612,28 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{} u2.Username = "user.two" u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) u3 := &model.User{} u3.Username = "user.three" u3.Email = MakeEmail() u3.Nickname = model.NewId() _, err = ss.User().Save(u3) - require.Nil(t, err) + require.NoError(t, err) u4 := &model.User{} u4.Username = "user.four" u4.Email = MakeEmail() u4.Nickname = model.NewId() _, err = ss.User().Save(u4) - require.Nil(t, err) + require.NoError(t, err) // Group channels userIds := []string{u1.Id, u2.Id, u3.Id} @@ -5642,7 +5642,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { gc1.DisplayName = "GroupChannel" + model.NewId() gc1.Type = model.CHANNEL_GROUP _, nErr := ss.Channel().Save(&gc1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, userId := range userIds { _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ @@ -5650,7 +5650,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) } userIds = []string{u1.Id, u4.Id} @@ -5659,7 +5659,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { gc2.DisplayName = "GroupChannel" + model.NewId() gc2.Type = model.CHANNEL_GROUP _, nErr = ss.Channel().Save(&gc2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, userId := range userIds { _, err := ss.Channel().SaveMember(&model.ChannelMember{ @@ -5667,7 +5667,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) } userIds = []string{u1.Id, u2.Id, u3.Id, u4.Id} @@ -5676,7 +5676,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { gc3.DisplayName = "GroupChannel" + model.NewId() gc3.Type = model.CHANNEL_GROUP _, nErr = ss.Channel().Save(&gc3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, userId := range userIds { _, err := ss.Channel().SaveMember(&model.ChannelMember{ @@ -5684,7 +5684,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) } defer func() { @@ -5747,7 +5747,7 @@ func testChannelStoreSearchGroupChannels(t *testing.T, ss store.Store) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { result, err := ss.Channel().SearchGroupChannels(tc.UserId, tc.Term) - require.Nil(t, err) + require.NoError(t, err) resultIds := []string{} for _, gc := range *result { @@ -5766,7 +5766,7 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, ss store.Store) { o1.Name = "zz" + model.NewId() + "b" o1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := model.Channel{} o2.TeamId = model.NewId() @@ -5774,7 +5774,7 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, ss store.Store) { o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) p3 := model.Channel{} p3.TeamId = model.NewId() @@ -5782,22 +5782,22 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, ss store.Store) { p3.Name = "zz" + model.NewId() + "b" p3.Type = model.CHANNEL_PRIVATE _, nErr = ss.Channel().Save(&p3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := &model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) d4, nErr := ss.Channel().CreateDirectChannel(u1, u2) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Channel().PermanentDeleteMembersByChannel(d4.Id) ss.Channel().PermanentDelete(d4.Id) @@ -5805,37 +5805,37 @@ func testChannelStoreAnalyticsDeletedTypeCount(t *testing.T, ss store.Store) { var openStartCount int64 openStartCount, nErr = ss.Channel().AnalyticsDeletedTypeCount("", "O") - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) var privateStartCount int64 privateStartCount, nErr = ss.Channel().AnalyticsDeletedTypeCount("", "P") - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) var directStartCount int64 directStartCount, nErr = ss.Channel().AnalyticsDeletedTypeCount("", "D") - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) nErr = ss.Channel().Delete(o1.Id, model.GetMillis()) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") nErr = ss.Channel().Delete(o2.Id, model.GetMillis()) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") nErr = ss.Channel().Delete(p3.Id, model.GetMillis()) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") nErr = ss.Channel().Delete(d4.Id, model.GetMillis()) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") var count int64 count, nErr = ss.Channel().AnalyticsDeletedTypeCount("", "O") - require.Nil(t, err, nErr) + require.NoError(t, err, nErr) assert.Equal(t, openStartCount+2, count, "Wrong open channel deleted count.") count, nErr = ss.Channel().AnalyticsDeletedTypeCount("", "P") - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) assert.Equal(t, privateStartCount+1, count, "Wrong private channel deleted count.") count, nErr = ss.Channel().AnalyticsDeletedTypeCount("", "D") - require.Nil(t, nErr, nErr) + require.NoError(t, nErr, nErr) assert.Equal(t, directStartCount+1, count, "Wrong direct channel deleted count.") } @@ -5848,7 +5848,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) { } o1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) p1, err := ss.Post().Save(&model.Post{ UserId: model.NewId(), @@ -5856,10 +5856,10 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) { Message: "test", IsPinned: true, }) - require.Nil(t, err) + require.NoError(t, err) pl, errGet := ss.Channel().GetPinnedPosts(o1.Id) - require.Nil(t, errGet, errGet) + require.NoError(t, errGet, errGet) require.NotNil(t, pl.Posts[p1.Id], "didn't return relevant pinned posts") ch2 := &model.Channel{ @@ -5870,17 +5870,17 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) { } o2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Post().Save(&model.Post{ UserId: model.NewId(), ChannelId: o2.Id, Message: "test", }) - require.Nil(t, err) + require.NoError(t, err) pl, errGet = ss.Channel().GetPinnedPosts(o2.Id) - require.Nil(t, errGet, errGet) + require.NoError(t, errGet, errGet) require.Empty(t, pl.Posts, "wasn't supposed to return posts") t.Run("with correct ReplyCount", func(t *testing.T) { @@ -5893,7 +5893,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) { Message: "message", IsPinned: true, }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post2, err := ss.Post().Save(&model.Post{ @@ -5902,7 +5902,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) { Message: "message", IsPinned: true, }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post3, err := ss.Post().Save(&model.Post{ @@ -5913,11 +5913,11 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) { Message: "message", IsPinned: true, }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) posts, err := ss.Channel().GetPinnedPosts(channelId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, posts.Posts, 3) require.Equal(t, posts.Posts[post1.Id].ReplyCount, int64(1)) require.Equal(t, posts.Posts[post2.Id].ReplyCount, int64(0)) @@ -5934,7 +5934,7 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, ss store.Store) { } o1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Post().Save(&model.Post{ UserId: model.NewId(), @@ -5942,7 +5942,7 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, ss store.Store) { Message: "test", IsPinned: true, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: model.NewId(), @@ -5950,10 +5950,10 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, ss store.Store) { Message: "test", IsPinned: true, }) - require.Nil(t, err) + require.NoError(t, err) count, errGet := ss.Channel().GetPinnedPostCount(o1.Id, true) - require.Nil(t, errGet, errGet) + require.NoError(t, errGet, errGet) require.EqualValues(t, 2, count, "didn't return right count") ch2 := &model.Channel{ @@ -5964,24 +5964,24 @@ func testChannelStoreGetPinnedPostCount(t *testing.T, ss store.Store) { } o2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Post().Save(&model.Post{ UserId: model.NewId(), ChannelId: o2.Id, Message: "test", }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Save(&model.Post{ UserId: model.NewId(), ChannelId: o2.Id, Message: "test", }) - require.Nil(t, err) + require.NoError(t, err) count, errGet = ss.Channel().GetPinnedPostCount(o2.Id, true) - require.Nil(t, errGet, errGet) + require.NoError(t, errGet, errGet) require.EqualValues(t, 0, count, "should return 0") } @@ -5993,13 +5993,13 @@ func testChannelStoreMaxChannelsPerTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(channel, 0) - assert.NotNil(t, nErr) + assert.Error(t, nErr) var ltErr *store.ErrLimitExceeded assert.True(t, errors.As(nErr, <Err)) channel.Id = "" _, nErr = ss.Channel().Save(channel, 1) - assert.Nil(t, nErr) + assert.NoError(t, nErr) } func testChannelStoreGetChannelsByScheme(t *testing.T, ss store.Store) { @@ -6019,9 +6019,9 @@ func testChannelStoreGetChannelsByScheme(t *testing.T, ss store.Store) { } s1, err := ss.Scheme().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2, err = ss.Scheme().Save(s2) - require.Nil(t, err) + require.NoError(t, err) // Create and save some teams. c1 := &model.Channel{ @@ -6053,17 +6053,17 @@ func testChannelStoreGetChannelsByScheme(t *testing.T, ss store.Store) { // Get the channels by a valid Scheme ID. d1, err := ss.Channel().GetChannelsByScheme(s1.Id, 0, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1, 2) // Get the channels by a valid Scheme ID where there aren't any matching Channel. d2, err := ss.Channel().GetChannelsByScheme(s2.Id, 0, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, d2) // Get the channels by an invalid Scheme ID. d3, err := ss.Channel().GetChannelsByScheme(model.NewId(), 0, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, d3) } @@ -6106,7 +6106,7 @@ func testChannelStoreMigrateChannelMembers(t *testing.T, ss store.Store) { for { data, err := ss.Channel().MigrateChannelMembers(lastDoneChannelId, lastDoneUserId) - if assert.Nil(t, err) { + if assert.NoError(t, err) { if data == nil { break } @@ -6118,21 +6118,21 @@ func testChannelStoreMigrateChannelMembers(t *testing.T, ss store.Store) { ss.Channel().ClearCaches() cm1b, err := ss.Channel().GetMember(cm1.ChannelId, cm1.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "", cm1b.ExplicitRoles) assert.False(t, cm1b.SchemeGuest) assert.True(t, cm1b.SchemeUser) assert.True(t, cm1b.SchemeAdmin) cm2b, err := ss.Channel().GetMember(cm2.ChannelId, cm2.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "", cm2b.ExplicitRoles) assert.False(t, cm1b.SchemeGuest) assert.True(t, cm2b.SchemeUser) assert.False(t, cm2b.SchemeAdmin) cm3b, err := ss.Channel().GetMember(cm3.ChannelId, cm3.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "something_else", cm3b.ExplicitRoles) assert.False(t, cm1b.SchemeGuest) assert.False(t, cm3b.SchemeUser) @@ -6147,7 +6147,7 @@ func testResetAllChannelSchemes(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } s1, err := ss.Scheme().Save(s1) - require.Nil(t, err) + require.NoError(t, err) c1 := &model.Channel{ TeamId: model.NewId(), @@ -6172,7 +6172,7 @@ func testResetAllChannelSchemes(t *testing.T, ss store.Store) { assert.Equal(t, s1.Id, *c2.SchemeId) err = ss.Channel().ResetAllChannelSchemes() - assert.Nil(t, err) + assert.NoError(t, err) c1, _ = ss.Channel().Get(c1.Id, true) c2, _ = ss.Channel().Get(c2.Id, true) @@ -6217,30 +6217,30 @@ func testChannelStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) } _, err := ss.Channel().SaveMember(m1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(m2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(m3) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(m4) - require.Nil(t, err) + require.NoError(t, err) - require.Nil(t, ss.Channel().ClearAllCustomRoleAssignments()) + require.NoError(t, ss.Channel().ClearAllCustomRoleAssignments()) member, err := ss.Channel().GetMember(m1.ChannelId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, m1.ExplicitRoles, member.Roles) member, err = ss.Channel().GetMember(m2.ChannelId, m2.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "channel_user channel_admin", member.Roles) member, err = ss.Channel().GetMember(m3.ChannelId, m3.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, m3.ExplicitRoles, member.Roles) member, err = ss.Channel().GetMember(m4.ChannelId, m4.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "", member.Roles) } @@ -6257,7 +6257,7 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { Type: model.CHANNEL_OPEN, } _, nErr := ss.Channel().Save(&o1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // o2 is another public channel on the team o2 := model.Channel{ @@ -6267,11 +6267,11 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { Type: model.CHANNEL_OPEN, } _, nErr = ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("o1 and o2 initially listed in public channels", func(t *testing.T) { channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o1, &o2}, channels) }) @@ -6279,11 +6279,11 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { o1.UpdateAt = o1.DeleteAt e := ss.Channel().Delete(o1.Id, o1.DeleteAt) - require.Nil(t, e, "channel should have been deleted") + require.NoError(t, e, "channel should have been deleted") t.Run("o1 still listed in public channels when marked as deleted", func(t *testing.T) { channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o1, &o2}, channels) }) @@ -6291,27 +6291,27 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { t.Run("o1 no longer listed in public channels when permanently deleted", func(t *testing.T) { channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o2}, channels) }) o2.Type = model.CHANNEL_PRIVATE - _, appErr := ss.Channel().Update(&o2) - require.Nil(t, appErr) + _, err := ss.Channel().Update(&o2) + require.NoError(t, err) t.Run("o2 no longer listed since now private", func(t *testing.T) { channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{}, channels) }) o2.Type = model.CHANNEL_OPEN - _, appErr = ss.Channel().Update(&o2) - require.Nil(t, appErr) + _, err = ss.Channel().Update(&o2) + require.NoError(t, err) t.Run("o2 listed once again since now public", func(t *testing.T) { channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o2}, channels) }) @@ -6338,7 +6338,7 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { "Header": o3.Header, "Purpose": o3.Purpose, }) - require.Nil(t, execerr) + require.NoError(t, execerr) o3.DisplayName = "Open Channel 3 - Modified" @@ -6363,11 +6363,11 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { "ExtraUpdateAt": o3.ExtraUpdateAt, "CreatorId": o3.CreatorId, }) - require.Nil(t, execerr) + require.NoError(t, execerr) t.Run("verify o3 INSERT converted to UPDATE", func(t *testing.T) { channels, channelErr := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, channelErr) + require.NoError(t, channelErr) require.Equal(t, &model.ChannelList{&o2, &o3}, channels) }) @@ -6380,7 +6380,7 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { } _, nErr = ss.Channel().Save(&o4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, execerr = s.GetMaster().ExecNoTimeout(` DELETE FROM @@ -6390,15 +6390,15 @@ func testMaterializedPublicChannels(t *testing.T, ss store.Store, s SqlStore) { `, map[string]interface{}{ "Id": o4.Id, }) - require.Nil(t, execerr) + require.NoError(t, execerr) o4.DisplayName += " - Modified" - _, appErr = ss.Channel().Update(&o4) - require.Nil(t, appErr) + _, err = ss.Channel().Update(&o4) + require.NoError(t, err) t.Run("verify o4 UPDATE converted to INSERT", func(t *testing.T) { channels, err := ss.Channel().SearchInTeam(teamId, "", true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, &model.ChannelList{&o2, &o3, &o4}, channels) }) } @@ -6410,7 +6410,7 @@ func testChannelStoreGetAllChannelsForExportAfter(t *testing.T, ss store.Store) t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{} c1.TeamId = t1.Id @@ -6418,10 +6418,10 @@ func testChannelStoreGetAllChannelsForExportAfter(t *testing.T, ss store.Store) c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) d1, err := ss.Channel().GetAllChannelsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, err) + assert.NoError(t, err) found := false for _, c := range d1 { @@ -6442,7 +6442,7 @@ func testChannelStoreGetChannelMembersForExport(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{} c1.TeamId = t1.Id @@ -6450,7 +6450,7 @@ func testChannelStoreGetChannelMembersForExport(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2 := model.Channel{} c2.TeamId = model.NewId() @@ -6458,30 +6458,30 @@ func testChannelStoreGetChannelMembersForExport(t *testing.T, ss store.Store) { c2.Name = "zz" + model.NewId() + "b" c2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(&c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err = ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) m1 := model.ChannelMember{} m1.ChannelId = c1.Id m1.UserId = u1.Id m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = c2.Id m2.UserId = u1.Id m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) d1, err := ss.Channel().GetChannelMembersForExport(u1.Id, t1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1, 1) @@ -6499,7 +6499,7 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, ss store.Store, s t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{} c1.TeamId = t1.Id @@ -6507,66 +6507,66 @@ func testChannelStoreRemoveAllDeactivatedMembers(t *testing.T, ss store.Store, s c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err = ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) u3 := model.User{} u3.Email = MakeEmail() u3.Nickname = model.NewId() _, err = ss.User().Save(&u3) - require.Nil(t, err) + require.NoError(t, err) m1 := model.ChannelMember{} m1.ChannelId = c1.Id m1.UserId = u1.Id m1.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m1) - require.Nil(t, err) + require.NoError(t, err) m2 := model.ChannelMember{} m2.ChannelId = c1.Id m2.UserId = u2.Id m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m2) - require.Nil(t, err) + require.NoError(t, err) m3 := model.ChannelMember{} m3.ChannelId = c1.Id m3.UserId = u3.Id m3.NotifyProps = model.GetDefaultChannelNotifyProps() _, err = ss.Channel().SaveMember(&m3) - require.Nil(t, err) + require.NoError(t, err) // Get all the channel members. Check there are 3. d1, err := ss.Channel().GetMembers(c1.Id, 0, 1000) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, *d1, 3) // Deactivate users 1 & 2. u1.DeleteAt = model.GetMillis() u2.DeleteAt = model.GetMillis() _, err = ss.User().Update(&u1, true) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.User().Update(&u2, true) - require.Nil(t, err) + require.NoError(t, err) // Remove all deactivated users from the channel. - assert.Nil(t, ss.Channel().RemoveAllDeactivatedMembers(c1.Id)) + assert.NoError(t, ss.Channel().RemoveAllDeactivatedMembers(c1.Id)) // Get all the channel members. Check there is now only 1: m3. d2, err := ss.Channel().GetMembers(c1.Id, 0, 1000) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, *d2, 1) assert.Equal(t, u3.Id, (*d2)[0].UserId) @@ -6591,23 +6591,23 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, ss store.Store, s Sql o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_GROUP _, nErr := ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := &model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -6622,7 +6622,7 @@ func testChannelStoreExportAllDirectChannels(t *testing.T, ss store.Store, s Sql ss.Channel().SaveDirectChannel(&o1, &m1, &m2) d1, nErr := ss.Channel().GetAllDirectChannelsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Len(t, d1, 2) assert.ElementsMatch(t, []string{o1.DisplayName, o2.DisplayName}, []string{d1[0].DisplayName, d1[1].DisplayName}) @@ -6646,7 +6646,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T o2.Name = "zz" + model.NewId() + "b" o2.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&o2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o3 := model.Channel{} o3.TeamId = teamId @@ -6654,23 +6654,23 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T o3.Name = "zz" + model.NewId() + "b" o3.Type = model.CHANNEL_PRIVATE _, nErr = ss.Channel().Save(&o3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := &model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -6685,7 +6685,7 @@ func testChannelStoreExportAllDirectChannelsExcludePrivateAndPublic(t *testing.T ss.Channel().SaveDirectChannel(&o1, &m1, &m2) d1, nErr := ss.Channel().GetAllDirectChannelsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Len(t, d1, 1) assert.Equal(t, o1.DisplayName, d1[0].DisplayName) @@ -6706,17 +6706,17 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, ss stor u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -6732,10 +6732,10 @@ func testChannelStoreExportAllDirectChannelsDeletedChannel(t *testing.T, ss stor o1.DeleteAt = 1 nErr = ss.Channel().SetDeleteAt(o1.Id, 1, 1) - require.Nil(t, nErr, "channel should have been deleted") + require.NoError(t, nErr, "channel should have been deleted") d1, nErr := ss.Channel().GetAllDirectChannelsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Equal(t, 0, len(d1)) @@ -6750,7 +6750,7 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(10 * time.Millisecond) @@ -6759,7 +6759,7 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, ss store.Store) { c2.Name = "zz" + model.NewId() + "b" c2.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(10 * time.Millisecond) startTime := c2.CreateAt @@ -6769,21 +6769,21 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, ss store.Store) { c3.Name = "zz" + model.NewId() + "b" c3.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(c3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c4 := &model.Channel{} c4.DisplayName = "Channel4" c4.Name = "zz" + model.NewId() + "b" c4.Type = model.CHANNEL_PRIVATE _, nErr = ss.Channel().Save(c4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c5 := &model.Channel{} c5.DisplayName = "Channel5" c5.Name = "zz" + model.NewId() + "b" c5.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(c5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(10 * time.Millisecond) @@ -6792,24 +6792,24 @@ func testChannelStoreGetChannelsBatchForIndexing(t *testing.T, ss store.Store) { c6.Name = "zz" + model.NewId() + "b" c6.Type = model.CHANNEL_OPEN _, nErr = ss.Channel().Save(c6, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) endTime := c6.CreateAt // First and last channel should be outside the range channels, err := ss.Channel().GetChannelsBatchForIndexing(startTime, endTime, 1000) - assert.Nil(t, err) + assert.NoError(t, err) assert.ElementsMatch(t, []*model.Channel{c2, c3, c5}, channels) // Update the endTime, last channel should be in endTime = model.GetMillis() channels, err = ss.Channel().GetChannelsBatchForIndexing(startTime, endTime, 1000) - assert.Nil(t, err) + assert.NoError(t, err) assert.ElementsMatch(t, []*model.Channel{c2, c3, c5, c6}, channels) // Testing the limit channels, err = ss.Channel().GetChannelsBatchForIndexing(startTime, endTime, 2) - assert.Nil(t, err) + assert.NoError(t, err) assert.ElementsMatch(t, []*model.Channel{c2, c3}, channels) } @@ -6820,7 +6820,7 @@ func testGroupSyncedChannelCount(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, GroupConstrained: model.NewBool(true), }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, channel1.IsGroupConstrained()) defer ss.Channel().PermanentDelete(channel1.Id) @@ -6829,20 +6829,20 @@ func testGroupSyncedChannelCount(t *testing.T, ss store.Store) { Name: model.NewId(), Type: model.CHANNEL_PRIVATE, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, channel2.IsGroupConstrained()) defer ss.Channel().PermanentDelete(channel2.Id) - count, appErr := ss.Channel().GroupSyncedChannelCount() - require.Nil(t, appErr) + count, err := ss.Channel().GroupSyncedChannelCount() + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) channel2.GroupConstrained = model.NewBool(true) - channel2, err := ss.Channel().Update(channel2) - require.Nil(t, err) + channel2, err = ss.Channel().Update(channel2) + require.NoError(t, err) require.True(t, channel2.IsGroupConstrained()) - countAfter, appErr := ss.Channel().GroupSyncedChannelCount() - require.Nil(t, appErr) + countAfter, err := ss.Channel().GroupSyncedChannelCount() + require.NoError(t, err) require.GreaterOrEqual(t, countAfter, count+1) } diff --git a/store/storetest/channel_store_categories.go b/store/storetest/channel_store_categories.go index 50dfbabce8..c4465d3cf1 100644 --- a/store/storetest/channel_store_categories.go +++ b/store/storetest/channel_store_categories.go @@ -34,10 +34,10 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - assert.Nil(t, nErr) + assert.NoError(t, nErr) res, err := ss.Channel().GetSidebarCategories(userId, teamId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, res.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, res.Categories[0].Type) assert.Equal(t, model.SidebarCategoryChannels, res.Categories[1].Type) @@ -49,15 +49,15 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) userId2 := model.NewId() nErr = ss.Channel().CreateInitialSidebarCategories(userId2, teamId) - assert.Nil(t, nErr) + assert.NoError(t, nErr) res, err := ss.Channel().GetSidebarCategories(userId2, teamId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, res.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, res.Categories[0].Type) assert.Equal(t, model.SidebarCategoryChannels, res.Categories[1].Type) @@ -69,15 +69,15 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) teamId2 := model.NewId() nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId2) - assert.Nil(t, nErr) + assert.NoError(t, nErr) res, err := ss.Channel().GetSidebarCategories(userId, teamId2) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, res.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, res.Categories[0].Type) assert.Equal(t, model.SidebarCategoryChannels, res.Categories[1].Type) @@ -89,17 +89,17 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) initialCategories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) // Calling CreateInitialSidebarCategories a second time shouldn't create any new categories nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - assert.Nil(t, nErr) + assert.NoError(t, nErr) res, err := ss.Channel().GetSidebarCategories(userId, teamId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, initialCategories.Categories, res.Categories) }) @@ -122,7 +122,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { wg.Wait() res, err := ss.Channel().GetSidebarCategories(userId, teamId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, res.Categories, 3) }) @@ -136,26 +136,26 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, Name: "channel1", }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel1.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) channel2, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, Type: model.CHANNEL_OPEN, Name: "channel2", }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel2.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) nErr = ss.Preference().Save(&model.Preferences{ { @@ -165,15 +165,15 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Value: "true", }, }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create the categories nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Get and check the categories for channels categories, nErr := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, categories.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, categories.Categories[0].Type) assert.Equal(t, []string{channel1.Id}, categories.Categories[0].Channels) @@ -192,13 +192,13 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Name: "channel1", DisplayName: "zebra", }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel1.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) channel2, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -206,13 +206,13 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Name: "channel2", DisplayName: "aardvark", }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel2.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) nErr = ss.Preference().Save(&model.Preferences{ { @@ -228,15 +228,15 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Value: "true", }, }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create the categories nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Get and check the categories for channels categories, nErr := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, categories.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, categories.Categories[0].Type) assert.Equal(t, []string{channel2.Id, channel1.Id}, categories.Categories[0].Channels) @@ -264,7 +264,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - require.Nil(t, err) + require.NoError(t, err) dmChannel2, err := ss.Channel().SaveDirectChannel( &model.Channel{ @@ -280,7 +280,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - require.Nil(t, err) + require.NoError(t, err) err = ss.Preference().Save(&model.Preferences{ { @@ -290,15 +290,15 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Value: "true", }, }) - require.Nil(t, err) + require.NoError(t, err) // Create the categories nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Get and check the categories for channels categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, categories.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, categories.Categories[0].Type) assert.Equal(t, []string{dmChannel1.Id}, categories.Categories[0].Channels) @@ -317,13 +317,13 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, Name: "channel1", }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel1.Id, UserId: userId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) nErr = ss.Preference().Save(&model.Preferences{ { @@ -333,15 +333,15 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) { Value: "true", }, }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create the categories nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Get and check the categories for channels categories, nErr := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, categories.Categories, 3) assert.Equal(t, model.SidebarCategoryFavorites, categories.Categories[0].Type) assert.Equal(t, []string{}, categories.Categories[0].Channels) @@ -356,7 +356,7 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create the category created, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ @@ -364,11 +364,11 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { DisplayName: model.NewId(), }, }) - require.Nil(t, err) + require.NoError(t, err) // Confirm that it comes second res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 4) assert.Equal(t, model.SidebarCategoryFavorites, res.Categories[0].Type) assert.Equal(t, model.SidebarCategoryCustom, res.Categories[1].Type) @@ -380,11 +380,11 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Re-arrange the categories so that Favorites comes last categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, categories.Categories, 3) require.Equal(t, model.SidebarCategoryFavorites, categories.Categories[0].Type) @@ -393,7 +393,7 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { categories.Categories[2].Id, categories.Categories[0].Id, }) - require.Nil(t, err) + require.NoError(t, err) // Create the category created, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ @@ -401,11 +401,11 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { DisplayName: model.NewId(), }, }) - require.Nil(t, err) + require.NoError(t, err) // Confirm that it comes first res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 4) assert.Equal(t, model.SidebarCategoryCustom, res.Categories[0].Type) assert.Equal(t, created.Id, res.Categories[0].Id) @@ -416,7 +416,7 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create some channels channel1, err := ss.Channel().Save(&model.Channel{ @@ -424,13 +424,13 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { TeamId: teamId, Name: model.NewId(), }, 100) - require.Nil(t, err) + require.NoError(t, err) channel2, err := ss.Channel().Save(&model.Channel{ Type: model.CHANNEL_OPEN, TeamId: teamId, Name: model.NewId(), }, 100) - require.Nil(t, err) + require.NoError(t, err) // Create the category created, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ @@ -439,12 +439,12 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { }, Channels: []string{channel2.Id, channel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{channel2.Id, channel1.Id}, created.Channels) // Get the channel again to ensure that the SidebarChannels were saved correctly res, err := ss.Channel().GetSidebarCategory(created.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{channel2.Id, channel1.Id}, res.Channels) }) @@ -453,10 +453,10 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, categories.Categories, 3) favoritesCategory := categories.Categories[0] @@ -470,13 +470,13 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { TeamId: teamId, Name: model.NewId(), }, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) channel2, nErr := ss.Channel().Save(&model.Channel{ Type: model.CHANNEL_OPEN, TeamId: teamId, Name: model.NewId(), }, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) // Assign them to categories favoritesCategory.Channels = []string{channel1.Id} @@ -485,7 +485,7 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { favoritesCategory, channelsCategory, }) - require.Nil(t, err) + require.NoError(t, err) // Create the category created, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ @@ -494,16 +494,16 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) { }, Channels: []string{channel2.Id, channel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{channel2.Id, channel1.Id}, created.Channels) // Confirm that the channels were removed from their original categories res, err := ss.Channel().GetSidebarCategory(favoritesCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{}, res.Channels) res, err = ss.Channel().GetSidebarCategory(channelsCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{}, res.Channels) }) } @@ -518,7 +518,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { channelId3 := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create a category and assign some channels to it created, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ @@ -529,12 +529,12 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { }, Channels: []string{channelId1, channelId2, channelId3}, }) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, created) // Ensure that they're returned in order res, err := ss.Channel().GetSidebarCategory(created.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, created.Id, res.Id) assert.Equal(t, model.SidebarCategoryCustom, res.Type) assert.Equal(t, created.DisplayName, res.DisplayName) @@ -547,10 +547,10 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Create the initial categories and find the channels category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) channelsCategory := categories.Categories[1] require.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) @@ -562,13 +562,13 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_PRIVATE, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) channel2, nErr := ss.Channel().Save(&model.Channel{ Name: "channel2", @@ -576,13 +576,13 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_OPEN, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Confirm that they're not in the Channels category in the DB count, countErr := s.GetMaster().SelectInt(` @@ -592,12 +592,12 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { SidebarChannels WHERE CategoryId = :CategoryId`, map[string]interface{}{"CategoryId": channelsCategory.Id}) - require.Nil(t, countErr) + require.NoError(t, countErr) assert.Equal(t, int64(0), count) // Ensure that the Channels are returned in alphabetical order res, err := ss.Channel().GetSidebarCategory(channelsCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, channelsCategory.Id, res.Id) assert.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) assert.Equal(t, []string{channel2.Id, channel1.Id}, res.Channels) @@ -609,10 +609,10 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Create the initial categories and find the channels category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.SidebarCategoryChannels, categories.Categories[1].Type) channelsCategory := categories.Categories[1] @@ -623,18 +623,18 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: model.NewId(), Type: model.CHANNEL_OPEN, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Ensure that no channels are returned res, err := ss.Channel().GetSidebarCategory(channelsCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, channelsCategory.Id, res.Id) assert.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) assert.Len(t, res.Channels, 0) @@ -646,10 +646,10 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Create the initial categories and find the channels category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := categories.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory.Type) @@ -663,13 +663,13 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_PRIVATE, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) channel2, nErr := ss.Channel().Save(&model.Channel{ Name: "channel2", @@ -677,13 +677,13 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_OPEN, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) // And assign one to another category _, _, err = ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -692,11 +692,11 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { Channels: []string{channel2.Id}, }, }) - require.Nil(t, err) + require.NoError(t, err) // Ensure that the correct channel is returned in the Channels category res, err := ss.Channel().GetSidebarCategory(channelsCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, channelsCategory.Id, res.Id) assert.Equal(t, model.SidebarCategoryChannels, channelsCategory.Type) assert.Equal(t, []string{channel1.Id}, res.Channels) @@ -708,10 +708,10 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Create the initial categories and find the DMs category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.SidebarCategoryDirectMessages, categories.Categories[2].Type) dmsCategory := categories.Categories[2] @@ -732,11 +732,11 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - require.Nil(t, nErr) + require.NoError(t, nErr) // Ensure that the DM is returned res, err := ss.Channel().GetSidebarCategory(dmsCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, dmsCategory.Id, res.Id) assert.Equal(t, model.SidebarCategoryDirectMessages, res.Type) assert.Equal(t, []string{dmChannel.Id}, res.Channels) @@ -748,10 +748,10 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Create the initial categories and find the DMs category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.SidebarCategoryDirectMessages, categories.Categories[2].Type) dmsCategory := categories.Categories[2] @@ -762,17 +762,17 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: "", Type: model.CHANNEL_GROUP, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: gmChannel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Ensure that the DM is returned res, err := ss.Channel().GetSidebarCategory(dmsCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, dmsCategory.Id, res.Id) assert.Equal(t, model.SidebarCategoryDirectMessages, res.Type) assert.Equal(t, []string{gmChannel.Id}, res.Channels) @@ -784,10 +784,10 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Create the initial categories and find the DMs category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.SidebarCategoryDirectMessages, categories.Categories[2].Type) dmsCategory := categories.Categories[2] @@ -808,13 +808,13 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create another team and assign the DM to a custom category on that team otherTeamId := model.NewId() nErr = ss.Channel().CreateInitialSidebarCategories(userId, otherTeamId) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().CreateSidebarCategory(userId, otherTeamId, &model.SidebarCategoryWithChannels{ SidebarCategory: model.SidebarCategory{ @@ -823,11 +823,11 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { }, Channels: []string{dmChannel.Id}, }) - require.Nil(t, err) + require.NoError(t, err) // Ensure that the DM is returned with the DMs category on the original team res, err := ss.Channel().GetSidebarCategory(dmsCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, dmsCategory.Id, res.Id) assert.Equal(t, model.SidebarCategoryDirectMessages, res.Type) assert.Equal(t, []string{dmChannel.Id}, res.Channels) @@ -840,7 +840,7 @@ func testGetSidebarCategories(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) channelIds := []string{ model.NewId(), @@ -851,14 +851,14 @@ func testGetSidebarCategories(t *testing.T, ss store.Store) { newCategory, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ Channels: channelIds, }) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, newCategory) gotCategory, err := ss.Channel().GetSidebarCategory(newCategory.Id) - require.Nil(t, err) + require.NoError(t, err) res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 4) require.Equal(t, model.SidebarCategoryCustom, res.Categories[1].Type) @@ -877,10 +877,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { // Create the initial categories err := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) initialCategories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := initialCategories.Categories[0] channelsCategory := initialCategories.Categories[1] @@ -890,17 +890,17 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { updated, _, err := ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ channelsCategory, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, channelsCategory, updated[0]) assert.Equal(t, "Channels", updated[0].DisplayName) // And then reorder the categories err = ss.Channel().UpdateSidebarCategoryOrder(userId, teamId, []string{dmsCategory.Id, favoritesCategory.Id, channelsCategory.Id}) - require.Nil(t, err) + require.NoError(t, err) // Which somehow blanks out stuff because ??? got, err := ss.Channel().GetSidebarCategory(favoritesCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "Favorites", got.DisplayName) }) @@ -910,10 +910,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { // Create the initial categories err := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) initialCategories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := initialCategories.Categories[0] channelsCategory := initialCategories.Categories[1] @@ -925,7 +925,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { channelsCategory, dmsCategory, }) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, favoritesCategory.Id, updatedCategories[0].Id) assert.Equal(t, channelsCategory.Id, updatedCategories[1].Id) assert.Equal(t, dmsCategory.Id, updatedCategories[2].Id) @@ -936,17 +936,17 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) initialCategories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := initialCategories.Categories[0] channelsCategory := initialCategories.Categories[1] dmsCategory := initialCategories.Categories[2] customCategory, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{}) - require.Nil(t, err) + require.NoError(t, err) categoriesToUpdate := []*model.SidebarCategoryWithChannels{ // Try to change the type of Favorites @@ -984,7 +984,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { } updatedCategories, _, err := ss.Channel().UpdateSidebarCategories(userId, teamId, categoriesToUpdate) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotEqual(t, "Favorites", categoriesToUpdate[0].DisplayName) assert.Equal(t, "Favorites", updatedCategories[0].DisplayName) @@ -1002,10 +1002,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { // Create the initial categories and find the favorites category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := categories.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory.Type) @@ -1016,13 +1016,13 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, TeamId: teamId, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Assign it to favorites _, _, err = ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -1031,10 +1031,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{channel.Id}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) @@ -1048,10 +1048,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{channel.Id}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) - assert.NotNil(t, nErr) + assert.Error(t, nErr) assert.True(t, errors.Is(nErr, sql.ErrNoRows)) assert.Nil(t, res) }) @@ -1062,10 +1062,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { // Create the initial categories and find the favorites category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := categories.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory.Type) @@ -1087,7 +1087,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - assert.Nil(t, nErr) + assert.NoError(t, nErr) // Assign it to favorites _, _, err = ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -1096,10 +1096,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{dmChannel.Id}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) @@ -1113,10 +1113,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{dmChannel.Id}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id) - assert.NotNil(t, nErr) + assert.Error(t, nErr) assert.True(t, errors.Is(nErr, sql.ErrNoRows)) assert.Nil(t, res) }) @@ -1128,19 +1128,19 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { // Create the initial categories and find the favorites categories in each team nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := categories.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory.Type) nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId2) - require.Nil(t, nErr) + require.NoError(t, nErr) categories2, err := ss.Channel().GetSidebarCategories(userId, teamId2) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory2 := categories2.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory2.Type) @@ -1162,7 +1162,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - assert.Nil(t, nErr) + assert.NoError(t, nErr) // Assign it to favorites on the first team. The favorites preference gets set for all teams. _, _, err = ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -1171,10 +1171,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{dmChannel.Id}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) @@ -1185,7 +1185,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{dmChannel.Id}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{dmChannel.Id}, updated[0].Channels) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id) @@ -1200,7 +1200,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id) require.Error(t, nErr) @@ -1213,7 +1213,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id) require.Error(t, nErr) @@ -1226,10 +1226,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { // Create the initial categories and find the favorites category nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory := categories.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory.Type) @@ -1240,10 +1240,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { userId2 := model.NewId() nErr = ss.Channel().CreateInitialSidebarCategories(userId2, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) categories2, err := ss.Channel().GetSidebarCategories(userId2, teamId) - require.Nil(t, err) + require.NoError(t, err) favoritesCategory2 := categories2.Categories[0] require.Equal(t, model.SidebarCategoryFavorites, favoritesCategory2.Type) @@ -1256,19 +1256,19 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, TeamId: teamId, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId2, ChannelId: channel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Have user1 favorite it _, _, err = ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -1281,10 +1281,10 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) @@ -1303,15 +1303,15 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) res, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) @@ -1326,14 +1326,14 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) assert.True(t, errors.Is(nErr, sql.ErrNoRows)) assert.Nil(t, res) res, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.NotNil(t, res) assert.Equal(t, "true", res.Value) @@ -1348,7 +1348,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, err) + assert.NoError(t, err) res, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id) assert.True(t, errors.Is(nErr, sql.ErrNoRows)) @@ -1369,13 +1369,13 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, TeamId: teamId, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) otherUserId := model.NewId() dmChannel, nErr := ss.Channel().SaveDirectChannel( @@ -1392,14 +1392,14 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // And some categories initialCategories, nErr := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) channelsCategory := initialCategories.Categories[1] dmsCategory := initialCategories.Categories[2] @@ -1420,7 +1420,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { } updatedCategories, _, nErr := ss.Channel().UpdateSidebarCategories(userId, teamId, categoriesToUpdate) - assert.Nil(t, nErr) + assert.NoError(t, nErr) // The channels should still exist in the category because they would otherwise be orphaned assert.Equal(t, []string{channel.Id}, updatedCategories[0].Channels) @@ -1446,21 +1446,21 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), }, ) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) // The DM should start in the DMs category initialCategories, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) dmsCategory := initialCategories.Categories[2] require.Equal(t, []string{dmChannel.Id}, dmsCategory.Channels) // Now move the DM into a custom category customCategory, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{}) - require.Nil(t, err) + require.NoError(t, err) categoriesToUpdate := []*model.SidebarCategoryWithChannels{ { @@ -1474,18 +1474,18 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { } updatedCategories, _, err := ss.Channel().UpdateSidebarCategories(userId, teamId, categoriesToUpdate) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, dmsCategory.Id, updatedCategories[0].Id) assert.Equal(t, []string{}, updatedCategories[0].Channels) assert.Equal(t, customCategory.Id, updatedCategories[1].Id) assert.Equal(t, []string{dmChannel.Id}, updatedCategories[1].Channels) updatedDmsCategory, err := ss.Channel().GetSidebarCategory(dmsCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{}, updatedDmsCategory.Channels) updatedCustomCategory, err := ss.Channel().GetSidebarCategory(customCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{dmChannel.Id}, updatedCustomCategory.Channels) // And move it back out of the custom category @@ -1501,18 +1501,18 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { } updatedCategories, _, err = ss.Channel().UpdateSidebarCategories(userId, teamId, categoriesToUpdate) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, dmsCategory.Id, updatedCategories[0].Id) assert.Equal(t, []string{dmChannel.Id}, updatedCategories[0].Channels) assert.Equal(t, customCategory.Id, updatedCategories[1].Id) assert.Equal(t, []string{}, updatedCategories[1].Channels) updatedDmsCategory, err = ss.Channel().GetSidebarCategory(dmsCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{dmChannel.Id}, updatedDmsCategory.Channels) updatedCustomCategory, err = ss.Channel().GetSidebarCategory(customCategory.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{}, updatedCustomCategory.Channels) }) @@ -1526,26 +1526,26 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, TeamId: teamId, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // And then create the initial categories so that it includes the channel nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) initialCategories, nErr := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) channelsCategory := initialCategories.Categories[1] require.Equal(t, []string{channel.Id}, channelsCategory.Channels) customCategory, nErr := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{}) - require.Nil(t, nErr) + require.NoError(t, nErr) // Move the channel one way updatedCategories, _, nErr := ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -1558,7 +1558,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{channel.Id}, }, }) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Equal(t, []string{}, updatedCategories[0].Channels) assert.Equal(t, []string{channel.Id}, updatedCategories[1].Channels) @@ -1574,7 +1574,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{}, }, }) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Equal(t, []string{channel.Id}, updatedCategories[0].Channels) assert.Equal(t, []string{}, updatedCategories[1].Channels) }) @@ -1589,20 +1589,20 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, TeamId: teamId, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().SaveMember(&model.ChannelMember{ UserId: userId, ChannelId: channel.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // And then create the initial categories so that Channels includes the channel nErr = ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) initialCategories, nErr := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) channelsCategory := initialCategories.Categories[1] require.Equal(t, []string{channel.Id}, channelsCategory.Channels) @@ -1612,7 +1612,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { DisplayName: "originalName", }, }) - require.Nil(t, nErr) + require.NoError(t, nErr) // Rename the custom category updatedCategories, originalCategories, nErr := ss.Channel().UpdateSidebarCategories(userId, teamId, []*model.SidebarCategoryWithChannels{ @@ -1623,7 +1623,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { }, }, }) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, len(updatedCategories), len(originalCategories)) assert.Equal(t, "originalName", originalCategories[0].DisplayName) assert.Equal(t, "updatedName", updatedCategories[0].DisplayName) @@ -1639,7 +1639,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) { Channels: []string{channel.Id}, }, }) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, len(updatedCategories), len(originalCategories)) require.Equal(t, updatedCategories[0].Id, originalCategories[0].Id) require.Equal(t, updatedCategories[1].Id, originalCategories[1].Id) @@ -1656,10 +1656,10 @@ func setupInitialSidebarCategories(t *testing.T, ss store.Store) (string, string teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 3) return userId, teamId @@ -1679,38 +1679,38 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_OPEN, }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, &model.User{ Id: model.NewId(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ Channels: []string{channel1.Id, dmChannel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) // Confirm that we start with the right number of categories and SidebarChannels entries count, err := s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarCategories WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(4), count) count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarChannels WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(2), count) // Leave the team err = ss.Channel().ClearSidebarOnTeamLeave(userId, teamId) - assert.Nil(t, err) + assert.NoError(t, err) // Confirm that all the categories and SidebarChannel entries have been deleted count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarCategories WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(0), count) count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarChannels WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(0), count) }) @@ -1727,38 +1727,38 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_OPEN, }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, &model.User{ Id: model.NewId(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ Channels: []string{channel1.Id, dmChannel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) // Confirm that we start with the right number of categories and SidebarChannels entries count, err := s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarCategories WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(4), count) count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarChannels WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(2), count) // Leave another team err = ss.Channel().ClearSidebarOnTeamLeave(userId, model.NewId()) - assert.Nil(t, err) + assert.NoError(t, err) // Confirm that nothing has been deleted count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarCategories WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(4), count) count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarChannels WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(2), count) }) @@ -1776,10 +1776,10 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) { teamId2 := model.NewId() err := ss.Channel().CreateInitialSidebarCategories(userId, teamId2) - require.Nil(t, err) + require.NoError(t, err) res, err := ss.Channel().GetSidebarCategories(userId, teamId2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 3) // On the first team, create some channels and assign them to a custom category @@ -1788,15 +1788,15 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_OPEN, }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, user2) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ Channels: []string{channel1.Id, dmChannel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) // Do the same on the second team channel2, nErr := ss.Channel().Save(&model.Channel{ @@ -1804,38 +1804,38 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId2, Type: model.CHANNEL_OPEN, }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().CreateSidebarCategory(userId, teamId2, &model.SidebarCategoryWithChannels{ Channels: []string{channel2.Id, dmChannel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) // Confirm that we start with the right number of categories and SidebarChannels entries count, err := s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarCategories WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(8), count) count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarChannels WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(4), count) // Leave the first team err = ss.Channel().ClearSidebarOnTeamLeave(userId, teamId) - assert.Nil(t, err) + assert.NoError(t, err) // Confirm that we have the correct number of categories and SidebarChannels entries left over count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarCategories WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(4), count) count, err = s.GetMaster().SelectInt("SELECT COUNT(*) FROM SidebarChannels WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(2), count) // Confirm that the categories on the second team are unchanged res, err = ss.Channel().GetSidebarCategories(userId, teamId2) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, res.Categories, 4) assert.Equal(t, model.SidebarCategoryCustom, res.Categories[1].Type) @@ -1849,20 +1849,20 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { defer ss.User().PermanentDelete(userId) newCategory, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{}) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, newCategory) // Ensure that the category was created properly res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 4) // Then delete it and confirm that was done correctly err = ss.Channel().DeleteSidebarCategory(newCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) res, err = ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 3) }) @@ -1880,7 +1880,7 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_OPEN, }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().PermanentDelete(channel1.Id) channel2, nErr := ss.Channel().Save(&model.Channel{ @@ -1888,25 +1888,25 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { TeamId: teamId, Type: model.CHANNEL_PRIVATE, }, 1000) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().PermanentDelete(channel2.Id) dmChannel1, nErr := ss.Channel().CreateDirectChannel(user, &model.User{ Id: model.NewId(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().PermanentDelete(dmChannel1.Id) // Assign some of those channels to a custom category newCategory, err := ss.Channel().CreateSidebarCategory(userId, teamId, &model.SidebarCategoryWithChannels{ Channels: []string{channel1.Id, channel2.Id, dmChannel1.Id}, }) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, newCategory) // Ensure that the categories are set up correctly res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 4) require.Equal(t, model.SidebarCategoryCustom, res.Categories[1].Type) @@ -1914,11 +1914,11 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { // Actually delete the channel err = ss.Channel().DeleteSidebarCategory(newCategory.Id) - assert.Nil(t, err) + assert.NoError(t, err) // Confirm that the category was deleted... res, err = ss.Channel().GetSidebarCategories(userId, teamId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, res.Categories, 3) // ...and that the corresponding SidebarChannel entries were deleted @@ -1929,7 +1929,7 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { SidebarChannels WHERE CategoryId = :CategoryId`, map[string]interface{}{"CategoryId": newCategory.Id}) - require.Nil(t, countErr) + require.NoError(t, countErr) assert.Equal(t, int64(0), count) }) @@ -1937,20 +1937,20 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) { userId, teamId := setupInitialSidebarCategories(t, ss) defer ss.User().PermanentDelete(userId) res, err := ss.Channel().GetSidebarCategories(userId, teamId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, res.Categories, 3) require.Equal(t, model.SidebarCategoryFavorites, res.Categories[0].Type) require.Equal(t, model.SidebarCategoryChannels, res.Categories[1].Type) require.Equal(t, model.SidebarCategoryDirectMessages, res.Categories[2].Type) err = ss.Channel().DeleteSidebarCategory(res.Categories[0].Id) - assert.NotNil(t, err) + assert.Error(t, err) err = ss.Channel().DeleteSidebarCategory(res.Categories[1].Id) - assert.NotNil(t, err) + assert.Error(t, err) err = ss.Channel().DeleteSidebarCategory(res.Categories[2].Id) - assert.NotNil(t, err) + assert.Error(t, err) }) } @@ -1960,14 +1960,14 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ Name: "channel", Type: model.CHANNEL_OPEN, TeamId: teamId, }, 10) - require.Nil(t, nErr) + require.NoError(t, nErr) err := ss.Channel().UpdateSidebarChannelsByPreferences(&model.Preferences{ model.Preference{ @@ -1984,7 +1984,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) { teamId := model.NewId() nErr := ss.Channel().CreateInitialSidebarCategories(userId, teamId) - assert.Nil(t, nErr) + assert.NoError(t, nErr) require.NotPanics(t, func() { _ = ss.Channel().UpdateSidebarChannelsByPreferences(&model.Preferences{ diff --git a/store/storetest/cluster_discovery_store.go b/store/storetest/cluster_discovery_store.go index b4c093437a..300e96b53f 100644 --- a/store/storetest/cluster_discovery_store.go +++ b/store/storetest/cluster_discovery_store.go @@ -30,10 +30,10 @@ func testClusterDiscoveryStore(t *testing.T, ss store.Store) { } err := ss.ClusterDiscovery().Save(discovery) - require.Nil(t, err) + require.NoError(t, err) err = ss.ClusterDiscovery().Cleanup() - require.Nil(t, err) + require.NoError(t, err) } func testClusterDiscoveryStoreDelete(t *testing.T, ss store.Store) { @@ -44,10 +44,10 @@ func testClusterDiscoveryStoreDelete(t *testing.T, ss store.Store) { } err := ss.ClusterDiscovery().Save(discovery) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.ClusterDiscovery().Delete(discovery) - require.Nil(t, err) + require.NoError(t, err) } func testClusterDiscoveryStoreLastPing(t *testing.T, ss store.Store) { @@ -58,20 +58,20 @@ func testClusterDiscoveryStoreLastPing(t *testing.T, ss store.Store) { } err := ss.ClusterDiscovery().Save(discovery) - require.Nil(t, err) + require.NoError(t, err) err = ss.ClusterDiscovery().SetLastPingAt(discovery) - require.Nil(t, err) + require.NoError(t, err) ttime := model.GetMillis() time.Sleep(1 * time.Second) err = ss.ClusterDiscovery().SetLastPingAt(discovery) - require.Nil(t, err) + require.NoError(t, err) list, err := ss.ClusterDiscovery().GetAll(discovery.Type, "cluster_name_lastPing") - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, list, 1) require.Less(t, int64(500), list[0].LastPingAt-ttime) @@ -83,7 +83,7 @@ func testClusterDiscoveryStoreLastPing(t *testing.T, ss store.Store) { } err = ss.ClusterDiscovery().SetLastPingAt(discovery2) - require.Nil(t, err) + require.NoError(t, err) } func testClusterDiscoveryStoreExists(t *testing.T, ss store.Store) { @@ -94,16 +94,16 @@ func testClusterDiscoveryStoreExists(t *testing.T, ss store.Store) { } err := ss.ClusterDiscovery().Save(discovery) - require.Nil(t, err) + require.NoError(t, err) val, err := ss.ClusterDiscovery().Exists(discovery) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, val) discovery.ClusterName = "cluster_name_Exists2" val, err = ss.ClusterDiscovery().Exists(discovery) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, val) } @@ -115,14 +115,14 @@ func testClusterDiscoveryGetStore(t *testing.T, ss store.Store) { Hostname: "hostname1", Type: testType1, } - require.Nil(t, ss.ClusterDiscovery().Save(discovery1)) + require.NoError(t, ss.ClusterDiscovery().Save(discovery1)) discovery2 := &model.ClusterDiscovery{ ClusterName: "cluster_name", Hostname: "hostname2", Type: testType1, } - require.Nil(t, ss.ClusterDiscovery().Save(discovery2)) + require.NoError(t, ss.ClusterDiscovery().Save(discovery2)) discovery3 := &model.ClusterDiscovery{ ClusterName: "cluster_name", @@ -131,7 +131,7 @@ func testClusterDiscoveryGetStore(t *testing.T, ss store.Store) { CreateAt: 1, LastPingAt: 1, } - require.Nil(t, ss.ClusterDiscovery().Save(discovery3)) + require.NoError(t, ss.ClusterDiscovery().Save(discovery3)) testType2 := model.NewId() @@ -140,17 +140,17 @@ func testClusterDiscoveryGetStore(t *testing.T, ss store.Store) { Hostname: "hostname1", Type: testType2, } - require.Nil(t, ss.ClusterDiscovery().Save(discovery4)) + require.NoError(t, ss.ClusterDiscovery().Save(discovery4)) list, err := ss.ClusterDiscovery().GetAll(testType1, "cluster_name") - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, list, 2) list, err = ss.ClusterDiscovery().GetAll(testType2, "cluster_name") - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, list, 1) list, err = ss.ClusterDiscovery().GetAll(model.NewId(), "cluster_name") - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, list) } diff --git a/store/storetest/command_store.go b/store/storetest/command_store.go index a77b50fb45..b2ecb2dfef 100644 --- a/store/storetest/command_store.go +++ b/store/storetest/command_store.go @@ -34,10 +34,10 @@ func testCommandStoreSave(t *testing.T, ss store.Store) { o1.Trigger = "trigger" _, nErr := ss.Command().Save(&o1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Command().Save(&o1) - require.NotNil(t, err, "shouldn't be able to update from save") + require.Error(t, err, "shouldn't be able to update from save") } func testCommandStoreGet(t *testing.T, ss store.Store) { @@ -49,14 +49,14 @@ func testCommandStoreGet(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Command().Get(o1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command") _, err := ss.Command().Get("123") - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -70,15 +70,15 @@ func testCommandStoreGetByTeam(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Command().GetByTeam(o1.TeamId) - require.Nil(t, nErr) + require.NoError(t, nErr) require.NotEmpty(t, r1, "no command returned") require.Equal(t, r1[0].CreateAt, o1.CreateAt, "invalid returned command") result, nErr := ss.Command().GetByTeam("123") - require.Nil(t, nErr) + require.NoError(t, nErr) require.Empty(t, result, "no commands should have returned") } @@ -98,21 +98,21 @@ func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) { o2.Trigger = "trigger1" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Command().Save(o2) - require.Nil(t, nErr) + require.NoError(t, nErr) var r1 *model.Command r1, nErr = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, r1.Id, o1.Id, "invalid returned command") nErr = ss.Command().Delete(o1.Id, model.GetMillis()) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Command().GetByTrigger(o1.TeamId, o1.Trigger) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -126,17 +126,17 @@ func testCommandStoreDelete(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Command().Get(o1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command") nErr = ss.Command().Delete(o1.Id, model.GetMillis()) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Command().Get(o1.Id) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -150,17 +150,17 @@ func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Command().Get(o1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command") nErr = ss.Command().PermanentDeleteByTeam(o1.TeamId) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Command().Get(o1.Id) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -174,17 +174,17 @@ func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Command().Get(o1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command") nErr = ss.Command().PermanentDeleteByUser(o1.CreatorId) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err := ss.Command().Get(o1.Id) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -198,17 +198,17 @@ func testCommandStoreUpdate(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1.Token = model.NewId() _, nErr = ss.Command().Update(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1.URL = "junk" _, err := ss.Command().Update(o1) - require.NotNil(t, err) + require.Error(t, err) } func testCommandCount(t *testing.T, ss store.Store) { @@ -220,13 +220,13 @@ func testCommandCount(t *testing.T, ss store.Store) { o1.Trigger = "trigger" o1, nErr := ss.Command().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Command().AnalyticsCommandCount("") - require.Nil(t, nErr) + require.NoError(t, nErr) require.NotZero(t, r1, "should be at least 1 command") r2, nErr := ss.Command().AnalyticsCommandCount(o1.TeamId) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, r2, int64(1), "should be 1 command") } diff --git a/store/storetest/command_webhook_store.go b/store/storetest/command_webhook_store.go index 8698efead9..c879a8e5ad 100644 --- a/store/storetest/command_webhook_store.go +++ b/store/storetest/command_webhook_store.go @@ -26,11 +26,11 @@ func testCommandWebhookStore(t *testing.T, ss store.Store) { h1.UserId = model.NewId() h1.ChannelId = model.NewId() h1, err := cws.Save(h1) - require.Nil(t, err) + require.NoError(t, err) var r1 *model.CommandWebhook r1, nErr := cws.Get(h1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, *r1, *h1, "invalid returned webhook") _, nErr = cws.Get("123") @@ -43,25 +43,25 @@ func testCommandWebhookStore(t *testing.T, ss store.Store) { h2.UserId = model.NewId() h2.ChannelId = model.NewId() h2, err = cws.Save(h2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = cws.Get(h2.Id) - require.NotNil(t, nErr, "Should have set the status as not found for expired webhook") + require.Error(t, nErr, "Should have set the status as not found for expired webhook") require.True(t, errors.As(nErr, &nfErr), "Should have set the status as not found for expired webhook") cws.Cleanup() _, nErr = cws.Get(h1.Id) - require.Nil(t, nErr, "Should have no error getting unexpired webhook") + require.NoError(t, nErr, "Should have no error getting unexpired webhook") _, nErr = cws.Get(h2.Id) require.True(t, errors.As(nErr, &nfErr), "Should have set the status as not found for expired webhook") nErr = cws.TryUse(h1.Id, 1) - require.Nil(t, nErr, "Should be able to use webhook once") + require.NoError(t, nErr, "Should be able to use webhook once") nErr = cws.TryUse(h1.Id, 1) - require.NotNil(t, nErr, "Should be able to use webhook once") + require.Error(t, nErr, "Should be able to use webhook once") var invErr *store.ErrInvalidInput require.True(t, errors.As(nErr, &invErr), "Should be able to use webhook once") } diff --git a/store/storetest/compliance_store.go b/store/storetest/compliance_store.go index 40554a8d25..dd875f9950 100644 --- a/store/storetest/compliance_store.go +++ b/store/storetest/compliance_store.go @@ -18,30 +18,30 @@ import ( func cleanupStoreState(t *testing.T, ss store.Store) { //remove existing users allUsers, err := ss.User().GetAll() - require.Nilf(t, err, "error cleaning all test users: %v", err) + require.NoError(t, err, "error cleaning all test users", err) for _, u := range allUsers { err = ss.User().PermanentDelete(u.Id) - require.Nil(t, err, "failed cleaning up test user %s", u.Username) + require.NoError(t, err, "failed cleaning up test user %s", u.Username) //remove all posts by this user nErr := ss.Post().PermanentDeleteByUser(u.Id) - require.Nil(t, nErr, "failed cleaning all posts of test user %s", u.Username) + require.NoError(t, nErr, "failed cleaning all posts of test user %s", u.Username) } //remove existing channels allChannels, nErr := ss.Channel().GetAllChannels(0, 100000, store.ChannelSearchOpts{IncludeDeleted: true}) - require.Nilf(t, nErr, "error cleaning all test channels: %v", nErr) + require.NoError(t, nErr, "error cleaning all test channels", nErr) for _, channel := range *allChannels { nErr = ss.Channel().PermanentDelete(channel.Id) - require.Nil(t, nErr, "failed cleaning up test channel %s", channel.Id) + require.NoError(t, nErr, "failed cleaning up test channel %s", channel.Id) } //remove existing teams allTeams, nErr := ss.Team().GetAll() - require.Nilf(t, nErr, "error cleaning all test teams: %v", nErr) + require.NoError(t, nErr, "error cleaning all test teams", nErr) for _, team := range allTeams { err := ss.Team().PermanentDelete(team.Id) - require.Nil(t, err, "failed cleaning up test team %s", team.Id) + require.NoError(t, err, "failed cleaning up test team %s", team.Id) } } @@ -62,12 +62,12 @@ func TestComplianceStore(t *testing.T, ss store.Store) { func testComplianceStore(t *testing.T, ss store.Store) { compliance1 := &model.Compliance{Desc: "Audit for federal subpoena case #22443", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_FAILED, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC} _, err := ss.Compliance().Save(compliance1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(100 * time.Millisecond) compliance2 := &model.Compliance{Desc: "Audit for federal subpoena case #11458", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_RUNNING, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC} _, err = ss.Compliance().Save(compliance2) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(100 * time.Millisecond) compliances, _ := ss.Compliance().GetAll(0, 1000) @@ -77,7 +77,7 @@ func testComplianceStore(t *testing.T, ss store.Store) { compliance2.Status = model.COMPLIANCE_STATUS_FAILED _, err = ss.Compliance().Update(compliance2) - require.Nil(t, err) + require.NoError(t, err) compliances, _ = ss.Compliance().GetAll(0, 1000) @@ -105,23 +105,23 @@ func testComplianceExport(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN t1, err := ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{} u1.Email = MakeEmail() u1.Username = model.NewId() u1, err = ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Username = model.NewId() u2, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1 := &model.Channel{} c1.TeamId = t1.Id @@ -129,7 +129,7 @@ func testComplianceExport(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, nErr = ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := &model.Post{} o1.ChannelId = c1.Id @@ -137,7 +137,7 @@ func testComplianceExport(t *testing.T, ss store.Store) { o1.CreateAt = model.GetMillis() o1.Message = "zz" + model.NewId() + "b" o1, nErr = ss.Post().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1a := &model.Post{} o1a.ChannelId = c1.Id @@ -145,7 +145,7 @@ func testComplianceExport(t *testing.T, ss store.Store) { o1a.CreateAt = o1.CreateAt + 10 o1a.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o1a) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := &model.Post{} o2.ChannelId = c1.Id @@ -153,7 +153,7 @@ func testComplianceExport(t *testing.T, ss store.Store) { o2.CreateAt = o1.CreateAt + 20 o2.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o2) - require.Nil(t, nErr) + require.NoError(t, nErr) o2a := &model.Post{} o2a.ChannelId = c1.Id @@ -161,45 +161,45 @@ func testComplianceExport(t *testing.T, ss store.Store) { o2a.CreateAt = o1.CreateAt + 30 o2a.Message = "zz" + model.NewId() + "b" o2a, nErr = ss.Post().Save(o2a) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(100 * time.Millisecond) cr1 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o2a.CreateAt + 1} cposts, nErr := ss.Compliance().ComplianceExport(cr1) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 4) assert.Equal(t, cposts[0].PostId, o1.Id) assert.Equal(t, cposts[3].PostId, o2a.Id) cr2 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o2a.CreateAt + 1, Emails: u2.Email} cposts, nErr = ss.Compliance().ComplianceExport(cr2) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 1) assert.Equal(t, cposts[0].PostId, o2a.Id) cr3 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o2a.CreateAt + 1, Emails: u2.Email + ", " + u1.Email} cposts, nErr = ss.Compliance().ComplianceExport(cr3) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 4) assert.Equal(t, cposts[0].PostId, o1.Id) assert.Equal(t, cposts[3].PostId, o2a.Id) cr4 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o2a.CreateAt + 1, Keywords: o2a.Message} cposts, nErr = ss.Compliance().ComplianceExport(cr4) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 1) assert.Equal(t, cposts[0].PostId, o2a.Id) cr5 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o2a.CreateAt + 1, Keywords: o2a.Message + " " + o1.Message} cposts, nErr = ss.Compliance().ComplianceExport(cr5) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 2) assert.Equal(t, cposts[0].PostId, o1.Id) cr6 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o2a.CreateAt + 1, Emails: u2.Email + ", " + u1.Email, Keywords: o2a.Message + " " + o1.Message} cposts, nErr = ss.Compliance().ComplianceExport(cr6) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 2) assert.Equal(t, cposts[0].PostId, o1.Id) assert.Equal(t, cposts[1].PostId, o2a.Id) @@ -214,23 +214,23 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN t1, err := ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{} u1.Email = MakeEmail() u1.Username = model.NewId() u1, err = ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Username = model.NewId() u2, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1 := &model.Channel{} c1.TeamId = t1.Id @@ -238,17 +238,17 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, nErr = ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) cDM, nErr := ss.Channel().CreateDirectChannel(u1, u2) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := &model.Post{} o1.ChannelId = c1.Id o1.UserId = u1.Id o1.CreateAt = model.GetMillis() o1.Message = "zz" + model.NewId() + "b" o1, nErr = ss.Post().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1a := &model.Post{} o1a.ChannelId = c1.Id @@ -256,7 +256,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { o1a.CreateAt = o1.CreateAt + 10 o1a.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o1a) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := &model.Post{} o2.ChannelId = c1.Id @@ -264,7 +264,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { o2.CreateAt = o1.CreateAt + 20 o2.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o2) - require.Nil(t, nErr) + require.NoError(t, nErr) o2a := &model.Post{} o2a.ChannelId = c1.Id @@ -272,7 +272,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { o2a.CreateAt = o1.CreateAt + 30 o2a.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o2a) - require.Nil(t, nErr) + require.NoError(t, nErr) o3 := &model.Post{} o3.ChannelId = cDM.Id @@ -280,13 +280,13 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) { o3.CreateAt = o1.CreateAt + 40 o3.Message = "zz" + model.NewId() + "b" o3, nErr = ss.Post().Save(o3) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(100 * time.Millisecond) cr1 := &model.Compliance{Desc: "test" + model.NewId(), StartAt: o1.CreateAt - 1, EndAt: o3.CreateAt + 1, Emails: u1.Email} cposts, nErr := ss.Compliance().ComplianceExport(cr1) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, cposts, 4) assert.Equal(t, cposts[0].PostId, o1.Id) assert.Equal(t, cposts[len(cposts)-1].PostId, o3.Id) @@ -298,7 +298,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -309,7 +309,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // and two users that are a part of that team user1 := &model.User{ @@ -317,24 +317,24 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // need a public channel channel := &model.Channel{ @@ -344,7 +344,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts twice in the public channel post1 := &model.Post{ @@ -354,7 +354,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "a", } post1, err = ss.Post().Save(post1) - require.Nil(t, err) + require.NoError(t, err) post2 := &model.Post{ ChannelId: channel.Id, @@ -363,12 +363,12 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "b", } post2, err = ss.Post().Save(post2) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports for both posts that user1 sent messageExportMap := map[string]model.MessageExport{} messages, err = ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, len(messages)) for _, v := range messages { @@ -402,7 +402,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -413,7 +413,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // and two users that are a part of that team user1 := &model.User{ @@ -421,24 +421,24 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // need a private channel channel := &model.Channel{ @@ -448,7 +448,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts twice in the private channel post1 := &model.Post{ @@ -458,7 +458,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "a", } post1, err = ss.Post().Save(post1) - require.Nil(t, err) + require.NoError(t, err) post2 := &model.Post{ ChannelId: channel.Id, @@ -467,12 +467,12 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "b", } post2, err = ss.Post().Save(post2) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports for both posts that user1 sent messageExportMap := map[string]model.MessageExport{} messages, err = ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, len(messages)) for _, v := range messages { @@ -508,7 +508,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -519,7 +519,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // and two users that are a part of that team user1 := &model.User{ @@ -527,28 +527,28 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // as well as a DM channel between those users directMessageChannel, nErr := ss.Channel().CreateDirectChannel(user1, user2) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 also sends a DM to user2 post := &model.Post{ @@ -558,12 +558,12 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "c", } post, err = ss.Post().Save(post) - require.Nil(t, err) + require.NoError(t, err) // fetch the message export for the post that user1 sent messageExportMap := map[string]model.MessageExport{} messages, err = ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, len(messages)) @@ -589,7 +589,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -600,7 +600,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // and three users that are a part of that team user1 := &model.User{ @@ -608,36 +608,36 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user2.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user3.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // can't create a group channel directly, because importing app creates an import cycle, so we have to fake it groupMessageChannel := &model.Channel{ @@ -646,7 +646,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_GROUP, } groupMessageChannel, nErr = ss.Channel().Save(groupMessageChannel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts in the GM post := &model.Post{ @@ -656,12 +656,12 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "c", } post, err = ss.Post().Save(post) - require.Nil(t, err) + require.NoError(t, err) // fetch the message export for the post that user1 sent messageExportMap := map[string]model.MessageExport{} messages, err = ss.Compliance().MessageExport(startTime-10, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, len(messages)) for _, v := range messages { @@ -686,7 +686,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -697,7 +697,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // need a user part of that team user1 := &model.User{ @@ -705,12 +705,12 @@ func testEditExportMessage(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // need a public channel channel := &model.Channel{ @@ -720,7 +720,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts in the public channel post1 := &model.Post{ @@ -730,7 +730,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "a", } post1, err = ss.Post().Save(post1) - require.Nil(t, err) + require.NoError(t, err) //user 1 edits the previous post post1e := &model.Post{} @@ -738,11 +738,11 @@ func testEditExportMessage(t *testing.T, ss store.Store) { post1e.Message = "edit " + post1.Message post1e, err = ss.Post().Update(post1e, post1) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports from the start messages, err = ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, len(messages)) for _, v := range messages { @@ -779,7 +779,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -790,7 +790,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // need a user part of that team user1 := &model.User{ @@ -798,12 +798,12 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // need a public channel channel := &model.Channel{ @@ -813,7 +813,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts in the public channel post1 := &model.Post{ @@ -823,11 +823,11 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "a", } post1, err = ss.Post().Save(post1) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports from the start messages, err = ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, len(messages)) v := messages[0] @@ -850,11 +850,11 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) { post1e.EditAt = postEditTime post1e.Message = "edit " + post1.Message post1e, err = ss.Post().Update(post1e, post1) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports after edit messages, err = ss.Compliance().MessageExport(postEditTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, len(messages)) for _, v := range messages { @@ -891,7 +891,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -902,7 +902,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // need a user part of that team user1 := &model.User{ @@ -910,12 +910,12 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // need a public channel channel := &model.Channel{ @@ -925,7 +925,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts in the public channel post1 := &model.Post{ @@ -935,16 +935,16 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "a", } post1, err = ss.Post().Save(post1) - require.Nil(t, err) + require.NoError(t, err) //user 1 deletes the previous post postDeleteTime := post1.UpdateAt + 1 err = ss.Post().Delete(post1.Id, postDeleteTime, user1.Id) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports from the start messages, err = ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, len(messages)) v := messages[0] @@ -957,7 +957,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) { props := map[string]interface{}{} e := json.Unmarshal([]byte(*v.PostProps), &props) - require.Nil(t, e) + require.NoError(t, e) _, ok := props[model.POST_PROPS_DELETE_BY] assert.True(t, ok) @@ -976,7 +976,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { // get the starting number of message export entries startTime := model.GetMillis() messages, err := ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(messages)) // need a team @@ -987,7 +987,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // need a user part of that team user1 := &model.User{ @@ -995,12 +995,12 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{ TeamId: team.Id, UserId: user1.Id, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // need a public channel channel := &model.Channel{ @@ -1010,7 +1010,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, nErr = ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // user1 posts in the public channel post1 := &model.Post{ @@ -1020,11 +1020,11 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { Message: "zz" + model.NewId() + "a", } post1, err = ss.Post().Save(post1) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports from the start messages, err = ss.Compliance().MessageExport(startTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, len(messages)) v := messages[0] @@ -1043,11 +1043,11 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { //user 1 deletes the previous post postDeleteTime := post1.UpdateAt + 1 err = ss.Post().Delete(post1.Id, postDeleteTime, user1.Id) - require.Nil(t, err) + require.NoError(t, err) // fetch the message exports after delete messages, err = ss.Compliance().MessageExport(postDeleteTime-1, 10) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 1, len(messages)) v = messages[0] @@ -1060,7 +1060,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) { props := map[string]interface{}{} e := json.Unmarshal([]byte(*v.PostProps), &props) - require.Nil(t, e) + require.NoError(t, e) _, ok := props[model.POST_PROPS_DELETE_BY] assert.True(t, ok) diff --git a/store/storetest/emoji_store.go b/store/storetest/emoji_store.go index 14774923ee..6501f8ca66 100644 --- a/store/storetest/emoji_store.go +++ b/store/storetest/emoji_store.go @@ -30,7 +30,7 @@ func testEmojiSaveDelete(t *testing.T, ss store.Store) { } _, err := ss.Emoji().Save(emoji1) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, emoji1.Id, 26, "should've set id for emoji") @@ -39,16 +39,16 @@ func testEmojiSaveDelete(t *testing.T, ss store.Store) { Name: emoji1.Name, } _, err = ss.Emoji().Save(&emoji2) - require.NotNil(t, err, "shouldn't be able to save emoji with duplicate name") + require.Error(t, err, "shouldn't be able to save emoji with duplicate name") err = ss.Emoji().Delete(emoji1, time.Now().Unix()) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Emoji().Save(&emoji2) - require.Nil(t, err, "should be able to save emoji with duplicate name now that original has been deleted") + require.NoError(t, err, "should be able to save emoji with duplicate name now that original has been deleted") err = ss.Emoji().Delete(&emoji2, time.Now().Unix()+1) - require.Nil(t, err) + require.NoError(t, err) } func testEmojiGet(t *testing.T, ss store.Store) { @@ -69,24 +69,24 @@ func testEmojiGet(t *testing.T, ss store.Store) { for i, emoji := range emojis { data, err := ss.Emoji().Save(&emoji) - require.Nil(t, err) + require.NoError(t, err) emojis[i] = *data } defer func() { for _, emoji := range emojis { err := ss.Emoji().Delete(&emoji, time.Now().Unix()) - require.Nil(t, err) + require.NoError(t, err) } }() for _, emoji := range emojis { _, err := ss.Emoji().Get(emoji.Id, false) - require.Nilf(t, err, "failed to get emoji with id %v", emoji.Id) + require.NoErrorf(t, err, "failed to get emoji with id %v", emoji.Id) } for _, emoji := range emojis { _, err := ss.Emoji().Get(emoji.Id, true) - require.Nilf(t, err, "failed to get emoji with id %v", emoji.Id) + require.NoErrorf(t, err, "failed to get emoji with id %v", emoji.Id) } } @@ -108,19 +108,19 @@ func testEmojiGetByName(t *testing.T, ss store.Store) { for i, emoji := range emojis { data, err := ss.Emoji().Save(&emoji) - require.Nil(t, err) + require.NoError(t, err) emojis[i] = *data } defer func() { for _, emoji := range emojis { err := ss.Emoji().Delete(&emoji, time.Now().Unix()) - require.Nil(t, err) + require.NoError(t, err) } }() for _, emoji := range emojis { _, err := ss.Emoji().GetByName(emoji.Name, true) - require.Nilf(t, err, "failed to get emoji with name %v", emoji.Name) + require.NoErrorf(t, err, "failed to get emoji with name %v", emoji.Name) } } @@ -142,38 +142,38 @@ func testEmojiGetMultipleByName(t *testing.T, ss store.Store) { for i, emoji := range emojis { data, err := ss.Emoji().Save(&emoji) - require.Nil(t, err) + require.NoError(t, err) emojis[i] = *data } defer func() { for _, emoji := range emojis { err := ss.Emoji().Delete(&emoji, time.Now().Unix()) - require.Nil(t, err) + require.NoError(t, err) } }() t.Run("one emoji", func(t *testing.T) { received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name}) - require.Nilf(t, err, "could not get emoji") + require.NoError(t, err, "could not get emoji") require.Len(t, received, 1, "got incorrect emoji") require.Equal(t, *received[0], emojis[0], "got incorrect emoji") }) t.Run("multiple emojis", func(t *testing.T) { received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name, emojis[1].Name, emojis[2].Name}) - require.Nil(t, err, "could not get emojis") + require.NoError(t, err, "could not get emojis") require.Len(t, received, 3, "got incorrect emojis") }) t.Run("one nonexistent emoji", func(t *testing.T) { received, err := ss.Emoji().GetMultipleByName([]string{"ab"}) - require.Nilf(t, err, "%v, could not get emoji", err) + require.NoError(t, err, "could not get emoji", err) require.Empty(t, received, "got incorrect emoji") }) t.Run("multiple emojis with nonexistent names", func(t *testing.T) { received, err := ss.Emoji().GetMultipleByName([]string{emojis[0].Name, emojis[1].Name, emojis[2].Name, "abcd", "1234"}) - require.Nil(t, err, "could not get emojis") + require.NoError(t, err, "could not get emojis") require.Len(t, received, 3, "got incorrect emojis") }) } @@ -196,18 +196,18 @@ func testEmojiGetList(t *testing.T, ss store.Store) { for i, emoji := range emojis { data, err := ss.Emoji().Save(&emoji) - require.Nil(t, err) + require.NoError(t, err) emojis[i] = *data } defer func() { for _, emoji := range emojis { err := ss.Emoji().Delete(&emoji, time.Now().Unix()) - require.Nil(t, err) + require.NoError(t, err) } }() result, err := ss.Emoji().GetList(0, 100, "") - require.Nil(t, err) + require.NoError(t, err) for _, emoji := range emojis { found := false @@ -223,14 +223,14 @@ func testEmojiGetList(t *testing.T, ss store.Store) { } remojis, err := ss.Emoji().GetList(0, 3, model.EMOJI_SORT_BY_NAME) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, 3, len(remojis)) assert.Equal(t, emojis[0].Name, remojis[0].Name) assert.Equal(t, emojis[1].Name, remojis[1].Name) assert.Equal(t, emojis[2].Name, remojis[2].Name) remojis, err = ss.Emoji().GetList(1, 2, model.EMOJI_SORT_BY_NAME) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, 2, len(remojis)) assert.Equal(t, emojis[1].Name, remojis[0].Name) assert.Equal(t, emojis[2].Name, remojis[1].Name) @@ -259,20 +259,20 @@ func testEmojiSearch(t *testing.T, ss store.Store) { for i, emoji := range emojis { data, err := ss.Emoji().Save(&emoji) - require.Nil(t, err) + require.NoError(t, err) emojis[i] = *data } defer func() { for _, emoji := range emojis { err := ss.Emoji().Delete(&emoji, time.Now().Unix()) - require.Nil(t, err) + require.NoError(t, err) } }() shouldFind := []bool{true, false, false, false} result, err := ss.Emoji().Search("blargh", true, 100) - require.Nil(t, err) + require.NoError(t, err) for i, emoji := range emojis { found := false @@ -288,7 +288,7 @@ func testEmojiSearch(t *testing.T, ss store.Store) { shouldFind = []bool{true, true, true, false} result, err = ss.Emoji().Search("blargh", false, 100) - require.Nil(t, err) + require.NoError(t, err) for i, emoji := range emojis { found := false diff --git a/store/storetest/file_info_store.go b/store/storetest/file_info_store.go index 53b7accad5..db68dd7652 100644 --- a/store/storetest/file_info_store.go +++ b/store/storetest/file_info_store.go @@ -36,7 +36,7 @@ func testFileInfoSaveGet(t *testing.T, ss store.Store) { } info, err := ss.FileInfo().Save(info) - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, len(info.Id), 0) defer func() { @@ -44,7 +44,7 @@ func testFileInfoSaveGet(t *testing.T, ss store.Store) { }() rinfo, err := ss.FileInfo().Get(info.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, info.Id, rinfo.Id) info2, err := ss.FileInfo().Save(&model.FileInfo{ @@ -52,10 +52,10 @@ func testFileInfoSaveGet(t *testing.T, ss store.Store) { Path: "file.txt", DeleteAt: 123, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.FileInfo().Get(info2.Id) - assert.NotNil(t, err) + assert.Error(t, err) defer func() { ss.FileInfo().PermanentDelete(info2.Id) @@ -69,14 +69,14 @@ func testFileInfoSaveGetByPath(t *testing.T, ss store.Store) { } info, err := ss.FileInfo().Save(info) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, len(info.Id), 0) defer func() { ss.FileInfo().PermanentDelete(info.Id) }() rinfo, err := ss.FileInfo().GetByPath(info.Path) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, info.Id, rinfo.Id) info2, err := ss.FileInfo().Save(&model.FileInfo{ @@ -84,10 +84,10 @@ func testFileInfoSaveGetByPath(t *testing.T, ss store.Store) { Path: "file.txt", DeleteAt: 123, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.FileInfo().GetByPath(info2.Id) - assert.NotNil(t, err) + assert.Error(t, err) defer func() { ss.FileInfo().PermanentDelete(info2.Id) @@ -124,7 +124,7 @@ func testFileInfoGetForPost(t *testing.T, ss store.Store) { for i, info := range infos { newInfo, err := ss.FileInfo().Save(info) - require.Nil(t, err) + require.NoError(t, err) infos[i] = newInfo defer func(id string) { ss.FileInfo().PermanentDelete(id) @@ -205,7 +205,7 @@ func testFileInfoGetForPost(t *testing.T, ss store.Store) { tc.IncludeDeleted, tc.AllowFromCache, ) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, postInfos, tc.ExpectedPosts) }) @@ -242,7 +242,7 @@ func testFileInfoGetForUser(t *testing.T, ss store.Store) { for i, info := range infos { newInfo, err := ss.FileInfo().Save(info) - require.Nil(t, err) + require.NoError(t, err) infos[i] = newInfo defer func(id string) { ss.FileInfo().PermanentDelete(id) @@ -250,11 +250,11 @@ func testFileInfoGetForUser(t *testing.T, ss store.Store) { } userPosts, err := ss.FileInfo().GetForUser(userId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, userPosts, 3) userPosts, err = ss.FileInfo().GetForUser(userId2) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, userPosts, 1) } @@ -264,7 +264,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) { post.ChannelId = chId post.UserId = user _, err := ss.Post().Save(&post) - require.Nil(t, err) + require.NoError(t, err) return &post } @@ -281,7 +281,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) { fileInfo.PostId = post.Id } _, err := ss.FileInfo().Save(&fileInfo) - require.Nil(t, err) + require.NoError(t, err) return fileInfo } @@ -306,7 +306,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) { // delete a file _, err := ss.FileInfo().DeleteForPost(file2_2.PostId) - require.Nil(t, err) + require.NoError(t, err) testCases := []struct { Name string @@ -386,7 +386,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { fileInfos, err := ss.FileInfo().GetWithOptions(tc.Page, tc.PerPage, tc.Opt) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, fileInfos, len(tc.ExpectedFileIds)) for i := range tc.ExpectedFileIds { assert.Equal(t, tc.ExpectedFileIds[i], fileInfos[i].Id) @@ -410,26 +410,26 @@ func testFileInfoAttachToPost(t *testing.T, ss store.Store) { CreatorId: userId, Path: "file.txt", }) - require.Nil(t, err) + require.NoError(t, err) info2, err := ss.FileInfo().Save(&model.FileInfo{ CreatorId: userId, Path: "file2.txt", }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "", info1.PostId) require.Equal(t, "", info2.PostId) err = ss.FileInfo().AttachToPost(info1.Id, postId, userId) - assert.Nil(t, err) + assert.NoError(t, err) info1.PostId = postId err = ss.FileInfo().AttachToPost(info2.Id, postId, userId) - assert.Nil(t, err) + assert.NoError(t, err) info2.PostId = postId data, err := ss.FileInfo().GetForPost(postId, true, false, false) - require.Nil(t, err) + require.NoError(t, err) expected := []*model.FileInfo{info1, info2} sort.Sort(byFileInfoId(expected)) @@ -445,15 +445,15 @@ func testFileInfoAttachToPost(t *testing.T, ss store.Store) { CreatorId: userId, Path: "file.txt", }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "", info.PostId) err = ss.FileInfo().AttachToPost(info.Id, model.NewId(), userId) - require.Nil(t, err) + require.NoError(t, err) err = ss.FileInfo().AttachToPost(info.Id, postId, userId) - require.NotNil(t, err) + require.Error(t, err) }) t.Run("should not attach files owned from a different user", func(t *testing.T) { @@ -464,12 +464,12 @@ func testFileInfoAttachToPost(t *testing.T, ss store.Store) { CreatorId: model.NewId(), Path: "file.txt", }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "", info.PostId) err = ss.FileInfo().AttachToPost(info.Id, postId, userId) - assert.NotNil(t, err) + assert.Error(t, err) }) t.Run("should attach files uploaded by nouser", func(t *testing.T) { @@ -479,14 +479,14 @@ func testFileInfoAttachToPost(t *testing.T, ss store.Store) { CreatorId: "nouser", Path: "file.txt", }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "", info.PostId) err = ss.FileInfo().AttachToPost(info.Id, postId, model.NewId()) - require.Nil(t, err) + require.NoError(t, err) data, err := ss.FileInfo().GetForPost(postId, true, false, false) - require.Nil(t, err) + require.NoError(t, err) info.PostId = postId assert.EqualValues(t, []*model.FileInfo{info}, data) }) @@ -522,7 +522,7 @@ func testFileInfoDeleteForPost(t *testing.T, ss store.Store) { for i, info := range infos { newInfo, err := ss.FileInfo().Save(info) - require.Nil(t, err) + require.NoError(t, err) infos[i] = newInfo defer func(id string) { ss.FileInfo().PermanentDelete(id) @@ -530,10 +530,10 @@ func testFileInfoDeleteForPost(t *testing.T, ss store.Store) { } _, err := ss.FileInfo().DeleteForPost(postId) - require.Nil(t, err) + require.NoError(t, err) infos, err = ss.FileInfo().GetForPost(postId, true, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, infos) } @@ -543,10 +543,10 @@ func testFileInfoPermanentDelete(t *testing.T, ss store.Store) { CreatorId: model.NewId(), Path: "file.txt", }) - require.Nil(t, err) + require.NoError(t, err) err = ss.FileInfo().PermanentDelete(info.Id) - require.Nil(t, err) + require.NoError(t, err) } func testFileInfoPermanentDeleteBatch(t *testing.T, ss store.Store) { @@ -558,7 +558,7 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, ss store.Store) { Path: "file.txt", CreateAt: 1000, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.FileInfo().Save(&model.FileInfo{ PostId: postId, @@ -566,7 +566,7 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, ss store.Store) { Path: "file.txt", CreateAt: 1200, }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.FileInfo().Save(&model.FileInfo{ PostId: postId, @@ -574,17 +574,17 @@ func testFileInfoPermanentDeleteBatch(t *testing.T, ss store.Store) { Path: "file.txt", CreateAt: 2000, }) - require.Nil(t, err) + require.NoError(t, err) postFiles, err := ss.FileInfo().GetForPost(postId, true, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, postFiles, 3) _, err = ss.FileInfo().PermanentDeleteBatch(1500, 1000) - require.Nil(t, err) + require.NoError(t, err) postFiles, err = ss.FileInfo().GetForPost(postId, true, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, postFiles, 1) } @@ -597,8 +597,8 @@ func testFileInfoPermanentDeleteByUser(t *testing.T, ss store.Store) { CreatorId: userId, Path: "file.txt", }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.FileInfo().PermanentDeleteByUser(userId) - require.Nil(t, err) + require.NoError(t, err) } diff --git a/store/storetest/group_store.go b/store/storetest/group_store.go index 85c144d78e..d4c759e2f2 100644 --- a/store/storetest/group_store.go +++ b/store/storetest/group_store.go @@ -97,7 +97,7 @@ func testGroupStoreCreate(t *testing.T, ss store.Store) { // Happy path d1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, d1.Id, 26) require.Equal(t, *g1.Name, *d1.Name) require.Equal(t, g1.DisplayName, d1.DisplayName) @@ -116,7 +116,7 @@ func testGroupStoreCreate(t *testing.T, ss store.Store) { } data, err := ss.Group().Create(g2) require.Nil(t, data) - require.NotNil(t, err) + require.Error(t, err) var appErr *model.AppError require.True(t, errors.As(err, &appErr)) require.Equal(t, appErr.Id, "model.group.display_name.app_error") @@ -129,7 +129,7 @@ func testGroupStoreCreate(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } _, err = ss.Group().Create(g4) - require.Nil(t, err) + require.NoError(t, err) g4b := &model.Group{ Name: g4.Name, DisplayName: model.NewId(), @@ -197,12 +197,12 @@ func testGroupStoreGet(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } d1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, d1.Id, 26) // Get the group d2, err := ss.Group().Get(d1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, d1.Id, d2.Id) require.Equal(t, *d1.Name, *d2.Name) require.Equal(t, d1.DisplayName, d2.DisplayName) @@ -214,7 +214,7 @@ func testGroupStoreGet(t *testing.T, ss store.Store) { // Get an invalid group _, err = ss.Group().Get(model.NewId()) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -233,12 +233,12 @@ func testGroupStoreGetByName(t *testing.T, ss store.Store) { } d1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, d1.Id, 26) // Get the group d2, err := ss.Group().GetByName(*d1.Name, g1Opts) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, d1.Id, d2.Id) require.Equal(t, *d1.Name, *d2.Name) require.Equal(t, d1.DisplayName, d2.DisplayName) @@ -250,7 +250,7 @@ func testGroupStoreGetByName(t *testing.T, ss store.Store) { // Get an invalid group _, err = ss.Group().GetByName(model.NewId(), g1Opts) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -268,7 +268,7 @@ func testGroupStoreGetByIDs(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(group) - require.Nil(t, err) + require.NoError(t, err) switch i { case 0: group1 = group @@ -278,7 +278,7 @@ func testGroupStoreGetByIDs(t *testing.T, ss store.Store) { } groups, err := ss.Group().GetByIDs([]string{group1.Id, group2.Id}) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, groups, 2) for i := 0; i < 2; i++ { @@ -298,12 +298,12 @@ func testGroupStoreGetByRemoteID(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } d1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, d1.Id, 26) // Get the group d2, err := ss.Group().GetByRemoteID(d1.RemoteId, model.GroupSourceLdap) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, d1.Id, d2.Id) require.Equal(t, *d1.Name, *d2.Name) require.Equal(t, d1.DisplayName, d2.DisplayName) @@ -315,7 +315,7 @@ func testGroupStoreGetByRemoteID(t *testing.T, ss store.Store) { // Get an invalid group _, err = ss.Group().GetByRemoteID(model.NewId(), model.GroupSource("fake")) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) } @@ -336,12 +336,12 @@ func testGroupStoreGetAllByType(t *testing.T, ss store.Store) { } groups = append(groups, g) _, err := ss.Group().Create(g) - require.Nil(t, err) + require.NoError(t, err) } // Returns all the groups d1, err := ss.Group().GetAllBySource(model.GroupSourceLdap) - require.Nil(t, err) + require.NoError(t, err) require.Condition(t, func() bool { return len(d1) >= numGroups }) for _, expectedGroup := range groups { present := false @@ -365,7 +365,7 @@ func testGroupStoreGetByUser(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } g1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) g2 := &model.Group{ Name: model.NewString(model.NewId()), @@ -375,32 +375,32 @@ func testGroupStoreGetByUser(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } g2, err = ss.Group().Create(g2) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } u1, nErr := ss.User().Save(u1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(g1.Id, u1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(g2.Id, u1.Id) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } u2, nErr = ss.User().Save(u2) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(g2.Id, u2.Id) - require.Nil(t, err) + require.NoError(t, err) groups, err := ss.Group().GetByUser(u1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 2, len(groups)) found1 := false found2 := false @@ -416,12 +416,12 @@ func testGroupStoreGetByUser(t *testing.T, ss store.Store) { assert.True(t, found2) groups, err = ss.Group().GetByUser(u2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 1, len(groups)) assert.Equal(t, g2.Id, groups[0].Id) groups, err = ss.Group().GetByUser(model.NewId()) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 0, len(groups)) } @@ -437,7 +437,7 @@ func testGroupStoreUpdate(t *testing.T, ss store.Store) { // Create a group d1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Update happy path g1Update := &model.Group{} @@ -448,7 +448,7 @@ func testGroupStoreUpdate(t *testing.T, ss store.Store) { g1Update.RemoteId = model.NewId() ud1, err := ss.Group().Update(g1Update) - require.Nil(t, err) + require.NoError(t, err) // Not changed... require.Equal(t, d1.Id, ud1.Id) require.Equal(t, d1.CreateAt, ud1.CreateAt) @@ -470,7 +470,7 @@ func testGroupStoreUpdate(t *testing.T, ss store.Store) { RemoteId: model.NewId(), }) require.Nil(t, data) - require.NotNil(t, err) + require.Error(t, err) var appErr *model.AppError require.True(t, errors.As(err, &appErr)) require.Equal(t, appErr.Id, "model.group.display_name.app_error") @@ -484,7 +484,7 @@ func testGroupStoreUpdate(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } d2, err := ss.Group().Create(g2) - require.Nil(t, err) + require.NoError(t, err) // Can't update the name to be a duplicate of an existing group's name _, err = ss.Group().Update(&model.Group{ @@ -502,7 +502,7 @@ func testGroupStoreUpdate(t *testing.T, ss store.Store) { someVal := model.GetMillis() d1.CreateAt = someVal d3, err := ss.Group().Update(d1) - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, someVal, d3.CreateAt) // Cannot update DeleteAt to non-zero @@ -514,7 +514,7 @@ func testGroupStoreUpdate(t *testing.T, ss store.Store) { //...except for 0 for DeleteAt d1.DeleteAt = 0 d4, err := ss.Group().Update(d1) - require.Nil(t, err) + require.NoError(t, err) require.Zero(t, d4.DeleteAt) } @@ -529,36 +529,36 @@ func testGroupStoreDelete(t *testing.T, ss store.Store) { } d1, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, d1.Id, 26) // Check the group is retrievable _, err = ss.Group().Get(d1.Id) - require.Nil(t, err) + require.NoError(t, err) // Get the before count d7, err := ss.Group().GetAllBySource(model.GroupSourceLdap) - require.Nil(t, err) + require.NoError(t, err) beforeCount := len(d7) // Delete the group _, err = ss.Group().Delete(d1.Id) - require.Nil(t, err) + require.NoError(t, err) // Check the group is deleted d4, err := ss.Group().Get(d1.Id) - require.Nil(t, err) + require.NoError(t, err) require.NotZero(t, d4.DeleteAt) // Check the after count d5, err := ss.Group().GetAllBySource(model.GroupSourceLdap) - require.Nil(t, err) + require.NoError(t, err) afterCount := len(d5) require.Condition(t, func() bool { return beforeCount == afterCount+1 }) // Try and delete a nonexistent group _, err = ss.Group().Delete(model.NewId()) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) @@ -577,45 +577,45 @@ func testGroupGetMemberUsers(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, nErr := ss.User().Save(u1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(group.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, nErr := ss.User().Save(u2) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(group.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) // Check returns members groupMembers, err := ss.Group().GetMemberUsers(group.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 2, len(groupMembers)) // Check madeup id groupMembers, err = ss.Group().GetMemberUsers(model.NewId()) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) // Delete a member _, err = ss.Group().DeleteMember(group.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) // Should not return deleted members groupMembers, err = ss.Group().GetMemberUsers(group.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 1, len(groupMembers)) } @@ -629,68 +629,68 @@ func testGroupGetMemberUsersPage(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, nErr := ss.User().Save(u1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(group.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, nErr := ss.User().Save(u2) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(group.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) u3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, nErr := ss.User().Save(u3) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(group.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) // Check returns members groupMembers, err := ss.Group().GetMemberUsersPage(group.Id, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 3, len(groupMembers)) // Check page 1 groupMembers, err = ss.Group().GetMemberUsersPage(group.Id, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 2, len(groupMembers)) require.Equal(t, user3.Id, groupMembers[0].Id) require.Equal(t, user2.Id, groupMembers[1].Id) // Check page 2 groupMembers, err = ss.Group().GetMemberUsersPage(group.Id, 1, 2) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 1, len(groupMembers)) require.Equal(t, user1.Id, groupMembers[0].Id) // Check madeup id groupMembers, err = ss.Group().GetMemberUsersPage(model.NewId(), 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) // Delete a member _, err = ss.Group().DeleteMember(group.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) // Should not return deleted members groupMembers, err = ss.Group().GetMemberUsersPage(group.Id, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 2, len(groupMembers)) } @@ -705,7 +705,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err := ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // Save a group g1 := &model.Group{ @@ -716,67 +716,67 @@ func testGroupGetMemberUsersInTeam(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err := ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) u3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err := ss.User().Save(u3) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) // returns no members when team does not exist groupMembers, err := ss.Group().GetMemberUsersInTeam(group.Id, "non-existent-channel-id") - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) // returns no members when group has no members in the team groupMembers, err = ss.Group().GetMemberUsersInTeam(group.Id, team.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) m1 := &model.TeamMember{TeamId: team.Id, UserId: user1.Id} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // returns single member in team groupMembers, err = ss.Group().GetMemberUsersInTeam(group.Id, team.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 1, len(groupMembers)) m2 := &model.TeamMember{TeamId: team.Id, UserId: user2.Id} m3 := &model.TeamMember{TeamId: team.Id, UserId: user3.Id} _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // returns all members when all members are in team groupMembers, err = ss.Group().GetMemberUsersInTeam(group.Id, team.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 3, len(groupMembers)) } @@ -791,7 +791,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err := ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) // Save a group g1 := &model.Group{ @@ -802,37 +802,37 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) u1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err := ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) u3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err := ss.User().Save(u3) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) // Create Channel channel := &model.Channel{ @@ -842,37 +842,37 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter. } channel, nErr := ss.Channel().Save(channel, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // returns no members when channel does not exist groupMembers, err := ss.Group().GetMemberUsersNotInChannel(group.Id, "non-existent-channel-id") - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) // returns no members when group has no members in the team that the channel belongs to groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) m1 := &model.TeamMember{TeamId: team.Id, UserId: user1.Id} _, nErr = ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // returns single member in team and not in channel groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 1, len(groupMembers)) m2 := &model.TeamMember{TeamId: team.Id, UserId: user2.Id} m3 := &model.TeamMember{TeamId: team.Id, UserId: user3.Id} _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // returns all members when all members are in team and not in channel groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 3, len(groupMembers)) cm1 := &model.ChannelMember{ @@ -884,11 +884,11 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), } _, err = ss.Channel().SaveMember(cm1) - require.Nil(t, err) + require.NoError(t, err) // returns both members not yet added to channel groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 2, len(groupMembers)) cm2 := &model.ChannelMember{ @@ -909,13 +909,13 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) { } _, err = ss.Channel().SaveMember(cm2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(cm3) - require.Nil(t, err) + require.NoError(t, err) // returns none when all members have been added to team and channel groupMembers, err = ss.Group().GetMemberUsersNotInChannel(group.Id, channel.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(groupMembers)) } @@ -928,7 +928,7 @@ func testUpsertMember(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Create user u1 := &model.User{ @@ -936,11 +936,11 @@ func testUpsertMember(t *testing.T, ss store.Store) { Username: model.NewId(), } user, nErr := ss.User().Save(u1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Happy path d2, err := ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, d2.GroupId, group.Id) require.Equal(t, d2.UserId, user.Id) require.NotZero(t, d2.CreateAt) @@ -950,7 +950,7 @@ func testUpsertMember(t *testing.T, ss store.Store) { // Ensure new CreateAt > previous CreateAt for the same (groupId, userId) time.Sleep(1 * time.Millisecond) _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) // Invalid GroupId _, err = ss.Group().UpsertMember(model.NewId(), user.Id) @@ -961,16 +961,16 @@ func testUpsertMember(t *testing.T, ss store.Store) { // Ensure new CreateAt > previous CreateAt for the same (groupId, userId) time.Sleep(1 * time.Millisecond) _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().DeleteMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) groupMembers, err := ss.Group().GetMemberUsers(group.Id) beforeRestoreCount := len(groupMembers) _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) groupMembers, err = ss.Group().GetMemberUsers(group.Id) afterRestoreCount := len(groupMembers) @@ -987,7 +987,7 @@ func testGroupDeleteMember(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Create user u1 := &model.User{ @@ -995,15 +995,15 @@ func testGroupDeleteMember(t *testing.T, ss store.Store) { Username: model.NewId(), } user, nErr := ss.User().Save(u1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create member d1, err := ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) // Happy path d2, err := ss.Group().DeleteMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, d2.GroupId, group.Id) require.Equal(t, d2.UserId, user.Id) require.Equal(t, d2.CreateAt, d1.CreateAt) @@ -1037,7 +1037,7 @@ func testGroupPermanentDeleteMembersByUser(t *testing.T, ss store.Store) { } group, err := ss.Group().Create(g) groups = append(groups, group) - require.Nil(t, err) + require.NoError(t, err) } // Create user @@ -1046,17 +1046,17 @@ func testGroupPermanentDeleteMembersByUser(t *testing.T, ss store.Store) { Username: model.NewId(), } user, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) // Create members for _, group := range groups { _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) } // Happy path err = ss.Group().PermanentDeleteMembersByUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) } func testCreateGroupSyncable(t *testing.T, ss store.Store) { @@ -1074,7 +1074,7 @@ func testCreateGroupSyncable(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Create Team t1 := &model.Team{ @@ -1088,12 +1088,12 @@ func testCreateGroupSyncable(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, nErr := ss.Team().Save(t1) - require.Nil(t, nErr) + require.NoError(t, nErr) // New GroupSyncable, happy path gt1 := model.NewGroupTeam(group.Id, team.Id, false) d1, err := ss.Group().CreateGroupSyncable(gt1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, gt1.SyncableId, d1.SyncableId) require.Equal(t, gt1.GroupId, d1.GroupId) require.Equal(t, gt1.AutoAdd, d1.AutoAdd) @@ -1111,7 +1111,7 @@ func testGetGroupSyncable(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Create Team t1 := &model.Team{ @@ -1125,16 +1125,16 @@ func testGetGroupSyncable(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, nErr := ss.Team().Save(t1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create GroupSyncable gt1 := model.NewGroupTeam(group.Id, team.Id, false) groupTeam, err := ss.Group().CreateGroupSyncable(gt1) - require.Nil(t, err) + require.NoError(t, err) // Get GroupSyncable dgt, err := ss.Group().GetGroupSyncable(groupTeam.GroupId, groupTeam.SyncableId, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, gt1.GroupId, dgt.GroupId) require.Equal(t, gt1.SyncableId, dgt.SyncableId) require.Equal(t, gt1.AutoAdd, dgt.AutoAdd) @@ -1155,7 +1155,7 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g) - require.Nil(t, err) + require.NoError(t, err) groupTeams := []*model.GroupSyncable{} @@ -1174,20 +1174,20 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) { } var team *model.Team team, nErr := ss.Team().Save(t1) - require.Nil(t, nErr) + require.NoError(t, nErr) // create groupteam var groupTeam *model.GroupSyncable gt := model.NewGroupTeam(group.Id, team.Id, false) gt.SchemeAdmin = true groupTeam, err = ss.Group().CreateGroupSyncable(gt) - require.Nil(t, err) + require.NoError(t, err) groupTeams = append(groupTeams, groupTeam) } // Returns all the group teams d1, err := ss.Group().GetAllGroupSyncablesByGroupId(group.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.Condition(t, func() bool { return len(d1) >= numGroupSyncables }) for _, expectedGroupTeam := range groupTeams { present := false @@ -1211,7 +1211,7 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Create Team t1 := &model.Team{ @@ -1225,17 +1225,17 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, nErr := ss.Team().Save(t1) - require.Nil(t, nErr) + require.NoError(t, nErr) // New GroupSyncable, happy path gt1 := model.NewGroupTeam(group.Id, team.Id, false) d1, err := ss.Group().CreateGroupSyncable(gt1) - require.Nil(t, err) + require.NoError(t, err) // Update existing group team gt1.AutoAdd = true d2, err := ss.Group().UpdateGroupSyncable(gt1) - require.Nil(t, err) + require.NoError(t, err) require.True(t, d2.AutoAdd) // Non-existent Group @@ -1254,7 +1254,7 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) { d1.CreateAt = model.GetMillis() d1.AutoAdd = true d3, err := ss.Group().UpdateGroupSyncable(d1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, origCreateAt, d3.CreateAt) // Cannot update DeleteAt to arbitrary value @@ -1266,7 +1266,7 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) { // Can update DeleteAt to 0 d1.DeleteAt = 0 d4, err := ss.Group().UpdateGroupSyncable(d1) - require.Nil(t, err) + require.NoError(t, err) require.Zero(t, d4.DeleteAt) } @@ -1279,7 +1279,7 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) // Create Team t1 := &model.Team{ @@ -1293,12 +1293,12 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, nErr := ss.Team().Save(t1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create GroupSyncable gt1 := model.NewGroupTeam(group.Id, team.Id, false) groupTeam, err := ss.Group().CreateGroupSyncable(gt1) - require.Nil(t, err) + require.NoError(t, err) // Non-existent Group _, err = ss.Group().DeleteGroupSyncable(model.NewId(), groupTeam.SyncableId, model.GroupSyncableTypeTeam) @@ -1311,7 +1311,7 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) { // Happy path... d1, err := ss.Group().DeleteGroupSyncable(groupTeam.GroupId, groupTeam.SyncableId, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.NotZero(t, d1.DeleteAt) require.Equal(t, d1.GroupId, groupTeam.GroupId) require.Equal(t, d1.SyncableId, groupTeam.SyncableId) @@ -1321,7 +1321,7 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) { // Record already deleted _, err = ss.Group().DeleteGroupSyncable(d1.GroupId, d1.SyncableId, d1.Type) - require.NotNil(t, err) + require.Error(t, err) var invErr *store.ErrInvalidInput require.True(t, errors.As(err, &invErr)) } @@ -1334,7 +1334,7 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) { RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) // Create User user := &model.User{ @@ -1342,11 +1342,11 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) { Username: model.NewId(), } user, nErr := ss.User().Save(user) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create GroupMember _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) // Create Team team := &model.Team{ @@ -1360,122 +1360,122 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create GroupTeam syncable, err := ss.Group().CreateGroupSyncable(model.NewGroupTeam(group.Id, team.Id, true)) - require.Nil(t, err) + require.NoError(t, err) // Time before syncable was created teamMembers, err := ss.Group().TeamMembersToAdd(syncable.CreateAt-1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) require.Equal(t, user.Id, teamMembers[0].UserID) require.Equal(t, team.Id, teamMembers[0].TeamID) // Time after syncable was created teamMembers, err = ss.Group().TeamMembersToAdd(syncable.CreateAt+1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // Delete and restore GroupMember should return result _, err = ss.Group().DeleteMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(syncable.CreateAt+1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) pristineSyncable := *syncable _, err = ss.Group().UpdateGroupSyncable(syncable) - require.Nil(t, err) + require.NoError(t, err) // Time before syncable was updated teamMembers, err = ss.Group().TeamMembersToAdd(syncable.UpdateAt-1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) require.Equal(t, user.Id, teamMembers[0].UserID) require.Equal(t, team.Id, teamMembers[0].TeamID) // Time after syncable was updated teamMembers, err = ss.Group().TeamMembersToAdd(syncable.UpdateAt+1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // Only includes if auto-add syncable.AutoAdd = false _, err = ss.Group().UpdateGroupSyncable(syncable) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // reset state of syncable and verify _, err = ss.Group().UpdateGroupSyncable(&pristineSyncable) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) // No result if Group deleted _, err = ss.Group().Delete(group.Id) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // reset state of group and verify group.DeleteAt = 0 _, err = ss.Group().Update(group) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) // No result if Team deleted team.DeleteAt = model.GetMillis() team, nErr = ss.Team().Update(team) - require.Nil(t, nErr) + require.NoError(t, nErr) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // reset state of team and verify team.DeleteAt = 0 team, nErr = ss.Team().Update(team) - require.Nil(t, nErr) + require.NoError(t, nErr) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) // No result if GroupTeam deleted _, err = ss.Group().DeleteGroupSyncable(group.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // reset GroupTeam and verify _, err = ss.Group().UpdateGroupSyncable(&pristineSyncable) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) // No result if GroupMember deleted _, err = ss.Group().DeleteMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) // restore group member and verify _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) // adding team membership stops returning result @@ -1483,9 +1483,9 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) { TeamId: team.Id, UserId: user.Id, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) teamMembers, err = ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teamMembers) } @@ -1496,7 +1496,7 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) { RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) group2, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -1504,35 +1504,35 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) { RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) user1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, nErr := ss.User().Save(user1) - require.Nil(t, nErr) + require.NoError(t, nErr) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, nErr = ss.User().Save(user2) - require.Nil(t, nErr) + require.NoError(t, nErr) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, nErr = ss.User().Save(user3) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, user := range []*model.User{user1, user2} { _, err = ss.Group().UpsertMember(group1.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) } _, err = ss.Group().UpsertMember(group2.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) team1 := &model.Team{ DisplayName: "Name", @@ -1545,7 +1545,7 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team1, nErr = ss.Team().Save(team1) - require.Nil(t, nErr) + require.NoError(t, nErr) team2 := &model.Team{ DisplayName: "Name", @@ -1558,24 +1558,24 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team2, nErr = ss.Team().Save(team2) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(model.NewGroupTeam(group1.Id, team1.Id, true)) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().CreateGroupSyncable(model.NewGroupTeam(group2.Id, team2.Id, true)) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err := ss.Group().TeamMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 3) teamMembers, err = ss.Group().TeamMembersToAdd(0, &team1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 2) teamMembers, err = ss.Group().TeamMembersToAdd(0, &team2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) } @@ -1587,7 +1587,7 @@ func testChannelMembersToAdd(t *testing.T, ss store.Store) { RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) // Create User user := &model.User{ @@ -1595,11 +1595,11 @@ func testChannelMembersToAdd(t *testing.T, ss store.Store) { Username: model.NewId(), } user, nErr := ss.User().Save(user) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create GroupMember _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) // Create Channel channel := &model.Channel{ @@ -1609,142 +1609,142 @@ func testChannelMembersToAdd(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter. } channel, nErr = ss.Channel().Save(channel, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create GroupChannel syncable, err := ss.Group().CreateGroupSyncable(model.NewGroupChannel(group.Id, channel.Id, true)) - require.Nil(t, err) + require.NoError(t, err) // Time before syncable was created channelMembers, err := ss.Group().ChannelMembersToAdd(syncable.CreateAt-1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) require.Equal(t, user.Id, channelMembers[0].UserID) require.Equal(t, channel.Id, channelMembers[0].ChannelID) // Time after syncable was created channelMembers, err = ss.Group().ChannelMembersToAdd(syncable.CreateAt+1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // Delete and restore GroupMember should return result _, err = ss.Group().DeleteMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(syncable.CreateAt+1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) pristineSyncable := *syncable _, err = ss.Group().UpdateGroupSyncable(syncable) - require.Nil(t, err) + require.NoError(t, err) // Time before syncable was updated channelMembers, err = ss.Group().ChannelMembersToAdd(syncable.UpdateAt-1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) require.Equal(t, user.Id, channelMembers[0].UserID) require.Equal(t, channel.Id, channelMembers[0].ChannelID) // Time after syncable was updated channelMembers, err = ss.Group().ChannelMembersToAdd(syncable.UpdateAt+1, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // Only includes if auto-add syncable.AutoAdd = false _, err = ss.Group().UpdateGroupSyncable(syncable) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // reset state of syncable and verify _, err = ss.Group().UpdateGroupSyncable(&pristineSyncable) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) // No result if Group deleted _, err = ss.Group().Delete(group.Id) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // reset state of group and verify group.DeleteAt = 0 _, err = ss.Group().Update(group) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) // No result if Channel deleted nErr = ss.Channel().Delete(channel.Id, model.GetMillis()) - require.Nil(t, nErr) + require.NoError(t, nErr) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // reset state of channel and verify channel.DeleteAt = 0 _, nErr = ss.Channel().Update(channel) - require.Nil(t, nErr) + require.NoError(t, nErr) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) // No result if GroupChannel deleted _, err = ss.Group().DeleteGroupSyncable(group.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // reset GroupChannel and verify _, err = ss.Group().UpdateGroupSyncable(&pristineSyncable) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) // No result if GroupMember deleted _, err = ss.Group().DeleteMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // restore group member and verify _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) // Adding Channel (ChannelMemberHistory) should stop returning result nErr = ss.ChannelMemberHistory().LogJoinEvent(user.Id, channel.Id, model.GetMillis()) - require.Nil(t, nErr) + require.NoError(t, nErr) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // Leaving Channel (ChannelMemberHistory) should still not return result nErr = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, model.GetMillis()) - require.Nil(t, nErr) + require.NoError(t, nErr) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, channelMembers) // Purging ChannelMemberHistory re-returns the result _, nErr = ss.ChannelMemberHistory().PermanentDeleteBatch(model.GetMillis()+1, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) channelMembers, err = ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) } @@ -1755,7 +1755,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) { RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) group2, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -1763,35 +1763,35 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) { RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) user1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, nErr := ss.User().Save(user1) - require.Nil(t, nErr) + require.NoError(t, nErr) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, nErr = ss.User().Save(user2) - require.Nil(t, nErr) + require.NoError(t, nErr) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, nErr = ss.User().Save(user3) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, user := range []*model.User{user1, user2} { _, err = ss.Group().UpsertMember(group1.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) } _, err = ss.Group().UpsertMember(group2.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) channel1 := &model.Channel{ DisplayName: "Name", @@ -1799,7 +1799,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel1, nErr = ss.Channel().Save(channel1, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel2 := &model.Channel{ DisplayName: "Name", @@ -1807,24 +1807,24 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel2, nErr = ss.Channel().Save(channel2, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group1.Id, channel1.Id, true)) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group2.Id, channel2.Id, true)) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err := ss.Group().ChannelMembersToAdd(0, nil) - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, len(channelMembers), 3) channelMembers, err = ss.Group().ChannelMembersToAdd(0, &channel1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 2) channelMembers, err = ss.Group().ChannelMembersToAdd(0, &channel2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) } @@ -1833,16 +1833,16 @@ func testTeamMembersToRemove(t *testing.T, ss store.Store) { // one result when both users are in the group (for user C) teamMembers, err := ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) require.Equal(t, data.UserC.Id, teamMembers[0].UserId) _, err = ss.Group().DeleteMember(data.Group.Id, data.UserB.Id) - require.Nil(t, err) + require.NoError(t, err) // user b and c should now be returned teamMembers, err = ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 2) var userIDs []string @@ -1855,15 +1855,15 @@ func testTeamMembersToRemove(t *testing.T, ss store.Store) { require.Equal(t, data.ConstrainedTeam.Id, teamMembers[1].TeamId) _, err = ss.Group().DeleteMember(data.Group.Id, data.UserA.Id) - require.Nil(t, err) + require.NoError(t, err) teamMembers, err = ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 3) // Make one of them a bot teamMembers, err = ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) teamMember := teamMembers[0] bot := &model.Bot{ UserId: teamMember.UserId, @@ -1872,35 +1872,35 @@ func testTeamMembersToRemove(t *testing.T, ss store.Store) { OwnerId: teamMember.UserId, } bot, nErr := ss.Bot().Save(bot) - require.Nil(t, nErr) + require.NoError(t, nErr) // verify that bot is not returned in results teamMembers, err = ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 2) // delete the bot nErr = ss.Bot().PermanentDelete(bot.UserId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Should be back to 3 users teamMembers, err = ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 3) // add users back to groups res := ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserA.Id) - require.Nil(t, res) + require.NoError(t, res) res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserB.Id) - require.Nil(t, res) + require.NoError(t, res) res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserC.Id) - require.Nil(t, res) + require.NoError(t, res) nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserA.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserB.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserC.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) } func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) { @@ -1909,21 +1909,21 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) team1 := &model.Team{ DisplayName: "Name", @@ -1937,7 +1937,7 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } team1, nErr := ss.Team().Save(team1) - require.Nil(t, nErr) + require.NoError(t, nErr) team2 := &model.Team{ DisplayName: "Name", @@ -1951,32 +1951,32 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } team2, nErr = ss.Team().Save(team2) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, user := range []*model.User{user1, user2} { _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team1.Id, UserId: user.Id, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) } _, nErr = ss.Team().SaveMember(&model.TeamMember{ TeamId: team2.Id, UserId: user3.Id, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) teamMembers, err := ss.Group().TeamMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 3) teamMembers, err = ss.Group().TeamMembersToRemove(&team1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 2) teamMembers, err = ss.Group().TeamMembersToRemove(&team2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teamMembers, 1) } @@ -1985,16 +1985,16 @@ func testChannelMembersToRemove(t *testing.T, ss store.Store) { // one result when both users are in the group (for user C) channelMembers, err := ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) require.Equal(t, data.UserC.Id, channelMembers[0].UserId) _, err = ss.Group().DeleteMember(data.Group.Id, data.UserB.Id) - require.Nil(t, err) + require.NoError(t, err) // user b and c should now be returned channelMembers, err = ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 2) var userIDs []string @@ -2007,15 +2007,15 @@ func testChannelMembersToRemove(t *testing.T, ss store.Store) { require.Equal(t, data.ConstrainedChannel.Id, channelMembers[1].ChannelId) _, err = ss.Group().DeleteMember(data.Group.Id, data.UserA.Id) - require.Nil(t, err) + require.NoError(t, err) channelMembers, err = ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 3) // Make one of them a bot channelMembers, err = ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) channelMember := channelMembers[0] bot := &model.Bot{ UserId: channelMember.UserId, @@ -2024,35 +2024,35 @@ func testChannelMembersToRemove(t *testing.T, ss store.Store) { OwnerId: channelMember.UserId, } bot, nErr := ss.Bot().Save(bot) - require.Nil(t, nErr) + require.NoError(t, nErr) // verify that bot is not returned in results channelMembers, err = ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 2) // delete the bot nErr = ss.Bot().PermanentDelete(bot.UserId) - require.Nil(t, nErr) + require.NoError(t, nErr) // Should be back to 3 users channelMembers, err = ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 3) // add users back to groups res := ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserA.Id) - require.Nil(t, res) + require.NoError(t, res) res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserB.Id) - require.Nil(t, res) + require.NoError(t, res) res = ss.Team().RemoveMember(data.ConstrainedTeam.Id, data.UserC.Id) - require.Nil(t, res) + require.NoError(t, res) nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserA.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserB.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().RemoveMember(data.ConstrainedChannel.Id, data.UserC.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) } func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) { @@ -2061,21 +2061,21 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) channel1 := &model.Channel{ DisplayName: "Name", @@ -2084,7 +2084,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } channel1, nErr := ss.Channel().Save(channel1, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel2 := &model.Channel{ DisplayName: "Name", @@ -2093,7 +2093,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } channel2, nErr = ss.Channel().Save(channel2, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, user := range []*model.User{user1, user2} { _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ @@ -2101,7 +2101,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) { UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) } _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ @@ -2109,18 +2109,18 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) { UserId: user3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) channelMembers, err := ss.Group().ChannelMembersToRemove(nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 3) channelMembers, err = ss.Group().ChannelMembersToRemove(&channel1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 2) channelMembers, err = ss.Group().ChannelMembersToRemove(&channel2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, channelMembers, 1) } @@ -2143,7 +2143,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData RemoteId: model.NewId(), Source: model.GroupSourceLdap, }) - require.Nil(t, err) + require.NoError(t, err) // create users // userA will get removed from the group @@ -2152,7 +2152,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData Username: model.NewId(), } userA, nErr := ss.User().Save(userA) - require.Nil(t, nErr) + require.NoError(t, nErr) // userB will not get removed from the group userB := &model.User{ @@ -2160,7 +2160,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData Username: model.NewId(), } userB, nErr = ss.User().Save(userB) - require.Nil(t, nErr) + require.NoError(t, nErr) // userC was never in the group userC := &model.User{ @@ -2168,14 +2168,14 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData Username: model.NewId(), } userC, nErr = ss.User().Save(userC) - require.Nil(t, nErr) + require.NoError(t, nErr) // add users to group (but not userC) _, err = ss.Group().UpsertMember(group.Id, userA.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group.Id, userB.Id) - require.Nil(t, err) + require.NoError(t, err) // create channels channelConstrained := &model.Channel{ @@ -2186,7 +2186,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData GroupConstrained: model.NewBool(true), } channelConstrained, nErr = ss.Channel().Save(channelConstrained, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) channelUnconstrained := &model.Channel{ TeamId: model.NewId(), @@ -2195,7 +2195,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData Type: model.CHANNEL_PRIVATE, } channelUnconstrained, nErr = ss.Channel().Save(channelUnconstrained, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // create teams teamConstrained := &model.Team{ @@ -2210,7 +2210,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData GroupConstrained: model.NewBool(true), } teamConstrained, nErr = ss.Team().Save(teamConstrained) - require.Nil(t, nErr) + require.NoError(t, nErr) teamUnconstrained := &model.Team{ DisplayName: "Name", @@ -2223,21 +2223,21 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData Type: model.TEAM_INVITE, } teamUnconstrained, nErr = ss.Team().Save(teamUnconstrained) - require.Nil(t, nErr) + require.NoError(t, nErr) // create groupteams _, err = ss.Group().CreateGroupSyncable(model.NewGroupTeam(group.Id, teamConstrained.Id, true)) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().CreateGroupSyncable(model.NewGroupTeam(group.Id, teamUnconstrained.Id, true)) - require.Nil(t, err) + require.NoError(t, err) // create groupchannels _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group.Id, channelConstrained.Id, true)) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().CreateGroupSyncable(model.NewGroupChannel(group.Id, channelUnconstrained.Id, true)) - require.Nil(t, err) + require.NoError(t, err) // add users to teams userIDTeamIDs := [][]string{ @@ -2254,7 +2254,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData UserId: item[0], TeamId: item[1], }, 99) - require.Nil(t, nErr) + require.NoError(t, nErr) } // add users to channels @@ -2273,7 +2273,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData ChannelId: item[1], NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) } return &removalsData{ @@ -2297,7 +2297,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel1, err := ss.Channel().Save(channel1, 9999) - require.Nil(t, err) + require.NoError(t, err) // Create Groups 1, 2 and a deleted group group1, err := ss.Group().Create(&model.Group{ @@ -2307,7 +2307,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) group2, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -2316,7 +2316,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: false, }) - require.Nil(t, err) + require.NoError(t, err) deletedGroup, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -2326,7 +2326,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { AllowReference: true, DeleteAt: 1, }) - require.Nil(t, err) + require.NoError(t, err) // And associate them with Channel1 for _, g := range []*model.Group{group1, group2, deletedGroup} { @@ -2336,7 +2336,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeChannel, GroupId: g.Id, }) - require.Nil(t, err) + require.NoError(t, err) } // Create Channel2 @@ -2347,7 +2347,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel2, nErr := ss.Channel().Save(channel2, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create Group3 group3, err := ss.Group().Create(&model.Group{ @@ -2357,7 +2357,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) // And associate it to Channel2 _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -2366,7 +2366,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeChannel, GroupId: group3.Id, }) - require.Nil(t, err) + require.NoError(t, err) // add members u1 := &model.User{ @@ -2374,24 +2374,24 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err := ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) user2.DeleteAt = 1 _, err = ss.User().Update(user2, true) - require.Nil(t, err) + require.NoError(t, err) group1WithMemberCount := *group1 group1WithMemberCount.MemberCount = model.NewInt(1) @@ -2510,12 +2510,12 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) { tc.Opts.PageOpts.Page = tc.Page tc.Opts.PageOpts.PerPage = tc.PerPage groups, err := ss.Group().GetGroupsByChannel(tc.ChannelId, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, tc.Result, groups) if tc.TotalCount != nil { var count int64 count, err = ss.Group().CountGroupsByChannel(tc.ChannelId, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, *tc.TotalCount, count) } }) @@ -2535,7 +2535,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team1, errt := ss.Team().Save(team1) - require.Nil(t, errt) + require.NoError(t, errt) // Create Channel1 channel1 := &model.Channel{ @@ -2545,7 +2545,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel1, err := ss.Channel().Save(channel1, 9999) - require.Nil(t, err) + require.NoError(t, err) // Create Groups 1, 2 and a deleted group group1, err := ss.Group().Create(&model.Group{ @@ -2555,7 +2555,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: false, }) - require.Nil(t, err) + require.NoError(t, err) group2, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -2564,7 +2564,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) deletedGroup, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -2574,7 +2574,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { AllowReference: true, DeleteAt: 1, }) - require.Nil(t, err) + require.NoError(t, err) // And associate them with Channel1 for _, g := range []*model.Group{group1, group2, deletedGroup} { @@ -2584,7 +2584,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeChannel, GroupId: g.Id, }) - require.Nil(t, err) + require.NoError(t, err) } // Create Channel2 @@ -2595,7 +2595,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel2, err = ss.Channel().Save(channel2, 9999) - require.Nil(t, err) + require.NoError(t, err) // Create Group3 group3, err := ss.Group().Create(&model.Group{ @@ -2605,7 +2605,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) // And associate it to Channel2 _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -2614,7 +2614,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeChannel, GroupId: group3.Id, }) - require.Nil(t, err) + require.NoError(t, err) // add members u1 := &model.User{ @@ -2622,24 +2622,24 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err := ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) user2.DeleteAt = 1 _, err = ss.User().Update(user2, true) - require.Nil(t, err) + require.NoError(t, err) group1WithMemberCount := *group1 group1WithMemberCount.MemberCount = model.NewInt(1) @@ -2759,7 +2759,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) { tc.Opts.PageOpts.Page = tc.Page tc.Opts.PageOpts.PerPage = tc.PerPage groups, err := ss.Group().GetGroupsAssociatedToChannelsByTeam(tc.TeamId, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, tc.Result, groups) }) } @@ -2778,7 +2778,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team1, err := ss.Team().Save(team1) - require.Nil(t, err) + require.NoError(t, err) // Create Groups 1, 2 and a deleted group group1, err := ss.Group().Create(&model.Group{ @@ -2788,7 +2788,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: false, }) - require.Nil(t, err) + require.NoError(t, err) group2, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -2797,7 +2797,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) deletedGroup, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -2807,7 +2807,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { AllowReference: true, DeleteAt: 1, }) - require.Nil(t, err) + require.NoError(t, err) // And associate them with Team1 for _, g := range []*model.Group{group1, group2, deletedGroup} { @@ -2817,7 +2817,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeTeam, GroupId: g.Id, }) - require.Nil(t, err) + require.NoError(t, err) } // Create Team2 @@ -2832,7 +2832,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Type: model.TEAM_INVITE, } team2, err = ss.Team().Save(team2) - require.Nil(t, err) + require.NoError(t, err) // Create Group3 group3, err := ss.Group().Create(&model.Group{ @@ -2842,7 +2842,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) // And associate it to Team2 _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -2851,7 +2851,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeTeam, GroupId: group3.Id, }) - require.Nil(t, err) + require.NoError(t, err) // add members u1 := &model.User{ @@ -2859,27 +2859,27 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err := ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) user2.DeleteAt = 1 _, err = ss.User().Update(user2, true) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(deletedGroup.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) group1WithMemberCount := *group1 group1WithMemberCount.MemberCount = model.NewInt(1) @@ -2999,12 +2999,12 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) { tc.Opts.PageOpts.Page = tc.Page tc.Opts.PageOpts.PerPage = tc.PerPage groups, err := ss.Group().GetGroupsByTeam(tc.TeamId, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, tc.Result, groups) if tc.TotalCount != nil { var count int64 count, err = ss.Group().CountGroupsByTeam(tc.TeamId, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, *tc.TotalCount, count) } }) @@ -3025,7 +3025,7 @@ func testGetGroups(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } team1, err := ss.Team().Save(team1) - require.Nil(t, err) + require.NoError(t, err) startCreateTime := team1.UpdateAt - 1 @@ -3037,7 +3037,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } channel1, nErr := ss.Channel().Save(channel1, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create Groups 1 and 2 group1, err := ss.Group().Create(&model.Group{ @@ -3047,7 +3047,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) group2, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId() + "-group-2"), @@ -3056,7 +3056,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: false, }) - require.Nil(t, err) + require.NoError(t, err) deletedGroup, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId() + "-group-deleted"), @@ -3066,7 +3066,7 @@ func testGetGroups(t *testing.T, ss store.Store) { AllowReference: false, DeleteAt: 1, }) - require.Nil(t, err) + require.NoError(t, err) // And associate them with Team1 for _, g := range []*model.Group{group1, group2, deletedGroup} { @@ -3076,7 +3076,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeTeam, GroupId: g.Id, }) - require.Nil(t, err) + require.NoError(t, err) } // Create Team2 @@ -3091,7 +3091,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.TEAM_INVITE, } team2, err = ss.Team().Save(team2) - require.Nil(t, err) + require.NoError(t, err) // Create Channel2 channel2 := &model.Channel{ @@ -3101,7 +3101,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } channel2, nErr = ss.Channel().Save(channel2, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create Channel3 channel3 := &model.Channel{ @@ -3111,7 +3111,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } channel3, nErr = ss.Channel().Save(channel3, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) // Create Group3 group3, err := ss.Group().Create(&model.Group{ @@ -3121,7 +3121,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) // And associate it to Team2 _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -3130,7 +3130,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeTeam, GroupId: group3.Id, }) - require.Nil(t, err) + require.NoError(t, err) // And associate Group1 to Channel2 _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -3139,7 +3139,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeChannel, GroupId: group1.Id, }) - require.Nil(t, err) + require.NoError(t, err) // And associate Group2 and Group3 to Channel1 for _, g := range []*model.Group{group2, group3} { @@ -3149,7 +3149,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.GroupSyncableTypeChannel, GroupId: g.Id, }) - require.Nil(t, err) + require.NoError(t, err) } // add members @@ -3158,23 +3158,23 @@ func testGetGroups(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err := ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(deletedGroup.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) user2.DeleteAt = 1 u2Update, _ := ss.User().Update(user2, true) @@ -3195,7 +3195,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.TEAM_INVITE, } team3, err = ss.Team().Save(team3) - require.Nil(t, err) + require.NoError(t, err) channel4 := &model.Channel{ TeamId: team3.Id, @@ -3204,7 +3204,7 @@ func testGetGroups(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } channel4, nErr = ss.Channel().Save(channel4, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -3430,7 +3430,7 @@ func testGetGroups(t *testing.T, ss store.Store) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { groups, err := ss.Group().GetGroups(tc.Page, tc.PerPage, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) require.True(t, tc.Resultf(groups)) }) } @@ -3455,7 +3455,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } team, err := ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) for i := 0; i < numberOfUsers; i++ { user := &model.User{ @@ -3463,12 +3463,12 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { Username: fmt.Sprintf("%d_%s", i, model.NewId()), } user, err = ss.User().Save(user) - require.Nil(t, err) + require.NoError(t, err) users = append(users, user) trueOrFalse := int(math.Mod(float64(i), 2)) == 0 _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: trueOrFalse, SchemeAdmin: !trueOrFalse}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) } // Extra user outside of the group member users. @@ -3477,10 +3477,10 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { Username: "99_" + model.NewId(), } user, err = ss.User().Save(user) - require.Nil(t, err) + require.NoError(t, err) users = append(users, user) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id, SchemeUser: true, SchemeAdmin: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) for i := 0; i < numberOfGroups; i++ { group := &model.Group{ @@ -3491,7 +3491,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(group) - require.Nil(t, err) + require.NoError(t, err) groups = append(groups, group) } @@ -3503,11 +3503,11 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { for i := 0; i < numberOfUsers; i++ { groupIndex := int(math.Mod(float64(i), 2)) _, err := ss.Group().UpsertMember(groups[groupIndex].Id, users[i].Id) - require.Nil(t, err) + require.NoError(t, err) // Add everyone to group 2 _, err = ss.Group().UpsertMember(groups[numberOfGroups-1].Id, users[i].Id) - require.Nil(t, err) + require.NoError(t, err) } testCases := map[string]struct { @@ -3582,11 +3582,11 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) { } actual, err := ss.Group().TeamMembersMinusGroupMembers(team.Id, tc.groupIDs, tc.page, tc.perPage) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, tc.expectedUserIDs, mapUserIDs(actual)) actualCount, err := ss.Group().CountTeamMembersMinusGroupMembers(team.Id, tc.groupIDs) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, tc.expectedTotalCount, actualCount) }) } @@ -3607,7 +3607,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { GroupConstrained: model.NewBool(true), } channel, err := ss.Channel().Save(channel, 9999) - require.Nil(t, err) + require.NoError(t, err) for i := 0; i < numberOfUsers; i++ { user := &model.User{ @@ -3615,7 +3615,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { Username: fmt.Sprintf("%d_%s", i, model.NewId()), } user, err = ss.User().Save(user) - require.Nil(t, err) + require.NoError(t, err) users = append(users, user) trueOrFalse := int(math.Mod(float64(i), 2)) == 0 @@ -3626,7 +3626,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { SchemeAdmin: !trueOrFalse, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) } // Extra user outside of the group member users. @@ -3634,7 +3634,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "99_" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) users = append(users, user) _, err = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: channel.Id, @@ -3643,7 +3643,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { SchemeAdmin: false, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) for i := 0; i < numberOfGroups; i++ { group := &model.Group{ @@ -3654,7 +3654,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(group) - require.Nil(t, err) + require.NoError(t, err) groups = append(groups, group) } @@ -3666,11 +3666,11 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { for i := 0; i < numberOfUsers; i++ { groupIndex := int(math.Mod(float64(i), 2)) _, err := ss.Group().UpsertMember(groups[groupIndex].Id, users[i].Id) - require.Nil(t, err) + require.NoError(t, err) // Add everyone to group 2 _, err = ss.Group().UpsertMember(groups[numberOfGroups-1].Id, users[i].Id) - require.Nil(t, err) + require.NoError(t, err) } testCases := map[string]struct { @@ -3745,11 +3745,11 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) { } actual, err := ss.Group().ChannelMembersMinusGroupMembers(channel.Id, tc.groupIDs, tc.page, tc.perPage) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, tc.expectedUserIDs, mapUserIDs(actual)) actualCount, err := ss.Group().CountChannelMembersMinusGroupMembers(channel.Id, tc.groupIDs) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, tc.expectedTotalCount, actualCount) }) } @@ -3764,7 +3764,7 @@ func groupTestGetMemberCount(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group, err := ss.Group().Create(group) - require.Nil(t, err) + require.NoError(t, err) var user *model.User var nErr error @@ -3774,22 +3774,22 @@ func groupTestGetMemberCount(t *testing.T, ss store.Store) { Username: fmt.Sprintf("%d_%s", i, model.NewId()), } user, nErr = ss.User().Save(user) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().UpsertMember(group.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) } count, err := ss.Group().GetMemberCount(group.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(2), count) user.DeleteAt = 1 _, nErr = ss.User().Update(user, true) - require.Nil(t, nErr) + require.NoError(t, nErr) count, err = ss.Group().GetMemberCount(group.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(1), count) } @@ -3799,7 +3799,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto Username: model.NewId(), } user, err := ss.User().Save(user) - require.Nil(t, err) + require.NoError(t, err) group1 := &model.Group{ Name: model.NewString(model.NewId()), @@ -3809,10 +3809,10 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto RemoteId: model.NewId(), } group1, err = ss.Group().Create(group1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) group2 := &model.Group{ Name: model.NewString(model.NewId()), @@ -3822,10 +3822,10 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto RemoteId: model.NewId(), } group2, err = ss.Group().Create(group2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group2.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) channel := &model.Channel{ TeamId: model.NewId(), @@ -3834,7 +3834,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto Type: model.CHANNEL_OPEN, } channel, nErr := ss.Channel().Save(channel, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -3843,7 +3843,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto GroupId: group1.Id, SchemeAdmin: true, }) - require.Nil(t, err) + require.NoError(t, err) groupSyncable2, err := ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -3851,33 +3851,33 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto Type: model.GroupSyncableTypeChannel, GroupId: group2.Id, }) - require.Nil(t, err) + require.NoError(t, err) // User is a member of both groups but only one is SchmeAdmin: true actualGroupIDs, err := ss.Group().AdminRoleGroupsForSyncableMember(user.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{group1.Id}, actualGroupIDs) // Update the second group syncable to be SchemeAdmin: true and both groups should be returned groupSyncable2.SchemeAdmin = true _, err = ss.Group().UpdateGroupSyncable(groupSyncable2) - require.Nil(t, err) + require.NoError(t, err) actualGroupIDs, err = ss.Group().AdminRoleGroupsForSyncableMember(user.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{group1.Id, group2.Id}, actualGroupIDs) // Deleting membership from group should stop the group from being returned _, err = ss.Group().DeleteMember(group1.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) actualGroupIDs, err = ss.Group().AdminRoleGroupsForSyncableMember(user.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{group2.Id}, actualGroupIDs) // Deleting group syncable should stop it being returned _, err = ss.Group().DeleteGroupSyncable(group2.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) actualGroupIDs, err = ss.Group().AdminRoleGroupsForSyncableMember(user.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{}, actualGroupIDs) } @@ -3887,7 +3887,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store) Username: model.NewId(), } user, err := ss.User().Save(user) - require.Nil(t, err) + require.NoError(t, err) group1 := &model.Group{ Name: model.NewString(model.NewId()), @@ -3897,10 +3897,10 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store) RemoteId: model.NewId(), } group1, err = ss.Group().Create(group1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) group2 := &model.Group{ Name: model.NewString(model.NewId()), @@ -3910,10 +3910,10 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store) RemoteId: model.NewId(), } group2, err = ss.Group().Create(group2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group2.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) team := &model.Team{ DisplayName: "A Name", @@ -3921,7 +3921,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store) Type: model.CHANNEL_OPEN, } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -3930,7 +3930,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store) GroupId: group1.Id, SchemeAdmin: true, }) - require.Nil(t, err) + require.NoError(t, err) groupSyncable2, err := ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -3938,33 +3938,33 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store) Type: model.GroupSyncableTypeTeam, GroupId: group2.Id, }) - require.Nil(t, err) + require.NoError(t, err) // User is a member of both groups but only one is SchmeAdmin: true actualGroupIDs, err := ss.Group().AdminRoleGroupsForSyncableMember(user.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{group1.Id}, actualGroupIDs) // Update the second group syncable to be SchemeAdmin: true and both groups should be returned groupSyncable2.SchemeAdmin = true _, err = ss.Group().UpdateGroupSyncable(groupSyncable2) - require.Nil(t, err) + require.NoError(t, err) actualGroupIDs, err = ss.Group().AdminRoleGroupsForSyncableMember(user.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{group1.Id, group2.Id}, actualGroupIDs) // Deleting membership from group should stop the group from being returned _, err = ss.Group().DeleteMember(group1.Id, user.Id) - require.Nil(t, err) + require.NoError(t, err) actualGroupIDs, err = ss.Group().AdminRoleGroupsForSyncableMember(user.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{group2.Id}, actualGroupIDs) // Deleting group syncable should stop it being returned _, err = ss.Group().DeleteGroupSyncable(group2.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) actualGroupIDs, err = ss.Group().AdminRoleGroupsForSyncableMember(user.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{}, actualGroupIDs) } @@ -3974,21 +3974,21 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) group1 := &model.Group{ Name: model.NewString(model.NewId()), @@ -3998,12 +3998,12 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group1, err = ss.Group().Create(group1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) group2 := &model.Group{ Name: model.NewString(model.NewId()), @@ -4013,10 +4013,10 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group2, err = ss.Group().Create(group2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group2.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) team := &model.Team{ DisplayName: "A Name", @@ -4024,7 +4024,7 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -4033,7 +4033,7 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) { GroupId: group1.Id, SchemeAdmin: true, }) - require.Nil(t, err) + require.NoError(t, err) groupSyncable2, err := ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -4042,35 +4042,35 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) { GroupId: group2.Id, SchemeAdmin: false, }) - require.Nil(t, err) + require.NoError(t, err) // group 1's users are returned because groupsyncable 2 has SchemeAdmin false. actualUserIDs, err := ss.Group().PermittedSyncableAdmins(team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user1.Id, user2.Id}, actualUserIDs) // update groupsyncable 2 to be SchemeAdmin true groupSyncable2.SchemeAdmin = true _, err = ss.Group().UpdateGroupSyncable(groupSyncable2) - require.Nil(t, err) + require.NoError(t, err) // group 2's users are now included in return value actualUserIDs, err = ss.Group().PermittedSyncableAdmins(team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user1.Id, user2.Id, user3.Id}, actualUserIDs) // deleted group member should not be included ss.Group().DeleteMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) actualUserIDs, err = ss.Group().PermittedSyncableAdmins(team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user1.Id, user3.Id}, actualUserIDs) // deleted group syncable no longer includes group members _, err = ss.Group().DeleteGroupSyncable(group1.Id, team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) actualUserIDs, err = ss.Group().PermittedSyncableAdmins(team.Id, model.GroupSyncableTypeTeam) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user3.Id}, actualUserIDs) } @@ -4080,21 +4080,21 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) { Username: model.NewId(), } user1, err := ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) group1 := &model.Group{ Name: model.NewString(model.NewId()), @@ -4104,12 +4104,12 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group1, err = ss.Group().Create(group1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) group2 := &model.Group{ Name: model.NewString(model.NewId()), @@ -4119,10 +4119,10 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } group2, err = ss.Group().Create(group2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(group2.Id, user3.Id) - require.Nil(t, err) + require.NoError(t, err) channel := &model.Channel{ TeamId: model.NewId(), @@ -4131,7 +4131,7 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } channel, nErr := ss.Channel().Save(channel, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -4140,7 +4140,7 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) { GroupId: group1.Id, SchemeAdmin: true, }) - require.Nil(t, err) + require.NoError(t, err) groupSyncable2, err := ss.Group().CreateGroupSyncable(&model.GroupSyncable{ AutoAdd: true, @@ -4149,35 +4149,35 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) { GroupId: group2.Id, SchemeAdmin: false, }) - require.Nil(t, err) + require.NoError(t, err) // group 1's users are returned because groupsyncable 2 has SchemeAdmin false. actualUserIDs, err := ss.Group().PermittedSyncableAdmins(channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user1.Id, user2.Id}, actualUserIDs) // update groupsyncable 2 to be SchemeAdmin true groupSyncable2.SchemeAdmin = true _, err = ss.Group().UpdateGroupSyncable(groupSyncable2) - require.Nil(t, err) + require.NoError(t, err) // group 2's users are now included in return value actualUserIDs, err = ss.Group().PermittedSyncableAdmins(channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user1.Id, user2.Id, user3.Id}, actualUserIDs) // deleted group member should not be included ss.Group().DeleteMember(group1.Id, user2.Id) - require.Nil(t, err) + require.NoError(t, err) actualUserIDs, err = ss.Group().PermittedSyncableAdmins(channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user1.Id, user3.Id}, actualUserIDs) // deleted group syncable no longer includes group members _, err = ss.Group().DeleteGroupSyncable(group1.Id, channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) actualUserIDs, err = ss.Group().PermittedSyncableAdmins(channel.Id, model.GroupSyncableTypeChannel) - require.Nil(t, err) + require.NoError(t, err) require.ElementsMatch(t, []string{user3.Id}, actualUserIDs) } @@ -4193,43 +4193,43 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } team, err := ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) user1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) user4 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user4, err = ss.User().Save(user4) - require.Nil(t, err) + require.NoError(t, err) for _, user := range []*model.User{user1, user2, user3} { _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user.Id}, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) } _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: user4.Id, SchemeGuest: true}, 9999) - require.Nil(t, nErr) + require.NoError(t, nErr) tests := []struct { testName string @@ -4261,10 +4261,10 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, ss store.Store) { for _, tt := range tests { t.Run(tt.testName, func(t *testing.T) { err = ss.Team().UpdateMembersRole(team.Id, tt.inUserIDs) - require.Nil(t, err) + require.NoError(t, err) members, err := ss.Team().GetMembers(team.Id, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, len(members), 4) // sanity check for team membership for _, member := range members { @@ -4293,35 +4293,35 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter. } channel, err := ss.Channel().Save(channel, 9999) - require.Nil(t, err) + require.NoError(t, err) user1 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user1, err = ss.User().Save(user1) - require.Nil(t, err) + require.NoError(t, err) user2 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user2, err = ss.User().Save(user2) - require.Nil(t, err) + require.NoError(t, err) user3 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user3, err = ss.User().Save(user3) - require.Nil(t, err) + require.NoError(t, err) user4 := &model.User{ Email: MakeEmail(), Username: model.NewId(), } user4, err = ss.User().Save(user4) - require.Nil(t, err) + require.NoError(t, err) for _, user := range []*model.User{user1, user2, user3} { _, err = ss.Channel().SaveMember(&model.ChannelMember{ @@ -4329,7 +4329,7 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, ss store.Store) { UserId: user.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) } _, err = ss.Channel().SaveMember(&model.ChannelMember{ @@ -4338,7 +4338,7 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, ss store.Store) { NotifyProps: model.GetDefaultChannelNotifyProps(), SchemeGuest: true, }) - require.Nil(t, err) + require.NoError(t, err) tests := []struct { testName string @@ -4370,10 +4370,10 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, ss store.Store) { for _, tt := range tests { t.Run(tt.testName, func(t *testing.T) { err = ss.Channel().UpdateMembersRole(channel.Id, tt.inUserIDs) - require.Nil(t, err) + require.NoError(t, err) members, err := ss.Channel().GetMembers(channel.Id, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, len(*members), 4) // sanity check for channel membership @@ -4402,11 +4402,11 @@ func groupTestGroupCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group1.Id) count, err := ss.Group().GroupCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) group2, err := ss.Group().Create(&model.Group{ @@ -4415,11 +4415,11 @@ func groupTestGroupCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group2.Id) countAfter, err := ss.Group().GroupCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter, count+1) } @@ -4433,7 +4433,7 @@ func groupTestGroupTeamCount(t *testing.T, ss store.Store) { Email: model.NewId() + "@simulator.amazonses.com", Type: model.TEAM_OPEN, }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Team().PermanentDelete(team.Id) group1, err := ss.Group().Create(&model.Group{ @@ -4442,7 +4442,7 @@ func groupTestGroupTeamCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group1.Id) group2, err := ss.Group().Create(&model.Group{ @@ -4451,23 +4451,23 @@ func groupTestGroupTeamCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group2.Id) groupSyncable1, err := ss.Group().CreateGroupSyncable(model.NewGroupTeam(group1.Id, team.Id, false)) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteGroupSyncable(groupSyncable1.GroupId, groupSyncable1.SyncableId, groupSyncable1.Type) count, err := ss.Group().GroupTeamCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) groupSyncable2, err := ss.Group().CreateGroupSyncable(model.NewGroupTeam(group2.Id, team.Id, false)) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteGroupSyncable(groupSyncable2.GroupId, groupSyncable2.SyncableId, groupSyncable2.Type) countAfter, err := ss.Group().GroupTeamCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter, count+1) } @@ -4478,7 +4478,7 @@ func groupTestGroupChannelCount(t *testing.T, ss store.Store) { Name: model.NewId(), Type: model.CHANNEL_OPEN, }, 9999) - require.Nil(t, err) + require.NoError(t, err) defer ss.Channel().Delete(channel.Id, 0) group1, err := ss.Group().Create(&model.Group{ @@ -4487,7 +4487,7 @@ func groupTestGroupChannelCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group1.Id) group2, err := ss.Group().Create(&model.Group{ @@ -4496,23 +4496,23 @@ func groupTestGroupChannelCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group2.Id) groupSyncable1, err := ss.Group().CreateGroupSyncable(model.NewGroupChannel(group1.Id, channel.Id, false)) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteGroupSyncable(groupSyncable1.GroupId, groupSyncable1.SyncableId, groupSyncable1.Type) count, err := ss.Group().GroupChannelCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) groupSyncable2, err := ss.Group().CreateGroupSyncable(model.NewGroupChannel(group2.Id, channel.Id, false)) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteGroupSyncable(groupSyncable2.GroupId, groupSyncable2.SyncableId, groupSyncable2.Type) countAfter, err := ss.Group().GroupChannelCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter, count+1) } @@ -4523,23 +4523,23 @@ func groupTestGroupMemberCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group.Id) member1, err := ss.Group().UpsertMember(group.Id, model.NewId()) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteMember(group.Id, member1.UserId) count, err := ss.Group().GroupMemberCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) member2, err := ss.Group().UpsertMember(group.Id, model.NewId()) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteMember(group.Id, member2.UserId) countAfter, err := ss.Group().GroupMemberCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter, count+1) } @@ -4550,7 +4550,7 @@ func groupTestDistinctGroupMemberCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group1.Id) group2, err := ss.Group().Create(&model.Group{ @@ -4559,37 +4559,37 @@ func groupTestDistinctGroupMemberCount(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group2.Id) member1, err := ss.Group().UpsertMember(group1.Id, model.NewId()) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteMember(group1.Id, member1.UserId) count, err := ss.Group().GroupMemberCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) member2, err := ss.Group().UpsertMember(group1.Id, model.NewId()) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteMember(group1.Id, member2.UserId) countAfter1, err := ss.Group().GroupMemberCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter1, count+1) member3, err := ss.Group().UpsertMember(group1.Id, member1.UserId) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().DeleteMember(group1.Id, member3.UserId) countAfter2, err := ss.Group().GroupMemberCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter2, countAfter1) } func groupTestGroupCountWithAllowReference(t *testing.T, ss store.Store) { initialCount, err := ss.Group().GroupCountWithAllowReference() - require.Nil(t, err) + require.NoError(t, err) group1, err := ss.Group().Create(&model.Group{ Name: model.NewString(model.NewId()), @@ -4597,11 +4597,11 @@ func groupTestGroupCountWithAllowReference(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group1.Id) count, err := ss.Group().GroupCountWithAllowReference() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, count, initialCount) group2, err := ss.Group().Create(&model.Group{ @@ -4611,10 +4611,10 @@ func groupTestGroupCountWithAllowReference(t *testing.T, ss store.Store) { RemoteId: model.NewId(), AllowReference: true, }) - require.Nil(t, err) + require.NoError(t, err) defer ss.Group().Delete(group2.Id) countAfter, err := ss.Group().GroupCountWithAllowReference() - require.Nil(t, err) + require.NoError(t, err) require.Greater(t, countAfter, count) } diff --git a/store/storetest/job_store.go b/store/storetest/job_store.go index b4f3dcba51..cfab648409 100644 --- a/store/storetest/job_store.go +++ b/store/storetest/job_store.go @@ -43,12 +43,12 @@ func testJobSaveGet(t *testing.T, ss store.Store) { } _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) received, err := ss.Job().Get(job.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, job.Id, received.Id, "received incorrect job after save") require.Equal(t, "12345", received.Data["Total"]) } @@ -73,12 +73,12 @@ func testJobGetAllByType(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } received, err := ss.Job().GetAllByType(jobType) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, received, 2) require.ElementsMatch(t, []string{jobs[0].Id, jobs[1].Id}, []string{received[0].Id, received[1].Id}) } @@ -111,18 +111,18 @@ func testJobGetAllByTypePage(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } received, err := ss.Job().GetAllByTypePage(jobType, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, received, 2) require.Equal(t, received[0].Id, jobs[2].Id, "should've received newest job first") require.Equal(t, received[1].Id, jobs[0].Id, "should've received second newest job second") received, err = ss.Job().GetAllByTypePage(jobType, 2, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, received, 1) require.Equal(t, received[0].Id, jobs[1].Id, "should've received oldest job last") } @@ -151,18 +151,18 @@ func testJobGetAllPage(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } received, err := ss.Job().GetAllPage(0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, received, 2) require.Equal(t, received[0].Id, jobs[2].Id, "should've received newest job first") require.Equal(t, received[1].Id, jobs[0].Id, "should've received second newest job second") received, err = ss.Job().GetAllPage(2, 2) - require.Nil(t, err) + require.NoError(t, err) require.NotEmpty(t, received) require.Equal(t, received[0].Id, jobs[1].Id, "should've received oldest job last") } @@ -203,12 +203,12 @@ func testJobGetAllByStatus(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } received, err := ss.Job().GetAllByStatus(status) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, received, 3) require.Equal(t, received[0].Id, jobs[1].Id) require.Equal(t, received[1].Id, jobs[0].Id) @@ -251,16 +251,16 @@ func testJobStoreGetNewestJobByStatusAndType(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } received, err := ss.Job().GetNewestJobByStatusAndType(status1, jobType1) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, jobs[0].Id, received.Id) received, err = ss.Job().GetNewestJobByStatusAndType(model.NewId(), model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) var nfErr *store.ErrNotFound assert.True(t, errors.As(err, &nfErr)) assert.Nil(t, received) @@ -301,31 +301,31 @@ func testJobStoreGetNewestJobByStatusesAndType(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } received, err := ss.Job().GetNewestJobByStatusesAndType([]string{status1, status2}, jobType1) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, jobs[3].Id, received.Id) received, err = ss.Job().GetNewestJobByStatusesAndType([]string{model.NewId(), model.NewId()}, model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) var nfErr *store.ErrNotFound assert.True(t, errors.As(err, &nfErr)) assert.Nil(t, received) received, err = ss.Job().GetNewestJobByStatusesAndType([]string{status2}, jobType2) - assert.NotNil(t, err) + assert.Error(t, err) assert.True(t, errors.As(err, &nfErr)) assert.Nil(t, received) received, err = ss.Job().GetNewestJobByStatusesAndType([]string{status1}, jobType2) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, jobs[2].Id, received.Id) received, err = ss.Job().GetNewestJobByStatusesAndType([]string{}, jobType1) - assert.NotNil(t, err) + assert.Error(t, err) assert.True(t, errors.As(err, &nfErr)) assert.Nil(t, received) } @@ -365,24 +365,24 @@ func testJobStoreGetCountByStatusAndType(t *testing.T, ss store.Store) { for _, job := range jobs { _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) } count, err := ss.Job().GetCountByStatusAndType(status1, jobType1) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, 2, count) count, err = ss.Job().GetCountByStatusAndType(status2, jobType2) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, 0, count) count, err = ss.Job().GetCountByStatusAndType(status1, jobType2) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, 1, count) count, err = ss.Job().GetCountByStatusAndType(status2, jobType1) - assert.Nil(t, err) + assert.NoError(t, err) assert.EqualValues(t, 1, count) } @@ -395,7 +395,7 @@ func testJobUpdateOptimistically(t *testing.T, ss store.Store) { } _, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) defer ss.Job().Delete(job.Id) job.LastActivityAt = model.GetMillis() @@ -411,11 +411,11 @@ func testJobUpdateOptimistically(t *testing.T, ss store.Store) { time.Sleep(2 * time.Millisecond) updated, err = ss.Job().UpdateOptimistically(job, model.JOB_STATUS_PENDING) - require.Nil(t, err) + require.NoError(t, err) require.True(t, updated) updatedJob, err := ss.Job().Get(job.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, updatedJob.Type, job.Type) require.Equal(t, updatedJob.CreateAt, job.CreateAt) @@ -435,7 +435,7 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) var lastUpdateAt int64 received, err := ss.Job().Save(job) - require.Nil(t, err) + require.NoError(t, err) lastUpdateAt = received.LastActivityAt defer ss.Job().Delete(job.Id) @@ -443,7 +443,7 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) time.Sleep(2 * time.Millisecond) received, err = ss.Job().UpdateStatus(job.Id, model.JOB_STATUS_PENDING) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.JOB_STATUS_PENDING, received.Status) require.Greater(t, received.LastActivityAt, lastUpdateAt) @@ -452,11 +452,11 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) time.Sleep(2 * time.Millisecond) updated, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_SUCCESS) - require.Nil(t, err) + require.NoError(t, err) require.False(t, updated) received, err = ss.Job().Get(job.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.JOB_STATUS_PENDING, received.Status) require.Equal(t, received.LastActivityAt, lastUpdateAt) @@ -464,12 +464,12 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) time.Sleep(2 * time.Millisecond) updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_PENDING, model.JOB_STATUS_IN_PROGRESS) - require.Nil(t, err) + require.NoError(t, err) require.True(t, updated, "should have succeeded") var startAtSet int64 received, err = ss.Job().Get(job.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.JOB_STATUS_IN_PROGRESS, received.Status) require.NotEqual(t, 0, received.StartAt) require.Greater(t, received.LastActivityAt, lastUpdateAt) @@ -479,11 +479,11 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) time.Sleep(2 * time.Millisecond) updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_SUCCESS) - require.Nil(t, err) + require.NoError(t, err) require.True(t, updated, "should have succeeded") received, err = ss.Job().Get(job.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.JOB_STATUS_SUCCESS, received.Status) require.Equal(t, startAtSet, received.StartAt) require.Greater(t, received.LastActivityAt, lastUpdateAt) @@ -491,8 +491,8 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) func testJobDelete(t *testing.T, ss store.Store) { job, err := ss.Job().Save(&model.Job{Id: model.NewId()}) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Job().Delete(job.Id) - assert.Nil(t, err) + assert.NoError(t, err) } diff --git a/store/storetest/license_store.go b/store/storetest/license_store.go index e82ec813de..28a1528653 100644 --- a/store/storetest/license_store.go +++ b/store/storetest/license_store.go @@ -23,15 +23,15 @@ func testLicenseStoreSave(t *testing.T, ss store.Store) { l1.Bytes = "junk" _, err := ss.License().Save(&l1) - require.Nil(t, err, "couldn't save license record") + require.NoError(t, err, "couldn't save license record") _, err = ss.License().Save(&l1) - require.Nil(t, err, "shouldn't fail on trying to save existing license record") + require.NoError(t, err, "shouldn't fail on trying to save existing license record") l1.Id = "" _, err = ss.License().Save(&l1) - require.NotNil(t, err, "should fail on invalid license") + require.Error(t, err, "should fail on invalid license") } func testLicenseStoreGet(t *testing.T, ss store.Store) { @@ -40,13 +40,13 @@ func testLicenseStoreGet(t *testing.T, ss store.Store) { l1.Bytes = "junk" _, err := ss.License().Save(&l1) - require.Nil(t, err) + require.NoError(t, err) record, err := ss.License().Get(l1.Id) - require.Nil(t, err, "couldn't get license") + require.NoError(t, err, "couldn't get license") require.Equal(t, record.Bytes, l1.Bytes, "license bytes didn't match") _, err = ss.License().Get("missing") - require.NotNil(t, err, "should fail on get license") + require.Error(t, err, "should fail on get license") } diff --git a/store/storetest/link_metadata_store.go b/store/storetest/link_metadata_store.go index 98232c8c94..16615754c4 100644 --- a/store/storetest/link_metadata_store.go +++ b/store/storetest/link_metadata_store.go @@ -41,7 +41,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) { linkMetadata, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, *metadata, *linkMetadata) }) @@ -55,7 +55,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) { _, err := ss.LinkMetadata().Save(metadata) - assert.NotNil(t, err) + assert.Error(t, err) }) t.Run("should save with duplicate URL and different timestamp", func(t *testing.T) { @@ -67,13 +67,13 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) { } _, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) metadata.Timestamp = getNextLinkMetadataTimestamp() linkMetadata, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, *metadata, *linkMetadata) }) @@ -86,13 +86,13 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) { } _, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) metadata.URL = "http://example.com/another/page" linkMetadata, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, *metadata, *linkMetadata) }) @@ -105,18 +105,18 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) { } linkMetadata, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, &model.PostImage{}, linkMetadata.Data) metadata.Data = &model.PostImage{Height: 10, Width: 20} linkMetadata, err = ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, linkMetadata.Data, &model.PostImage{Height: 10, Width: 20}) // Should return the original result, not the duplicate one linkMetadata, err = ss.LinkMetadata().Get(metadata.URL, metadata.Timestamp) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, &model.PostImage{}, linkMetadata.Data) }) } @@ -131,11 +131,11 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) { } _, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) linkMetadata, err := ss.LinkMetadata().Get(metadata.URL, metadata.Timestamp) - require.Nil(t, err) + require.NoError(t, err) require.IsType(t, metadata, linkMetadata) assert.Equal(t, *metadata, *linkMetadata) }) @@ -149,11 +149,11 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) { } _, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.LinkMetadata().Get("http://example.com/another_page", metadata.Timestamp) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound assert.True(t, errors.As(err, &nfErr)) }) @@ -167,11 +167,11 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) { } _, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.LinkMetadata().Get(metadata.URL, getNextLinkMetadataTimestamp()) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound assert.True(t, errors.As(err, &nfErr)) }) @@ -190,13 +190,13 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) { } received, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) require.IsType(t, &model.PostImage{}, received.Data) assert.Equal(t, *(metadata.Data.(*model.PostImage)), *(received.Data.(*model.PostImage))) received, err = ss.LinkMetadata().Get(metadata.URL, metadata.Timestamp) - require.Nil(t, err) + require.NoError(t, err) require.IsType(t, &model.PostImage{}, received.Data) assert.Equal(t, *(metadata.Data.(*model.PostImage)), *(received.Data.(*model.PostImage))) @@ -220,13 +220,13 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) { } received, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) require.IsType(t, &opengraph.OpenGraph{}, received.Data) assert.Equal(t, *(metadata.Data.(*opengraph.OpenGraph)), *(received.Data.(*opengraph.OpenGraph))) received, err = ss.LinkMetadata().Get(metadata.URL, metadata.Timestamp) - require.Nil(t, err) + require.NoError(t, err) require.IsType(t, &opengraph.OpenGraph{}, received.Data) assert.Equal(t, *(metadata.Data.(*opengraph.OpenGraph)), *(received.Data.(*opengraph.OpenGraph))) @@ -241,11 +241,11 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) { } received, err := ss.LinkMetadata().Save(metadata) - require.Nil(t, err) + require.NoError(t, err) assert.Nil(t, received.Data) received, err = ss.LinkMetadata().Get(metadata.URL, metadata.Timestamp) - require.Nil(t, err) + require.NoError(t, err) require.Nil(t, received.Data) }) diff --git a/store/storetest/oauth_store.go b/store/storetest/oauth_store.go index 2a4a3eb275..a7f442650a 100644 --- a/store/storetest/oauth_store.go +++ b/store/storetest/oauth_store.go @@ -40,18 +40,18 @@ func testOAuthStoreSaveApp(t *testing.T, ss store.Store) { // Try to save an app that already has an Id a1.Id = model.NewId() _, err := ss.OAuth().SaveApp(&a1) - require.NotNil(t, err, "Should have failed, cannot add an OAuth app cannot be save with an Id, it has to be updated") + require.Error(t, err, "Should have failed, cannot add an OAuth app cannot be save with an Id, it has to be updated") // Try to save an Invalid App a1.Id = "" _, err = ss.OAuth().SaveApp(&a1) - require.NotNil(t, err, "Should have failed, app should be invalid cause it doesn' have a name set") + require.Error(t, err, "Should have failed, app should be invalid cause it doesn' have a name set") // Save the app a1.Id = "" a1.Name = "TestApp" + model.NewId() _, err = ss.OAuth().SaveApp(&a1) - require.Nil(t, err) + require.NoError(t, err) } func testOAuthStoreGetApp(t *testing.T, ss store.Store) { @@ -61,25 +61,25 @@ func testOAuthStoreGetApp(t *testing.T, ss store.Store) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" _, err := ss.OAuth().SaveApp(&a1) - require.Nil(t, err) + require.NoError(t, err) // Lets try to get and app that does not exists _, err = ss.OAuth().GetApp("fake0123456789abcderfgret1") - require.NotNil(t, err, "Should have failed. App does not exists") + require.Error(t, err, "Should have failed. App does not exists") _, err = ss.OAuth().GetApp(a1.Id) - require.Nil(t, err) + require.NoError(t, err) // Lets try and get the app from a user that hasn't created any apps apps, err := ss.OAuth().GetAppByUser("fake0123456789abcderfgret1", 0, 1000) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, apps, "Should have failed. Fake user hasn't created any apps") _, err = ss.OAuth().GetAppByUser(a1.CreatorId, 0, 1000) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.OAuth().GetApps(0, 1000) - require.Nil(t, err) + require.NoError(t, err) } func testOAuthStoreUpdateApp(t *testing.T, ss store.Store) { @@ -89,7 +89,7 @@ func testOAuthStoreUpdateApp(t *testing.T, ss store.Store) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" _, err := ss.OAuth().SaveApp(&a1) - require.Nil(t, err) + require.NoError(t, err) // temporarily save the created app id id := a1.Id @@ -101,17 +101,17 @@ func testOAuthStoreUpdateApp(t *testing.T, ss store.Store) { // Lets update the app by removing the name a1.Name = "" _, err = ss.OAuth().UpdateApp(&a1) - require.NotNil(t, err, "Should have failed. App name is not set") + require.Error(t, err, "Should have failed. App name is not set") // Lets not find the app that we are trying to update a1.Id = "fake0123456789abcderfgret1" a1.Name = "NewName" _, err = ss.OAuth().UpdateApp(&a1) - require.NotNil(t, err, "Should have failed. Not able to find the app") + require.Error(t, err, "Should have failed. Not able to find the app") a1.Id = id ua, err := ss.OAuth().UpdateApp(&a1) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, ua.Name, "NewName", "name did not update") require.NotEqual(t, ua.CreateAt, 1, "create at should not have updated") require.NotEqual(t, ua.CreatorId, "12345678901234567890123456", "creator id should not have updated") @@ -124,14 +124,14 @@ func testOAuthStoreSaveAccessData(t *testing.T, ss store.Store) { // Lets try and save an incomplete access data _, err := ss.OAuth().SaveAccessData(&a1) - require.NotNil(t, err, "Should have failed. Access data needs the token") + require.Error(t, err, "Should have failed. Access data needs the token") a1.Token = model.NewId() a1.RefreshToken = model.NewId() a1.RedirectUri = "http://example.com" _, err = ss.OAuth().SaveAccessData(&a1) - require.Nil(t, err) + require.NoError(t, err) } func testOAuthUpdateAccessData(t *testing.T, ss store.Store) { @@ -143,24 +143,24 @@ func testOAuthUpdateAccessData(t *testing.T, ss store.Store) { a1.ExpiresAt = model.GetMillis() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAccessData(&a1) - require.Nil(t, err) + require.NoError(t, err) //Try to update to invalid Refresh Token refreshToken := a1.RefreshToken a1.RefreshToken = model.NewId() + "123" _, err = ss.OAuth().UpdateAccessData(&a1) - require.NotNil(t, err, "Should have failed with invalid token") + require.Error(t, err, "Should have failed with invalid token") //Try to update to invalid RedirectUri a1.RefreshToken = model.NewId() a1.RedirectUri = "" _, err = ss.OAuth().UpdateAccessData(&a1) - require.NotNil(t, err, "Should have failed with invalid Redirect URI") + require.Error(t, err, "Should have failed with invalid Redirect URI") // Should update fine a1.RedirectUri = "http://example.com" ra1, err := ss.OAuth().UpdateAccessData(&a1) - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, ra1.RefreshToken, refreshToken, "refresh tokens didn't match") } @@ -173,28 +173,28 @@ func testOAuthStoreGetAccessData(t *testing.T, ss store.Store) { a1.ExpiresAt = model.GetMillis() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAccessData(&a1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.OAuth().GetAccessData("invalidToken") - require.NotNil(t, err, "Should have failed. There is no data with an invalid token") + require.Error(t, err, "Should have failed. There is no data with an invalid token") ra1, err := ss.OAuth().GetAccessData(a1.Token) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, a1.Token, ra1.Token, "tokens didn't match") _, err = ss.OAuth().GetPreviousAccessData(a1.UserId, a1.ClientId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.OAuth().GetPreviousAccessData("user", "junk") - require.Nil(t, err) + require.NoError(t, err) // Try to get the Access data using an invalid refresh token _, err = ss.OAuth().GetAccessDataByRefreshToken(a1.Token) - require.NotNil(t, err, "Should have failed. There is no data with an invalid token") + require.Error(t, err, "Should have failed. There is no data with an invalid token") // Get the Access Data using the refresh token ra1, err = ss.OAuth().GetAccessDataByRefreshToken(a1.RefreshToken) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, a1.RefreshToken, ra1.RefreshToken, "tokens didn't match") } @@ -206,10 +206,10 @@ func testOAuthStoreRemoveAccessData(t *testing.T, ss store.Store) { a1.RefreshToken = model.NewId() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAccessData(&a1) - require.Nil(t, err) + require.NoError(t, err) err = ss.OAuth().RemoveAccessData(a1.Token) - require.Nil(t, err) + require.NoError(t, err) result, _ := ss.OAuth().GetPreviousAccessData(a1.UserId, a1.ClientId) require.Nil(t, result, "did not delete access token") @@ -223,10 +223,10 @@ func testOAuthStoreRemoveAllAccessData(t *testing.T, ss store.Store) { a1.RefreshToken = model.NewId() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAccessData(&a1) - require.Nil(t, err) + require.NoError(t, err) err = ss.OAuth().RemoveAllAccessData() - require.Nil(t, err) + require.NoError(t, err) result, _ := ss.OAuth().GetPreviousAccessData(a1.UserId, a1.ClientId) require.Nil(t, result, "did not delete access token") @@ -239,7 +239,7 @@ func testOAuthStoreSaveAuthData(t *testing.T, ss store.Store) { a1.Code = model.NewId() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAuthData(&a1) - require.Nil(t, err) + require.NoError(t, err) } func testOAuthStoreGetAuthData(t *testing.T, ss store.Store) { @@ -249,10 +249,10 @@ func testOAuthStoreGetAuthData(t *testing.T, ss store.Store) { a1.Code = model.NewId() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAuthData(&a1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.OAuth().GetAuthData(a1.Code) - require.Nil(t, err) + require.NoError(t, err) } func testOAuthStoreRemoveAuthData(t *testing.T, ss store.Store) { @@ -262,13 +262,13 @@ func testOAuthStoreRemoveAuthData(t *testing.T, ss store.Store) { a1.Code = model.NewId() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAuthData(&a1) - require.Nil(t, err) + require.NoError(t, err) err = ss.OAuth().RemoveAuthData(a1.Code) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.OAuth().GetAuthData(a1.Code) - require.NotNil(t, err, "should have errored - auth code removed") + require.Error(t, err, "should have errored - auth code removed") } func testOAuthStoreRemoveAuthDataByUser(t *testing.T, ss store.Store) { @@ -278,10 +278,10 @@ func testOAuthStoreRemoveAuthDataByUser(t *testing.T, ss store.Store) { a1.Code = model.NewId() a1.RedirectUri = "http://example.com" _, err := ss.OAuth().SaveAuthData(&a1) - require.Nil(t, err) + require.NoError(t, err) err = ss.OAuth().PermanentDeleteAuthDataByUser(a1.UserId) - require.Nil(t, err) + require.NoError(t, err) } func testOAuthGetAuthorizedApps(t *testing.T, ss store.Store) { @@ -291,11 +291,11 @@ func testOAuthGetAuthorizedApps(t *testing.T, ss store.Store) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" _, err := ss.OAuth().SaveApp(&a1) - require.Nil(t, err) + require.NoError(t, err) // Lets try and get an Authorized app for a user who hasn't authorized it apps, err := ss.OAuth().GetAuthorizedApps("fake0123456789abcderfgret1", 0, 1000) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, apps, "Should have failed. Fake user hasn't authorized the app") // allow the app @@ -305,10 +305,10 @@ func testOAuthGetAuthorizedApps(t *testing.T, ss store.Store) { p.Name = a1.Id p.Value = "true" nErr := ss.Preference().Save(&model.Preferences{p}) - require.Nil(t, nErr) + require.NoError(t, nErr) apps, err = ss.OAuth().GetAuthorizedApps(a1.CreatorId, 0, 1000) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, len(apps), 0, "It should have return apps") } @@ -319,7 +319,7 @@ func testOAuthGetAccessDataByUserForApp(t *testing.T, ss store.Store) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" _, err := ss.OAuth().SaveApp(&a1) - require.Nil(t, err) + require.NoError(t, err) // allow the app p := model.Preference{} @@ -328,10 +328,10 @@ func testOAuthGetAccessDataByUserForApp(t *testing.T, ss store.Store) { p.Name = a1.Id p.Value = "true" nErr := ss.Preference().Save(&model.Preferences{p}) - require.Nil(t, nErr) + require.NoError(t, nErr) apps, err := ss.OAuth().GetAuthorizedApps(a1.CreatorId, 0, 1000) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, len(apps), 0, "It should have return apps") // save the token @@ -343,10 +343,10 @@ func testOAuthGetAccessDataByUserForApp(t *testing.T, ss store.Store) { ad1.RedirectUri = "http://example.com" _, err = ss.OAuth().SaveAccessData(&ad1) - require.Nil(t, err) + require.NoError(t, err) accessData, err := ss.OAuth().GetAccessDataByUserForApp(a1.CreatorId, a1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, len(accessData), 0, "It should have return access data") } @@ -357,11 +357,11 @@ func testOAuthStoreDeleteApp(t *testing.T, ss store.Store) { a1.CallbackUrls = []string{"https://nowhere.com"} a1.Homepage = "https://nowhere.com" _, err := ss.OAuth().SaveApp(&a1) - require.Nil(t, err) + require.NoError(t, err) // delete a non-existent app err = ss.OAuth().DeleteApp("fakeclientId") - require.Nil(t, err) + require.NoError(t, err) s1 := &model.Session{} s1.UserId = model.NewId() @@ -369,7 +369,7 @@ func testOAuthStoreDeleteApp(t *testing.T, ss store.Store) { s1.IsOAuth = true s1, nErr := ss.Session().Save(s1) - require.Nil(t, nErr) + require.NoError(t, nErr) ad1 := model.AccessData{} ad1.ClientId = a1.Id @@ -379,14 +379,14 @@ func testOAuthStoreDeleteApp(t *testing.T, ss store.Store) { ad1.RedirectUri = "http://example.com" _, err = ss.OAuth().SaveAccessData(&ad1) - require.Nil(t, err) + require.NoError(t, err) err = ss.OAuth().DeleteApp(a1.Id) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Session().Get(s1.Token) - require.NotNil(t, nErr, "should error - session should be deleted") + require.Error(t, nErr, "should error - session should be deleted") _, err = ss.OAuth().GetAccessData(s1.Token) - require.NotNil(t, err, "should error - access data should be deleted") + require.Error(t, err, "should error - access data should be deleted") } diff --git a/store/storetest/plugin_store.go b/store/storetest/plugin_store.go index 866e828f53..62732c23d0 100644 --- a/store/storetest/plugin_store.go +++ b/store/storetest/plugin_store.go @@ -39,7 +39,7 @@ func setupKVs(t *testing.T, ss store.Store) (string, func()) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(otherKV) - require.Nil(t, err) + require.NoError(t, err) // otherPluginKV is a key value for another plugin, and used to verify other plugins' keys // aren't modified unintentionally. @@ -50,15 +50,15 @@ func setupKVs(t *testing.T, ss store.Store) (string, func()) { ExpireAt: 0, } _, err = ss.Plugin().SaveOrUpdate(otherPluginKV) - require.Nil(t, err) + require.NoError(t, err) return pluginId, func() { actualOtherKV, err := ss.Plugin().Get(otherKV.PluginId, otherKV.Key) - require.Nil(t, err, "failed to find other key value for same plugin") + require.NoError(t, err, "failed to find other key value for same plugin") assert.Equal(t, otherKV, actualOtherKV) actualOtherPluginKV, err := ss.Plugin().Get(otherPluginKV.PluginId, otherPluginKV.Key) - require.Nil(t, err, "failed to find other key value from different plugin") + require.NoError(t, err, "failed to find other key value from different plugin") assert.Equal(t, otherPluginKV, actualOtherPluginKV) } } @@ -76,7 +76,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. } kv, err := doer(kv) - require.NotNil(t, err) + require.Error(t, err) appErr, ok := err.(*model.AppError) require.True(t, ok) require.Equal(t, "model.plugin_key_value.is_valid.plugin_id.app_error", appErr.Id) @@ -99,7 +99,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. } retKV, err := doer(kv) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kv, retKV) // SaveOrUpdate returns the kv passed in, so test each field individually for // completeness. It should probably be changed to not bother doing that. @@ -109,7 +109,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. assert.Equal(t, expireAt, kv.ExpireAt) actualKV, nErr := ss.Plugin().Get(pluginId, key) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, kv, actualKV) }) @@ -129,7 +129,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. } retKV, err := doer(kv) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kv, retKV) // SaveOrUpdate returns the kv passed in, so test each field individually for // completeness. It should probably be changed to not bother doing that. @@ -140,7 +140,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. actualKV, nErr := ss.Plugin().Get(pluginId, key) _, ok := nErr.(*store.ErrNotFound) - require.NotNil(t, nErr) + require.Error(t, nErr) assert.True(t, ok) assert.Nil(t, actualKV) }) @@ -161,13 +161,13 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. } _, err := doer(kv) - require.Nil(t, err) + require.NoError(t, err) newValue := model.NewId() kv.Value = []byte(newValue) retKV, err := doer(kv) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kv, retKV) // SaveOrUpdate returns the kv passed in, so test each field individually for // completeness. It should probably be changed to not bother doing that. @@ -177,7 +177,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. assert.Equal(t, expireAt, kv.ExpireAt) actualKV, nErr := ss.Plugin().Get(pluginId, key) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, kv, actualKV) }) @@ -197,12 +197,12 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. } _, err := doer(kv) - require.Nil(t, err) + require.NoError(t, err) kv.Value = nil retKV, err := doer(kv) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kv, retKV) // SaveOrUpdate returns the kv passed in, so test each field individually for // completeness. It should probably be changed to not bother doing that. @@ -213,7 +213,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model. actualKV, nErr := ss.Plugin().Get(pluginId, key) _, ok := nErr.(*store.ErrNotFound) - require.NotNil(t, nErr) + require.Error(t, nErr) assert.True(t, ok) assert.Nil(t, actualKV) }) @@ -240,7 +240,7 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func( } ok, err := compareAndSet(kv, nil) - require.NotNil(t, err) + require.Error(t, err) assert.False(t, ok) appErr, ok := err.(*model.AppError) require.True(t, ok) @@ -252,11 +252,11 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func( t.Helper() ok, err := compareAndSet(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) require.True(t, ok, "should have succeeded to CompareAndSet") actualKV, nErr := ss.Plugin().Get(kv.PluginId, kv.Key) - require.Nil(t, nErr) + require.NoError(t, nErr) // When tested with KVSetWithOptions, a strict comparison can fail because that // function accepts a relative time and makes its own call to model.GetMillis(), @@ -277,17 +277,17 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func( t.Helper() ok, err := compareAndSet(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) require.False(t, ok, "should have failed to CompareAndSet") actualKV, nErr := ss.Plugin().Get(kv.PluginId, kv.Key) if existingKV == nil { - require.NotNil(t, nErr) + require.Error(t, nErr) _, ok := nErr.(*store.ErrNotFound) assert.True(t, ok) assert.Nil(t, actualKV) } else { - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, existingKV, actualKV) } } @@ -297,12 +297,12 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func( t.Helper() ok, err := compareAndSet(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) require.True(t, ok, "should have succeeded to CompareAndSet") actualKV, nErr := ss.Plugin().Get(kv.PluginId, kv.Key) _, ok = nErr.(*store.ErrNotFound) - require.NotNil(t, nErr) + require.Error(t, nErr) assert.True(t, ok) assert.Nil(t, actualKV) } @@ -331,7 +331,7 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func( ExpireAt: 1, } _, err := ss.Plugin().SaveOrUpdate(expiredKV) - require.Nil(t, err) + require.NoError(t, err) return expiredKV, tearDown }, @@ -407,7 +407,7 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func( ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(existingKV) - require.Nil(t, err) + require.NoError(t, err) return existingKV, tearDown } @@ -543,7 +543,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) { } ok, err := ss.Plugin().CompareAndDelete(kv, nil) - require.NotNil(t, err) + require.Error(t, err) assert.False(t, ok) appErr, ok := err.(*model.AppError) require.True(t, ok) @@ -573,7 +573,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) { for description, oldValue := range testCases { t.Run(description, func(t *testing.T) { ok, err := ss.Plugin().CompareAndDelete(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, ok) }) } @@ -594,7 +594,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) { ExpireAt: expireAt, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) testCases := map[string][]byte{ "given nil old value": nil, @@ -605,7 +605,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) { for description, oldValue := range testCases { t.Run(description, func(t *testing.T) { ok, err := ss.Plugin().CompareAndDelete(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, ok) }) } @@ -626,12 +626,12 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) { ExpireAt: expireAt, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) oldValue := []byte(model.NewId()) ok, err := ss.Plugin().CompareAndDelete(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, ok) }) @@ -650,12 +650,12 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) { ExpireAt: expireAt, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) oldValue := []byte(value) ok, err := ss.Plugin().CompareAndDelete(kv, oldValue) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, ok) }) } @@ -674,7 +674,7 @@ func testPluginSetWithOptions(t *testing.T, ss store.Store) { } ok, err := ss.Plugin().SetWithOptions(pluginId, key, []byte(value), options) - require.NotNil(t, err) + require.Error(t, err) assert.False(t, ok) appErr, ok := err.(*model.AppError) require.True(t, ok) @@ -691,7 +691,7 @@ func testPluginSetWithOptions(t *testing.T, ss store.Store) { options := model.PluginKVSetOptions{} ok, err := ss.Plugin().SetWithOptions(pluginId, key, []byte(value), options) - require.NotNil(t, err) + require.Error(t, err) assert.False(t, ok) appErr, ok := err.(*model.AppError) require.True(t, ok) @@ -741,7 +741,7 @@ func testPluginGet(t *testing.T, ss store.Store) { kv, nErr := ss.Plugin().Get(pluginId, key) _, ok := nErr.(*store.ErrNotFound) - require.NotNil(t, nErr) + require.Error(t, nErr) assert.True(t, ok) assert.Nil(t, kv) }) @@ -760,11 +760,11 @@ func testPluginGet(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) kv, err = ss.Plugin().Get(model.NewId(), key) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, kv) }) @@ -783,11 +783,11 @@ func testPluginGet(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) kv, err = ss.Plugin().Get(pluginId, model.NewId()) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, kv) }) @@ -806,11 +806,11 @@ func testPluginGet(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) kv, err = ss.Plugin().Get(pluginId, model.NewId()) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, kv) }) @@ -829,11 +829,11 @@ func testPluginGet(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) kv, err = ss.Plugin().Get(pluginId, model.NewId()) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, kv) }) @@ -852,10 +852,10 @@ func testPluginGet(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) actualKV, err := ss.Plugin().Get(pluginId, key) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, kv, actualKV) }) @@ -873,10 +873,10 @@ func testPluginGet(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) actualKV, err := ss.Plugin().Get(pluginId, key) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, kv, actualKV) }) } @@ -889,11 +889,11 @@ func testPluginDelete(t *testing.T, ss store.Store) { key := model.NewId() err := ss.Plugin().Delete(pluginId, key) - require.Nil(t, err) + require.NoError(t, err) kv, err := ss.Plugin().Get(pluginId, key) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, kv) }) @@ -933,14 +933,14 @@ func testPluginDelete(t *testing.T, ss store.Store) { } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) err = ss.Plugin().Delete(pluginId, key) - require.Nil(t, err) + require.NoError(t, err) kv, err = ss.Plugin().Get(pluginId, key) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, kv) }) @@ -961,11 +961,11 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(otherPluginKV) - require.Nil(t, err) + require.NoError(t, err) return pluginId, func() { actualOtherPluginKV, err := ss.Plugin().Get(otherPluginKV.PluginId, otherPluginKV.Key) - require.Nil(t, err, "failed to find other key value from different plugin") + require.NoError(t, err, "failed to find other key value from different plugin") assert.Equal(t, otherPluginKV, actualOtherPluginKV) } } @@ -975,7 +975,7 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) { defer tearDown() err := ss.Plugin().DeleteAllForPlugin(pluginId) - require.Nil(t, err) + require.NoError(t, err) }) t.Run("multiple keys to delete", func(t *testing.T) { @@ -989,7 +989,7 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) kv2 := &model.PluginKeyValue{ PluginId: pluginId, @@ -998,19 +998,19 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err = ss.Plugin().SaveOrUpdate(kv2) - require.Nil(t, err) + require.NoError(t, err) err = ss.Plugin().DeleteAllForPlugin(pluginId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Plugin().Get(kv.PluginId, kv.Key) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) _, err = ss.Plugin().Get(kv.PluginId, kv2.Key) _, ok = err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) }) } @@ -1018,7 +1018,7 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) { func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { t.Run("no keys", func(t *testing.T) { err := ss.Plugin().DeleteAllExpired() - require.Nil(t, err) + require.NoError(t, err) }) t.Run("no expiring keys to delete", func(t *testing.T) { @@ -1032,7 +1032,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(kvA1) - require.Nil(t, err) + require.NoError(t, err) kvA2 := &model.PluginKeyValue{ PluginId: pluginIdA, @@ -1041,7 +1041,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err = ss.Plugin().SaveOrUpdate(kvA2) - require.Nil(t, err) + require.NoError(t, err) kvB1 := &model.PluginKeyValue{ PluginId: pluginIdB, @@ -1050,7 +1050,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err = ss.Plugin().SaveOrUpdate(kvB1) - require.Nil(t, err) + require.NoError(t, err) kvB2 := &model.PluginKeyValue{ PluginId: pluginIdB, @@ -1059,25 +1059,25 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err = ss.Plugin().SaveOrUpdate(kvB2) - require.Nil(t, err) + require.NoError(t, err) err = ss.Plugin().DeleteAllExpired() - require.Nil(t, err) + require.NoError(t, err) actualKVA1, err := ss.Plugin().Get(pluginIdA, kvA1.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvA1, actualKVA1) actualKVA2, err := ss.Plugin().Get(pluginIdA, kvA2.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvA2, actualKVA2) actualKVB1, err := ss.Plugin().Get(pluginIdB, kvB1.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvB1, actualKVB1) actualKVB2, err := ss.Plugin().Get(pluginIdB, kvB2.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvB2, actualKVB2) }) @@ -1092,7 +1092,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() + 15*1000, } _, err := ss.Plugin().SaveOrUpdate(kvA1) - require.Nil(t, err) + require.NoError(t, err) kvA2 := &model.PluginKeyValue{ PluginId: pluginIdA, @@ -1101,7 +1101,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() + 15*1000, } _, err = ss.Plugin().SaveOrUpdate(kvA2) - require.Nil(t, err) + require.NoError(t, err) kvB1 := &model.PluginKeyValue{ PluginId: pluginIdB, @@ -1110,7 +1110,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() + 15*1000, } _, err = ss.Plugin().SaveOrUpdate(kvB1) - require.Nil(t, err) + require.NoError(t, err) kvB2 := &model.PluginKeyValue{ PluginId: pluginIdB, @@ -1119,25 +1119,25 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() + 15*1000, } _, err = ss.Plugin().SaveOrUpdate(kvB2) - require.Nil(t, err) + require.NoError(t, err) err = ss.Plugin().DeleteAllExpired() - require.Nil(t, err) + require.NoError(t, err) actualKVA1, err := ss.Plugin().Get(pluginIdA, kvA1.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvA1, actualKVA1) actualKVA2, err := ss.Plugin().Get(pluginIdA, kvA2.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvA2, actualKVA2) actualKVB1, err := ss.Plugin().Get(pluginIdB, kvB1.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvB1, actualKVB1) actualKVB2, err := ss.Plugin().Get(pluginIdB, kvB2.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvB2, actualKVB2) }) @@ -1152,7 +1152,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() + 15*1000, } _, err := ss.Plugin().SaveOrUpdate(kvA1) - require.Nil(t, err) + require.NoError(t, err) expiredKVA2 := &model.PluginKeyValue{ PluginId: pluginIdA, @@ -1161,7 +1161,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() - 15*1000, } _, err = ss.Plugin().SaveOrUpdate(expiredKVA2) - require.Nil(t, err) + require.NoError(t, err) kvB1 := &model.PluginKeyValue{ PluginId: pluginIdB, @@ -1170,7 +1170,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() + 15*1000, } _, err = ss.Plugin().SaveOrUpdate(kvB1) - require.Nil(t, err) + require.NoError(t, err) expiredKVB2 := &model.PluginKeyValue{ PluginId: pluginIdB, @@ -1179,28 +1179,28 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) { ExpireAt: model.GetMillis() - 15*1000, } _, err = ss.Plugin().SaveOrUpdate(expiredKVB2) - require.Nil(t, err) + require.NoError(t, err) err = ss.Plugin().DeleteAllExpired() - require.Nil(t, err) + require.NoError(t, err) actualKVA1, err := ss.Plugin().Get(pluginIdA, kvA1.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvA1, actualKVA1) actualKVA2, err := ss.Plugin().Get(pluginIdA, expiredKVA2.Key) _, ok := err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, actualKVA2) actualKVB1, err := ss.Plugin().Get(pluginIdB, kvB1.Key) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, kvB1, actualKVB1) actualKVB2, err := ss.Plugin().Get(pluginIdB, expiredKVB2.Key) _, ok = err.(*store.ErrNotFound) - require.NotNil(t, err) + require.Error(t, err) assert.True(t, ok) assert.Nil(t, actualKVB2) }) @@ -1214,7 +1214,7 @@ func testPluginList(t *testing.T, ss store.Store) { // Ignore the pluginId setup by setupKVs pluginId := model.NewId() keys, err := ss.Plugin().List(pluginId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, keys) }) @@ -1232,10 +1232,10 @@ func testPluginList(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) keys, err := ss.Plugin().List(pluginId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys, 1) assert.Equal(t, kv.Key, keys[0]) }) @@ -1257,18 +1257,18 @@ func testPluginList(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) keys = append(keys, key) } sort.Strings(keys) keys1, err := ss.Plugin().List(pluginId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys1, 100) keys2, err := ss.Plugin().List(pluginId, 100, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys2, 50) actualKeys := append(keys1, keys2...) @@ -1307,7 +1307,7 @@ func testPluginList(t *testing.T, ss store.Store) { ExpireAt: expireAt, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) if expireAt == 0 || expireAt > now { keys = append(keys, key) @@ -1318,11 +1318,11 @@ func testPluginList(t *testing.T, ss store.Store) { sort.Strings(keys) keys1, err := ss.Plugin().List(pluginId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys1, 100) keys2, err := ss.Plugin().List(pluginId, 100, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys2, 35) actualKeys := append(keys1, keys2...) @@ -1348,7 +1348,7 @@ func testPluginList(t *testing.T, ss store.Store) { ExpireAt: 0, } _, err := ss.Plugin().SaveOrUpdate(kv) - require.Nil(t, err) + require.NoError(t, err) keys = append(keys, key) } @@ -1356,19 +1356,19 @@ func testPluginList(t *testing.T, ss store.Store) { t.Run("default limit", func(t *testing.T) { keys1, err := ss.Plugin().List(pluginId, 0, 0) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys1, 10) }) t.Run("offset 0, limit 1", func(t *testing.T) { keys2, err := ss.Plugin().List(pluginId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys2, 1) }) t.Run("offset 1, limit 1", func(t *testing.T) { keys2, err := ss.Plugin().List(pluginId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, keys2, 1) }) }) diff --git a/store/storetest/post_store.go b/store/storetest/post_store.go index 7cad4835b7..298ca69633 100644 --- a/store/storetest/post_store.go +++ b/store/storetest/post_store.go @@ -64,7 +64,7 @@ func testPostStoreSave(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" p, err := ss.Post().Save(&o1) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") assert.Equal(t, int64(0), p.ReplyCount) }) @@ -88,15 +88,15 @@ func testPostStoreSave(t *testing.T, ss store.Store) { o3.Message = "zz" + model.NewId() + "b" p1, err := ss.Post().Save(&o1) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") assert.Equal(t, int64(1), p1.ReplyCount) p2, err := ss.Post().Save(&o2) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") assert.Equal(t, int64(2), p2.ReplyCount) p3, err := ss.Post().Save(&o3) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") assert.Equal(t, int64(1), p3.ReplyCount) }) @@ -107,10 +107,10 @@ func testPostStoreSave(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" _, err := ss.Post().Save(&o1) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") _, err = ss.Post().Save(&o1) - require.NotNil(t, err, "shouldn't be able to update from save") + require.Error(t, err, "shouldn't be able to update from save") }) t.Run("Update reply should update the UpdateAt of the root post", func(t *testing.T) { @@ -120,7 +120,7 @@ func testPostStoreSave(t *testing.T, ss store.Store) { rootPost.Message = "zz" + model.NewId() + "b" _, err := ss.Post().Save(&rootPost) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) @@ -133,10 +133,10 @@ func testPostStoreSave(t *testing.T, ss store.Store) { // We need to sleep here to be sure the post is not created during the same millisecond time.Sleep(time.Millisecond) _, err = ss.Post().Save(&replyPost) - require.Nil(t, err) + require.NoError(t, err) rrootPost, err := ss.Post().GetSingle(rootPost.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Greater(t, rrootPost.UpdateAt, rootPost.UpdateAt) }) @@ -147,7 +147,7 @@ func testPostStoreSave(t *testing.T, ss store.Store) { channel.Type = model.CHANNEL_OPEN _, err := ss.Channel().Save(&channel, 100) - require.Nil(t, err) + require.NoError(t, err) post := model.Post{} post.ChannelId = channel.Id @@ -157,10 +157,10 @@ func testPostStoreSave(t *testing.T, ss store.Store) { // We need to sleep here to be sure the post is not created during the same millisecond time.Sleep(time.Millisecond) _, err = ss.Post().Save(&post) - require.Nil(t, err) + require.NoError(t, err) rchannel, err := ss.Channel().Get(channel.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Greater(t, rchannel.LastPostAt, channel.LastPostAt) assert.Equal(t, int64(1), rchannel.TotalMsgCount) @@ -173,10 +173,10 @@ func testPostStoreSave(t *testing.T, ss store.Store) { // We need to sleep here to be sure the post is not created during the same millisecond time.Sleep(time.Millisecond) _, err = ss.Post().Save(&post) - require.Nil(t, err) + require.NoError(t, err) rchannel2, err := ss.Channel().Get(channel.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, rchannel.LastPostAt, rchannel2.LastPostAt) assert.Equal(t, int64(2), rchannel2.TotalMsgCount) @@ -188,10 +188,10 @@ func testPostStoreSave(t *testing.T, ss store.Store) { // We need to sleep here to be sure the post is not created during the same millisecond time.Sleep(time.Millisecond) _, err = ss.Post().Save(&post) - require.Nil(t, err) + require.NoError(t, err) rchannel3, err := ss.Channel().Get(channel.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Greater(t, rchannel3.LastPostAt, rchannel2.LastPostAt) assert.Equal(t, int64(3), rchannel3.TotalMsgCount) }) @@ -220,11 +220,11 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { t.Run("Save correctly a new set of posts", func(t *testing.T) { newPosts, errIdx, err := ss.Post().SaveMultiple([]*model.Post{&p1, &p2, &p3}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, -1, errIdx) for _, post := range newPosts { storedPost, err := ss.Post().GetSingle(post.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, post.ChannelId, storedPost.ChannelId) assert.Equal(t, post.Message, storedPost.Message) assert.Equal(t, post.UserId, storedPost.UserId) @@ -256,7 +256,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { o4.Message = "zz" + model.NewId() + "b" newPosts, errIdx, err := ss.Post().SaveMultiple([]*model.Post{&o1, &o2, &o3, &o4}) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") require.Equal(t, -1, errIdx) assert.Len(t, newPosts, 4) assert.Equal(t, int64(2), newPosts[0].ReplyCount) @@ -267,17 +267,17 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { t.Run("Try to save mixed, already saved and not saved posts", func(t *testing.T) { newPosts, errIdx, err := ss.Post().SaveMultiple([]*model.Post{&p4, &p3}) - require.NotNil(t, err) + require.Error(t, err) require.Equal(t, 1, errIdx) require.Nil(t, newPosts) storedPost, err := ss.Post().GetSingle(p3.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, p3.ChannelId, storedPost.ChannelId) assert.Equal(t, p3.Message, storedPost.Message) assert.Equal(t, p3.UserId, storedPost.UserId) storedPost, err = ss.Post().GetSingle(p4.Id) - assert.NotNil(t, err) + assert.Error(t, err) assert.Nil(t, storedPost) }) @@ -294,10 +294,10 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { replyPost.RootId = rootPost.Id _, _, err := ss.Post().SaveMultiple([]*model.Post{&rootPost, &replyPost}) - require.Nil(t, err) + require.NoError(t, err) rrootPost, err := ss.Post().GetSingle(rootPost.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, rrootPost.UpdateAt, rootPost.UpdateAt) replyPost2 := model.Post{} @@ -313,10 +313,10 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { replyPost3.RootId = rootPost.Id _, _, err = ss.Post().SaveMultiple([]*model.Post{&replyPost2, &replyPost3}) - require.Nil(t, err) + require.NoError(t, err) rrootPost2, err := ss.Post().GetSingle(rootPost.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Greater(t, rrootPost2.UpdateAt, rrootPost.UpdateAt) }) @@ -327,7 +327,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { channel.Type = model.CHANNEL_OPEN _, err := ss.Channel().Save(&channel, 100) - require.Nil(t, err) + require.NoError(t, err) post1 := model.Post{} post1.ChannelId = channel.Id @@ -346,10 +346,10 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { post3.Message = "zz" + model.NewId() + "b" _, _, err = ss.Post().SaveMultiple([]*model.Post{&post1, &post2, &post3}) - require.Nil(t, err) + require.NoError(t, err) rchannel, err := ss.Channel().Get(channel.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Greater(t, rchannel.LastPostAt, channel.LastPostAt) assert.Equal(t, int64(3), rchannel.TotalMsgCount) }) @@ -358,7 +358,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) { func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) { c1 := &model.Channel{Name: model.NewId(), DisplayName: "posttestchannel", Type: model.CHANNEL_OPEN} _, err := ss.Channel().Save(c1, 1000000) - require.Nil(t, err) + require.NoError(t, err) o1 := model.Post{} o1.ChannelId = c1.Id @@ -366,24 +366,24 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" _, err = ss.Post().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) c1, err = ss.Channel().Get(c1.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(1), c1.TotalMsgCount, "Message count should update by 1") o1.Id = "" o1.Type = model.POST_ADD_TO_TEAM _, err = ss.Post().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o1.Id = "" o1.Type = model.POST_REMOVE_FROM_TEAM _, err = ss.Post().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) c1, err = ss.Channel().Get(c1.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(1), c1.TotalMsgCount, "Message count should not update for team add/removed message") oldLastPostAt := c1.LastPostAt @@ -394,10 +394,10 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) { o2.Message = "zz" + model.NewId() + "b" o2.CreateAt = int64(7) _, err = ss.Post().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) c1, err = ss.Channel().Get(c1.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, oldLastPostAt, c1.LastPostAt, "LastPostAt should not update for old message save") } @@ -411,20 +411,20 @@ func testPostStoreGet(t *testing.T, ss store.Store) { require.Equal(t, 0, strings.Index(etag1, model.CurrentVersion+"."), "Invalid Etag") o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) etag2 := ss.Post().GetEtag(o1.ChannelId, false, false) require.Equal(t, 0, strings.Index(etag2, fmt.Sprintf("%v.%v", model.CurrentVersion, o1.UpdateAt)), "Invalid Etag") r1, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r1.Posts[o1.Id].CreateAt, o1.CreateAt, "invalid returned post") _, err = ss.Post().Get("123", false, false, false) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") _, err = ss.Post().Get("", false, false, false) - require.NotNil(t, err, "should fail for blank post ids") + require.Error(t, err, "should fail for blank post ids") } func testPostStoreGetSingle(t *testing.T, ss store.Store) { @@ -434,14 +434,14 @@ func testPostStoreGetSingle(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) post, err := ss.Post().GetSingle(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, post.CreateAt, o1.CreateAt, "invalid returned post") _, err = ss.Post().GetSingle("123") - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testPostStoreUpdate(t *testing.T, ss store.Store) { @@ -450,7 +450,7 @@ func testPostStoreUpdate(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -459,25 +459,25 @@ func testPostStoreUpdate(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = o1.ChannelId o3.UserId = model.NewId() o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro1 := r1.Posts[o1.Id] r2, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro2 := r2.Posts[o2.Id] r3, err := ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro3 := r3.Posts[o3.Id] require.Equal(t, ro1.Message, o1.Message, "Failed to save/get") @@ -485,10 +485,10 @@ func testPostStoreUpdate(t *testing.T, ss store.Store) { o1a := ro1.Clone() o1a.Message = ro1.Message + "BBBBBBBBBB" _, err = ss.Post().Update(o1a, ro1) - require.Nil(t, err) + require.NoError(t, err) r1, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro1a := r1.Posts[o1.Id] require.Equal(t, ro1a.Message, o1a.Message, "Failed to update/get") @@ -496,10 +496,10 @@ func testPostStoreUpdate(t *testing.T, ss store.Store) { o2a := ro2.Clone() o2a.Message = ro2.Message + "DDDDDDD" _, err = ss.Post().Update(o2a, ro2) - require.Nil(t, err) + require.NoError(t, err) r2, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro2a := r2.Posts[o2.Id] require.Equal(t, ro2a.Message, o2a.Message, "Failed to update/get") @@ -507,10 +507,10 @@ func testPostStoreUpdate(t *testing.T, ss store.Store) { o3a := ro3.Clone() o3a.Message = ro3.Message + "WWWWWWW" _, err = ss.Post().Update(o3a, ro3) - require.Nil(t, err) + require.NoError(t, err) r3, err = ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro3a := r3.Posts[o3.Id] if ro3a.Message != o3a.Message { @@ -523,20 +523,20 @@ func testPostStoreUpdate(t *testing.T, ss store.Store) { Message: model.NewId(), Filenames: []string{"test"}, }) - require.Nil(t, err) + require.NoError(t, err) r4, err := ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro4 := r4.Posts[o4.Id] o4a := ro4.Clone() o4a.Filenames = []string{} o4a.FileIds = []string{model.NewId()} _, err = ss.Post().Update(o4a, ro4) - require.Nil(t, err) + require.NoError(t, err) r4, err = ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro4a := r4.Posts[o4.Id] require.Empty(t, ro4a.Filenames, "Failed to clear Filenames") @@ -554,14 +554,14 @@ func testPostStoreDelete(t *testing.T, ss store.Store) { require.Equal(t, 0, strings.Index(etag1, model.CurrentVersion+"."), "Invalid Etag") o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r1.Posts[o1.Id].CreateAt, o1.CreateAt, "invalid returned post") err = ss.Post().Delete(o1.Id, model.GetMillis(), deleteByID) - require.Nil(t, err) + require.NoError(t, err) posts, _ := ss.Post().GetPostsCreatedAt(o1.ChannelId, o1.CreateAt) post := posts[0] @@ -570,7 +570,7 @@ func testPostStoreDelete(t *testing.T, ss store.Store) { assert.Equal(t, deleteByID, actual, "Expected (*Post).Props[model.POST_PROPS_DELETE_BY] to be %v but got %v.", deleteByID, actual) r3, err := ss.Post().Get(o1.Id, false, false, false) - require.NotNil(t, err, "Missing id should have failed - PostList %v", r3) + require.Error(t, err, "Missing id should have failed - PostList %v", r3) etag2 := ss.Post().GetEtag(o1.ChannelId, false, false) require.Equal(t, 0, strings.Index(etag2, model.CurrentVersion+"."), "Invalid Etag") @@ -582,7 +582,7 @@ func testPostStoreDelete1Level(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -591,16 +591,16 @@ func testPostStoreDelete1Level(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) err = ss.Post().Delete(o1.Id, model.GetMillis(), "") - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Get(o1.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") _, err = ss.Post().Get(o2.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") } func testPostStoreDelete2Level(t *testing.T, ss store.Store) { @@ -609,7 +609,7 @@ func testPostStoreDelete2Level(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -618,7 +618,7 @@ func testPostStoreDelete2Level(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = o1.ChannelId @@ -627,29 +627,29 @@ func testPostStoreDelete2Level(t *testing.T, ss store.Store) { o3.ParentId = o2.Id o3.RootId = o1.Id o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) o4 := &model.Post{} o4.ChannelId = model.NewId() o4.UserId = model.NewId() o4.Message = "zz" + model.NewId() + "b" o4, err = ss.Post().Save(o4) - require.Nil(t, err) + require.NoError(t, err) err = ss.Post().Delete(o1.Id, model.GetMillis(), "") - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Get(o1.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") _, err = ss.Post().Get(o2.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") _, err = ss.Post().Get(o3.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") _, err = ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) } func testPostStorePermDelete1Level(t *testing.T, ss store.Store) { @@ -658,7 +658,7 @@ func testPostStorePermDelete1Level(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -667,29 +667,29 @@ func testPostStorePermDelete1Level(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = model.NewId() o3.UserId = model.NewId() o3.Message = "zz" + model.NewId() + "b" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) err2 := ss.Post().PermanentDeleteByUser(o2.UserId) - require.Nil(t, err2) + require.NoError(t, err2) _, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err, "Deleted id shouldn't have failed") + require.NoError(t, err, "Deleted id shouldn't have failed") _, err = ss.Post().Get(o2.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") err = ss.Post().PermanentDeleteByChannel(o3.ChannelId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Get(o3.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") } func testPostStorePermDelete1Level2(t *testing.T, ss store.Store) { @@ -698,7 +698,7 @@ func testPostStorePermDelete1Level2(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -707,26 +707,26 @@ func testPostStorePermDelete1Level2(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = model.NewId() o3.UserId = model.NewId() o3.Message = "zz" + model.NewId() + "b" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) err2 := ss.Post().PermanentDeleteByUser(o1.UserId) - require.Nil(t, err2) + require.NoError(t, err2) _, err = ss.Post().Get(o1.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") _, err = ss.Post().Get(o2.Id, false, false, false) - require.NotNil(t, err, "Deleted id should have failed") + require.Error(t, err, "Deleted id should have failed") _, err = ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err, "Deleted id should have failed") + require.NoError(t, err, "Deleted id should have failed") } func testPostStoreGetWithChildren(t *testing.T, ss store.Store) { @@ -735,7 +735,7 @@ func testPostStoreGetWithChildren(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -744,7 +744,7 @@ func testPostStoreGetWithChildren(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = o1.ChannelId @@ -753,26 +753,26 @@ func testPostStoreGetWithChildren(t *testing.T, ss store.Store) { o3.ParentId = o2.Id o3.RootId = o1.Id o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) pl, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, pl.Posts, 3, "invalid returned post") dErr := ss.Post().Delete(o3.Id, model.GetMillis(), "") - require.Nil(t, dErr) + require.NoError(t, dErr) pl, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, pl.Posts, 2, "invalid returned post") dErr = ss.Post().Delete(o2.Id, model.GetMillis(), "") - require.Nil(t, dErr) + require.NoError(t, dErr) pl, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, pl.Posts, 1, "invalid returned post") } @@ -783,7 +783,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2 := &model.Post{} @@ -793,7 +793,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id _, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2a := &model.Post{} @@ -803,7 +803,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { o2a.ParentId = o1.Id o2a.RootId = o1.Id o2a, err = ss.Post().Save(o2a) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o3 := &model.Post{} @@ -813,7 +813,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { o3.ParentId = o1.Id o3.RootId = o1.Id o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o4 := &model.Post{} @@ -821,7 +821,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { o4.UserId = model.NewId() o4.Message = "zz" + model.NewId() + "b" o4, err = ss.Post().Save(o4) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o5 := &model.Post{} @@ -831,10 +831,10 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { o5.ParentId = o4.Id o5.RootId = o4.Id o5, err = ss.Post().Save(o5) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: o1.ChannelId, Page: 0, PerPage: 4}, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r1.Order[0], o5.Id, "invalid order") require.Equal(t, r1.Order[1], o4.Id, "invalid order") @@ -847,7 +847,7 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { require.Equal(t, r1.Posts[o1.Id].Message, o1.Message, "Missing parent") r2, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: o1.ChannelId, Page: 0, PerPage: 4}, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r2.Order[0], o5.Id, "invalid order") require.Equal(t, r2.Order[1], o4.Id, "invalid order") @@ -861,17 +861,17 @@ func testPostStoreGetPostsWithDetails(t *testing.T, ss store.Store) { // Run once to fill cache _, err = ss.Post().GetPosts(model.GetPostsOptions{ChannelId: o1.ChannelId, Page: 0, PerPage: 30}, false) - require.Nil(t, err) + require.NoError(t, err) o6 := &model.Post{} o6.ChannelId = o1.ChannelId o6.UserId = model.NewId() o6.Message = "zz" + model.NewId() + "b" _, err = ss.Post().Save(o6) - require.Nil(t, err) + require.NoError(t, err) r3, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: o1.ChannelId, Page: 0, PerPage: 30}, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, 7, len(r3.Order)) } @@ -887,7 +887,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) posts = append(posts, post) @@ -908,7 +908,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should not return anything before the first post", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: posts[0].Id, Page: 0, PerPage: 10}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{}, postList.Order) assert.Equal(t, map[string]*model.Post{}, postList.Posts) @@ -916,7 +916,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return posts before a post", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: posts[5].Id, Page: 0, PerPage: 10}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{posts[4].Id, posts[3].Id, posts[2].Id, posts[1].Id, posts[0].Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -930,7 +930,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should limit posts before", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: posts[5].Id, PerPage: 2}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{posts[4].Id, posts[3].Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -941,7 +941,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should not return anything after the last post", func(t *testing.T) { postList, err := ss.Post().GetPostsAfter(model.GetPostsOptions{ChannelId: channelId, PostId: posts[len(posts)-1].Id, PerPage: 10}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{}, postList.Order) assert.Equal(t, map[string]*model.Post{}, postList.Posts) @@ -949,7 +949,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return posts after a post", func(t *testing.T) { postList, err := ss.Post().GetPostsAfter(model.GetPostsOptions{ChannelId: channelId, PostId: posts[5].Id, PerPage: 10}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{posts[9].Id, posts[8].Id, posts[7].Id, posts[6].Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -962,7 +962,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should limit posts after", func(t *testing.T) { postList, err := ss.Post().GetPostsAfter(model.GetPostsOptions{ChannelId: channelId, PostId: posts[5].Id, PerPage: 2}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{posts[7].Id, posts[6].Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -989,7 +989,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { Message: "message", }) post1.ReplyCount = 1 - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post2, err := ss.Post().Save(&model.Post{ @@ -997,7 +997,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) post2.ReplyCount = 2 time.Sleep(time.Millisecond) @@ -1008,7 +1008,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { RootId: post1.Id, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) post3.ReplyCount = 1 time.Sleep(time.Millisecond) @@ -1019,7 +1019,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { ParentId: post2.Id, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) post4.ReplyCount = 2 time.Sleep(time.Millisecond) @@ -1028,7 +1028,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post6, err := ss.Post().Save(&model.Post{ @@ -1039,7 +1039,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { Message: "message", }) post6.ReplyCount = 2 - require.Nil(t, err) + require.NoError(t, err) // Adding a post to a thread changes the UpdateAt timestamp of the parent post post1.UpdateAt = post3.UpdateAt @@ -1047,7 +1047,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return each post and thread before a post", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 2}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post3.Id, post2.Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -1061,7 +1061,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return each post and the root of each thread after a post", func(t *testing.T) { postList, err := ss.Post().GetPostsAfter(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 2}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post6.Id, post5.Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -1089,7 +1089,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "post1", }) - require.Nil(t, err) + require.NoError(t, err) post1.ReplyCount = 1 time.Sleep(time.Millisecond) @@ -1098,7 +1098,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "post2", }) - require.Nil(t, err) + require.NoError(t, err) post2.ReplyCount = 2 time.Sleep(time.Millisecond) @@ -1109,7 +1109,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { RootId: post1.Id, Message: "post3", }) - require.Nil(t, err) + require.NoError(t, err) post3.ReplyCount = 1 time.Sleep(time.Millisecond) @@ -1120,7 +1120,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { ParentId: post2.Id, Message: "post4", }) - require.Nil(t, err) + require.NoError(t, err) post4.ReplyCount = 2 time.Sleep(time.Millisecond) @@ -1129,7 +1129,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "post5", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post6, err := ss.Post().Save(&model.Post{ @@ -1140,7 +1140,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { Message: "post6", }) post6.ReplyCount = 2 - require.Nil(t, err) + require.NoError(t, err) // Adding a post to a thread changes the UpdateAt timestamp of the parent post post1.UpdateAt = post3.UpdateAt @@ -1148,7 +1148,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return each post and thread before a post", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 2, SkipFetchThreads: true}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post3.Id, post2.Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -1160,7 +1160,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return each post and thread before a post with limit", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 1, SkipFetchThreads: true}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post3.Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -1171,7 +1171,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return each post and the root of each thread after a post", func(t *testing.T) { postList, err := ss.Post().GetPostsAfter(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 2, SkipFetchThreads: true}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post6.Id, post5.Id}, postList.Order) assert.Equal(t, map[string]*model.Post{ @@ -1198,7 +1198,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "post1", }) - require.Nil(t, err) + require.NoError(t, err) post1.ReplyCount = 1 time.Sleep(time.Millisecond) @@ -1207,7 +1207,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "post2", }) - require.Nil(t, err) + require.NoError(t, err) post2.ReplyCount = 2 time.Sleep(time.Millisecond) @@ -1218,7 +1218,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { RootId: post1.Id, Message: "post3", }) - require.Nil(t, err) + require.NoError(t, err) post3.ReplyCount = 1 time.Sleep(time.Millisecond) @@ -1229,7 +1229,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { ParentId: post2.Id, Message: "post4", }) - require.Nil(t, err) + require.NoError(t, err) post4.ReplyCount = 2 time.Sleep(time.Millisecond) @@ -1238,7 +1238,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { UserId: userId, Message: "post5", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post6, err := ss.Post().Save(&model.Post{ @@ -1249,7 +1249,7 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { Message: "post6", }) post6.ReplyCount = 2 - require.Nil(t, err) + require.NoError(t, err) // Adding a post to a thread changes the UpdateAt timestamp of the parent post post1.UpdateAt = post3.UpdateAt @@ -1257,21 +1257,21 @@ func testPostStoreGetPostsBeforeAfter(t *testing.T, ss store.Store) { t.Run("should return each root post before a post", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 2, CollapsedThreads: true}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post2.Id, post1.Id}, postList.Order) }) t.Run("should return each root post before a post with limit", func(t *testing.T) { postList, err := ss.Post().GetPostsBefore(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 1, CollapsedThreads: true}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post2.Id}, postList.Order) }) t.Run("should return each root after a post", func(t *testing.T) { postList, err := ss.Post().GetPostsAfter(model.GetPostsOptions{ChannelId: channelId, PostId: post4.Id, PerPage: 2, CollapsedThreads: true}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []string{post5.Id}, postList.Order) }) @@ -1288,7 +1288,7 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) _, err = ss.Post().Save(&model.Post{ @@ -1296,7 +1296,7 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post3, err := ss.Post().Save(&model.Post{ @@ -1304,7 +1304,7 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post4, err := ss.Post().Save(&model.Post{ @@ -1312,7 +1312,7 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post5, err := ss.Post().Save(&model.Post{ @@ -1321,7 +1321,7 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { Message: "message", RootId: post3.Id, }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post6, err := ss.Post().Save(&model.Post{ @@ -1330,11 +1330,11 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { Message: "message", RootId: post1.Id, }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) postList, err := ss.Post().GetPostsSince(model.GetPostsSinceOptions{ChannelId: channelId, Time: post3.CreateAt}, false) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{ post6.Id, @@ -1361,11 +1361,11 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) postList, err := ss.Post().GetPostsSince(model.GetPostsSinceOptions{ChannelId: channelId, Time: post1.CreateAt}, false) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{}, postList.Order) assert.Empty(t, postList.Posts) @@ -1382,17 +1382,17 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) // Make a request that returns no results postList, err := ss.Post().GetPostsSince(model.GetPostsSinceOptions{ChannelId: channelId, Time: post1.CreateAt}, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, model.NewPostList(), postList) // And then ensure that it doesn't cause future requests to also return no results postList, err = ss.Post().GetPostsSince(model.GetPostsSinceOptions{ChannelId: channelId, Time: post1.CreateAt - 1}, true) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{post1.Id}, postList.Order) @@ -1410,7 +1410,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post2, err := ss.Post().Save(&model.Post{ @@ -1418,7 +1418,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post3, err := ss.Post().Save(&model.Post{ @@ -1426,7 +1426,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post4, err := ss.Post().Save(&model.Post{ @@ -1434,7 +1434,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { UserId: userId, Message: "message", }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post5, err := ss.Post().Save(&model.Post{ @@ -1443,7 +1443,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { Message: "message", RootId: post3.Id, }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) post6, err := ss.Post().Save(&model.Post{ @@ -1452,11 +1452,11 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { Message: "message", RootId: post1.Id, }) - require.Nil(t, err) + require.NoError(t, err) t.Run("should return the last posts created in a channel", func(t *testing.T) { postList, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: channelId, Page: 0, PerPage: 30, SkipFetchThreads: false}, false) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{ post6.Id, @@ -1478,7 +1478,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { t.Run("should return the last posts created in a channel and the threads and the reply count must be 0", func(t *testing.T) { postList, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: channelId, Page: 0, PerPage: 2, SkipFetchThreads: false}, false) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{ post6.Id, @@ -1498,7 +1498,7 @@ func testPostStoreGetPosts(t *testing.T, ss store.Store) { t.Run("should return the last posts created in a channel without the threads and the reply count must be correct", func(t *testing.T) { postList, err := ss.Post().GetPosts(model.GetPostsOptions{ChannelId: channelId, Page: 0, PerPage: 2, SkipFetchThreads: true}, false) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []string{ post6.Id, @@ -1521,7 +1521,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { o0.UserId = model.NewId() o0.Message = "zz" + model.NewId() + "b" _, err := ss.Post().Save(o0) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o1 := &model.Post{} @@ -1530,7 +1530,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "system_join_channel message" _, err = ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o0a := &model.Post{} @@ -1540,7 +1540,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { o0a.ParentId = o1.Id o0a.RootId = o1.Id _, err = ss.Post().Save(o0a) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o0b := &model.Post{} @@ -1551,7 +1551,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { o0b.RootId = o1.Id o0b.DeleteAt = 1 _, err = ss.Post().Save(o0b) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) otherChannelPost := &model.Post{} @@ -1559,7 +1559,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { otherChannelPost.UserId = model.NewId() otherChannelPost.Message = "zz" + model.NewId() + "b" _, err = ss.Post().Save(otherChannelPost) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2 := &model.Post{} @@ -1567,7 +1567,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { o2.UserId = model.NewId() o2.Message = "zz" + model.NewId() + "b" _, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2a := &model.Post{} @@ -1577,43 +1577,43 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) { o2a.ParentId = o2.Id o2a.RootId = o2.Id _, err = ss.Post().Save(o2a) - require.Nil(t, err) + require.NoError(t, err) rPostId1, err := ss.Post().GetPostIdBeforeTime(channelId, o0a.CreateAt) require.Equal(t, rPostId1, o1.Id, "should return before post o1") - require.Nil(t, err) + require.NoError(t, err) rPostId1, err = ss.Post().GetPostIdAfterTime(channelId, o0b.CreateAt) require.Equal(t, rPostId1, o2.Id, "should return before post o2") - require.Nil(t, err) + require.NoError(t, err) rPost1, err := ss.Post().GetPostAfterTime(channelId, o0b.CreateAt) require.Equal(t, rPost1.Id, o2.Id, "should return before post o2") - require.Nil(t, err) + require.NoError(t, err) rPostId2, err := ss.Post().GetPostIdBeforeTime(channelId, o0.CreateAt) require.Empty(t, rPostId2, "should return no post") - require.Nil(t, err) + require.NoError(t, err) rPostId2, err = ss.Post().GetPostIdAfterTime(channelId, o0.CreateAt) require.Equal(t, rPostId2, o1.Id, "should return before post o1") - require.Nil(t, err) + require.NoError(t, err) rPost2, err := ss.Post().GetPostAfterTime(channelId, o0.CreateAt) require.Equal(t, rPost2.Id, o1.Id, "should return before post o1") - require.Nil(t, err) + require.NoError(t, err) rPostId3, err := ss.Post().GetPostIdBeforeTime(channelId, o2a.CreateAt) require.Equal(t, rPostId3, o2.Id, "should return before post o2") - require.Nil(t, err) + require.NoError(t, err) rPostId3, err = ss.Post().GetPostIdAfterTime(channelId, o2a.CreateAt) require.Empty(t, rPostId3, "should return no post") - require.Nil(t, err) + require.NoError(t, err) rPost3, err := ss.Post().GetPostAfterTime(channelId, o2a.CreateAt) require.Empty(t, rPost3, "should return no post") - require.Nil(t, err) + require.NoError(t, err) } func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { @@ -1623,7 +1623,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN t1, err := ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) c1 := &model.Channel{} c1.TeamId = t1.Id @@ -1631,7 +1631,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := &model.Post{} o1.ChannelId = c1.Id @@ -1639,7 +1639,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { o1.CreateAt = utils.MillisFromTime(utils.Yesterday()) o1.Message = "zz" + model.NewId() + "b" o1, nErr = ss.Post().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1a := &model.Post{} o1a.ChannelId = c1.Id @@ -1647,7 +1647,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { o1a.CreateAt = o1.CreateAt o1a.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o1a) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := &model.Post{} o2.ChannelId = c1.Id @@ -1655,7 +1655,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { o2.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24) o2.Message = "zz" + model.NewId() + "b" o2, nErr = ss.Post().Save(o2) - require.Nil(t, nErr) + require.NoError(t, nErr) o2a := &model.Post{} o2a.ChannelId = c1.Id @@ -1663,10 +1663,10 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) { o2a.CreateAt = o1.CreateAt - (1000 * 60 * 60 * 24) o2a.Message = "zz" + model.NewId() + "b" _, nErr = ss.Post().Save(o2a) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, err := ss.Post().AnalyticsUserCountsWithPostsByDay(t1.Id) - require.Nil(t, err) + require.NoError(t, err) row1 := r1[0] require.Equal(t, float64(2), row1.Value, "wrong value") @@ -1682,7 +1682,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN t1, err := ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) c1 := &model.Channel{} c1.TeamId = t1.Id @@ -1690,7 +1690,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, nErr := ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1 := &model.Post{} o1.ChannelId = c1.Id @@ -1699,7 +1699,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" o1.Hashtags = "hashtag" o1, nErr = ss.Post().Save(o1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1a := &model.Post{} o1a.ChannelId = c1.Id @@ -1708,7 +1708,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { o1a.Message = "zz" + model.NewId() + "b" o1a.FileIds = []string{"fileId1"} _, nErr = ss.Post().Save(o1a) - require.Nil(t, nErr) + require.NoError(t, nErr) o2 := &model.Post{} o2.ChannelId = c1.Id @@ -1717,7 +1717,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { o2.Message = "zz" + model.NewId() + "b" o2.Filenames = []string{"filename1"} o2, nErr = ss.Post().Save(o2) - require.Nil(t, nErr) + require.NoError(t, nErr) o2a := &model.Post{} o2a.ChannelId = c1.Id @@ -1727,7 +1727,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { o2a.Hashtags = "hashtag" o2a.FileIds = []string{"fileId2"} _, nErr = ss.Post().Save(o2a) - require.Nil(t, nErr) + require.NoError(t, nErr) bot1 := &model.Bot{ Username: "username", @@ -1736,7 +1736,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { UserId: model.NewId(), } _, nErr = ss.Bot().Save(bot1) - require.Nil(t, nErr) + require.NoError(t, nErr) b1 := &model.Post{} b1.Message = "bot message one" @@ -1744,7 +1744,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { b1.UserId = bot1.UserId b1.CreateAt = utils.MillisFromTime(utils.Yesterday()) _, nErr = ss.Post().Save(b1) - require.Nil(t, nErr) + require.NoError(t, nErr) b1a := &model.Post{} b1a.Message = "bot message two" @@ -1752,7 +1752,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { b1a.UserId = bot1.UserId b1a.CreateAt = utils.MillisFromTime(utils.Yesterday()) - (1000 * 60 * 60 * 24 * 2) _, nErr = ss.Post().Save(b1a) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(1 * time.Second) @@ -1763,52 +1763,52 @@ func testPostCountsByDay(t *testing.T, ss store.Store) { // last 31 days, all users (including bots) postCountsOptions := &model.AnalyticsPostCountsOptions{TeamId: t1.Id, BotsOnly: false, YesterdayOnly: false} r1, err := ss.Post().AnalyticsPostCountsByDay(postCountsOptions) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, float64(3), r1[0].Value) assert.Equal(t, float64(3), r1[1].Value) // last 31 days, bots only postCountsOptions = &model.AnalyticsPostCountsOptions{TeamId: t1.Id, BotsOnly: true, YesterdayOnly: false} r1, err = ss.Post().AnalyticsPostCountsByDay(postCountsOptions) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, float64(1), r1[0].Value) assert.Equal(t, float64(1), r1[1].Value) // yesterday only, all users (including bots) postCountsOptions = &model.AnalyticsPostCountsOptions{TeamId: t1.Id, BotsOnly: false, YesterdayOnly: true} r1, err = ss.Post().AnalyticsPostCountsByDay(postCountsOptions) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, float64(3), r1[0].Value) // yesterday only, bots only postCountsOptions = &model.AnalyticsPostCountsOptions{TeamId: t1.Id, BotsOnly: true, YesterdayOnly: true} r1, err = ss.Post().AnalyticsPostCountsByDay(postCountsOptions) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, float64(1), r1[0].Value) // total r2, err := ss.Post().AnalyticsPostCount(t1.Id, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(6), r2) // total across teams r2, err = ss.Post().AnalyticsPostCount("", false, false) - require.Nil(t, err) + require.NoError(t, err) assert.GreaterOrEqual(t, r2, int64(6)) // total across teams with files r2, err = ss.Post().AnalyticsPostCount("", true, false) - require.Nil(t, err) + require.NoError(t, err) assert.GreaterOrEqual(t, r2, int64(3)) // total across teams with hastags r2, err = ss.Post().AnalyticsPostCount("", false, true) - require.Nil(t, err) + require.NoError(t, err) assert.GreaterOrEqual(t, r2, int64(2)) // total across teams with hastags and files r2, err = ss.Post().AnalyticsPostCount("", true, true) - require.Nil(t, err) + require.NoError(t, err) assert.GreaterOrEqual(t, r2, int64(1)) } @@ -1819,14 +1819,14 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN c1, err := ss.Channel().Save(c1, -1) - require.Nil(t, err) + require.NoError(t, err) o1 := &model.Post{} o1.ChannelId = c1.Id o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err = ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2 := &model.Post{} @@ -1834,7 +1834,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor o2.UserId = model.NewId() o2.Message = "zz" + model.NewId() + "b" o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o3 := &model.Post{} @@ -1843,7 +1843,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor o3.Message = "zz" + model.NewId() + "b" o3.DeleteAt = 1 o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o4 := &model.Post{} @@ -1851,7 +1851,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor o4.UserId = model.NewId() o4.Message = "zz" + model.NewId() + "b" o4, err = ss.Post().Save(o4) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) c2 := &model.Channel{} @@ -1870,18 +1870,18 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor m2.NotifyProps = model.GetDefaultChannelNotifyProps() c2, err = ss.Channel().SaveDirectChannel(c2, m1, m2) - require.Nil(t, err) + require.NoError(t, err) o5 := &model.Post{} o5.ChannelId = c2.Id o5.UserId = m2.UserId o5.Message = "zz" + model.NewId() + "b" o5, err = ss.Post().Save(o5) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) r1, err := ss.Post().GetFlaggedPosts(o1.ChannelId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r1.Order, "should be empty") @@ -1895,10 +1895,10 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor } err = ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) r2, err := ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r2.Order, 1, "should have 1 post") preferences = model.Preferences{ @@ -1911,22 +1911,22 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor } err = ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) r3, err := ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r3.Order, 1, "should have 1 post") r3, err = ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r3.Order, 1, "should have 1 post") r3, err = ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 1000, 10) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r3.Order, "should be empty") r4, err := ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r4.Order, 2, "should have 2 posts") preferences = model.Preferences{ @@ -1939,10 +1939,10 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor } err = ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) r4, err = ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r4.Order, 2, "should have 2 posts") preferences = model.Preferences{ @@ -1954,14 +1954,14 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor }, } err = ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) r4, err = ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r4.Order, 2, "should have 2 posts") r4, err = ss.Post().GetFlaggedPostsForTeam(o1.UserId, model.NewId(), 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r4.Order, "should have 0 posts") preferences = model.Preferences{ @@ -1973,10 +1973,10 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor }, } err = ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) r4, err = ss.Post().GetFlaggedPostsForTeam(o1.UserId, c1.TeamId, 0, 10) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r4.Order, 3, "should have 3 posts") // Manually truncate Channels table until testlib can handle cleanups @@ -1989,7 +1989,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2 := &model.Post{} @@ -1997,7 +1997,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) { o2.UserId = model.NewId() o2.Message = "zz" + model.NewId() + "b" o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o3 := &model.Post{} @@ -2006,11 +2006,11 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) { o3.Message = "zz" + model.NewId() + "b" o3.DeleteAt = 1 o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) r1, err := ss.Post().GetFlaggedPosts(o1.UserId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r1.Order, "should be empty") preferences := model.Preferences{ @@ -2023,10 +2023,10 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) { } nErr := ss.Preference().Save(&preferences) - require.Nil(t, nErr) + require.NoError(t, nErr) r2, err := ss.Post().GetFlaggedPosts(o1.UserId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r2.Order, 1, "should have 1 post") preferences = model.Preferences{ @@ -2039,22 +2039,22 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) { } nErr = ss.Preference().Save(&preferences) - require.Nil(t, nErr) + require.NoError(t, nErr) r3, err := ss.Post().GetFlaggedPosts(o1.UserId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r3.Order, 1, "should have 1 post") r3, err = ss.Post().GetFlaggedPosts(o1.UserId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r3.Order, 1, "should have 1 post") r3, err = ss.Post().GetFlaggedPosts(o1.UserId, 1000, 10) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r3.Order, "should be empty") r4, err := ss.Post().GetFlaggedPosts(o1.UserId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r4.Order, 2, "should have 2 posts") preferences = model.Preferences{ @@ -2067,10 +2067,10 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) { } nErr = ss.Preference().Save(&preferences) - require.Nil(t, nErr) + require.NoError(t, nErr) r4, err = ss.Post().GetFlaggedPosts(o1.UserId, 0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r4.Order, 2, "should have 2 posts") } @@ -2080,7 +2080,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "b" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o2 := &model.Post{} @@ -2088,7 +2088,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) { o2.UserId = model.NewId() o2.Message = "zz" + model.NewId() + "b" o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) // deleted post @@ -2098,7 +2098,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) { o3.Message = "zz" + model.NewId() + "b" o3.DeleteAt = 1 o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) o4 := &model.Post{} @@ -2106,11 +2106,11 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) { o4.UserId = model.NewId() o4.Message = "zz" + model.NewId() + "b" o4, err = ss.Post().Save(o4) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(2 * time.Millisecond) r, err := ss.Post().GetFlaggedPostsForChannel(o1.UserId, o1.ChannelId, 0, 10) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r.Order, "should be empty") preference := model.Preference{ @@ -2121,42 +2121,42 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) { } nErr := ss.Preference().Save(&model.Preferences{preference}) - require.Nil(t, nErr) + require.NoError(t, nErr) r, err = ss.Post().GetFlaggedPostsForChannel(o1.UserId, o1.ChannelId, 0, 10) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r.Order, 1, "should have 1 post") preference.Name = o2.Id nErr = ss.Preference().Save(&model.Preferences{preference}) - require.Nil(t, nErr) + require.NoError(t, nErr) preference.Name = o3.Id nErr = ss.Preference().Save(&model.Preferences{preference}) - require.Nil(t, nErr) + require.NoError(t, nErr) r, err = ss.Post().GetFlaggedPostsForChannel(o1.UserId, o1.ChannelId, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r.Order, 1, "should have 1 post") r, err = ss.Post().GetFlaggedPostsForChannel(o1.UserId, o1.ChannelId, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r.Order, 1, "should have 1 post") r, err = ss.Post().GetFlaggedPostsForChannel(o1.UserId, o1.ChannelId, 1000, 10) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, r.Order, "should be empty") r, err = ss.Post().GetFlaggedPostsForChannel(o1.UserId, o1.ChannelId, 0, 10) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r.Order, 2, "should have 2 posts") preference.Name = o4.Id nErr = ss.Preference().Save(&model.Preferences{preference}) - require.Nil(t, nErr) + require.NoError(t, nErr) r, err = ss.Post().GetFlaggedPostsForChannel(o1.UserId, o4.ChannelId, 0, 10) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r.Order, 1, "should have 1 posts") } @@ -2169,7 +2169,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, ss store.Store) { o0.Message = "zz" + model.NewId() + "b" o0.CreateAt = createTime o0, err := ss.Post().Save(o0) - require.Nil(t, err) + require.NoError(t, err) o1 := &model.Post{} o1.ChannelId = o0.ChannelId @@ -2177,7 +2177,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" o1.CreateAt = createTime o1, err = ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -2187,7 +2187,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, ss store.Store) { o2.RootId = o1.Id o2.CreateAt = createTime + 1 _, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = model.NewId() @@ -2195,7 +2195,7 @@ func testPostStoreGetPostsCreatedAt(t *testing.T, ss store.Store) { o3.Message = "zz" + model.NewId() + "b" o3.CreateAt = createTime _, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) r1, _ := ss.Post().GetPostsCreatedAt(o1.ChannelId, createTime) assert.Equal(t, 2, len(r1)) @@ -2207,7 +2207,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -2216,14 +2216,14 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = o1.ChannelId o3.UserId = model.NewId() o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) o4, err := ss.Post().Save(&model.Post{ ChannelId: model.NewId(), @@ -2231,7 +2231,7 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) { Message: model.NewId(), Filenames: []string{"test"}, }) - require.Nil(t, err) + require.NoError(t, err) o5, err := ss.Post().Save(&model.Post{ ChannelId: model.NewId(), @@ -2239,26 +2239,26 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) { Message: model.NewId(), Filenames: []string{"test2", "test3"}, }) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro1 := r1.Posts[o1.Id] r2, err := ss.Post().Get(o2.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro2 := r2.Posts[o2.Id] r3, err := ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro3 := r3.Posts[o3.Id] r4, err := ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro4 := r4.Posts[o4.Id] r5, err := ss.Post().Get(o5.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro5 := r5.Posts[o5.Id] require.Equal(t, ro1.Message, o1.Message, "Failed to save/get") @@ -2280,19 +2280,19 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) { o3a.Message = ro3.Message + "WWWWWWW" _, errIdx, err := ss.Post().OverwriteMultiple([]*model.Post{o1a, o2a, o3a}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, -1, errIdx) r1, nErr := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, nErr) + require.NoError(t, nErr) ro1a := r1.Posts[o1.Id] r2, nErr = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, nErr) + require.NoError(t, nErr) ro2a := r2.Posts[o2.Id] r3, nErr = ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, nErr) + require.NoError(t, nErr) ro3a := r3.Posts[o3.Id] assert.Equal(t, ro1a.Message, o1a.Message, "Failed to overwrite/get") @@ -2310,15 +2310,15 @@ func testPostStoreOverwriteMultiple(t *testing.T, ss store.Store) { o5a.FileIds = []string{} _, errIdx, err := ss.Post().OverwriteMultiple([]*model.Post{o4a, o5a}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, -1, errIdx) r4, nErr := ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, nErr) + require.NoError(t, nErr) ro4a := r4.Posts[o4.Id] r5, nErr = ss.Post().Get(o5.Id, false, false, false) - require.Nil(t, nErr) + require.NoError(t, nErr) ro5a := r5.Posts[o5.Id] require.Empty(t, ro4a.Filenames, "Failed to clear Filenames") @@ -2334,7 +2334,7 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -2343,14 +2343,14 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) { o2.ParentId = o1.Id o2.RootId = o1.Id o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = o1.ChannelId o3.UserId = model.NewId() o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) o4, err := ss.Post().Save(&model.Post{ ChannelId: model.NewId(), @@ -2358,22 +2358,22 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) { Message: model.NewId(), Filenames: []string{"test"}, }) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro1 := r1.Posts[o1.Id] r2, err := ss.Post().Get(o2.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro2 := r2.Posts[o2.Id] r3, err := ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro3 := r3.Posts[o3.Id] r4, err := ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro4 := r4.Posts[o4.Id] require.Equal(t, ro1.Message, o1.Message, "Failed to save/get") @@ -2385,28 +2385,28 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) { o1a := ro1.Clone() o1a.Message = ro1.Message + "BBBBBBBBBB" _, err = ss.Post().Overwrite(o1a) - require.Nil(t, err) + require.NoError(t, err) o2a := ro2.Clone() o2a.Message = ro2.Message + "DDDDDDD" _, err = ss.Post().Overwrite(o2a) - require.Nil(t, err) + require.NoError(t, err) o3a := ro3.Clone() o3a.Message = ro3.Message + "WWWWWWW" _, err = ss.Post().Overwrite(o3a) - require.Nil(t, err) + require.NoError(t, err) r1, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro1a := r1.Posts[o1.Id] r2, err = ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro2a := r2.Posts[o2.Id] r3, err = ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro3a := r3.Posts[o3.Id] assert.Equal(t, ro1a.Message, o1a.Message, "Failed to overwrite/get") @@ -2419,10 +2419,10 @@ func testPostStoreOverwrite(t *testing.T, ss store.Store) { o4a.Filenames = []string{} o4a.FileIds = []string{model.NewId()} _, err = ss.Post().Overwrite(o4a) - require.Nil(t, err) + require.NoError(t, err) r4, err = ss.Post().Get(o4.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro4a := r4.Posts[o4.Id] require.Empty(t, ro4a.Filenames, "Failed to clear Filenames") @@ -2436,32 +2436,32 @@ func testPostStoreGetPostsByIds(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId o2.UserId = model.NewId() o2.Message = "zz" + model.NewId() + "CCCCCCCCC" o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = o1.ChannelId o3.UserId = model.NewId() o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().Get(o1.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro1 := r1.Posts[o1.Id] r2, err := ss.Post().Get(o2.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro2 := r2.Posts[o2.Id] r3, err := ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) ro3 := r3.Posts[o3.Id] postIds := []string{ @@ -2471,14 +2471,14 @@ func testPostStoreGetPostsByIds(t *testing.T, ss store.Store) { } posts, err := ss.Post().GetPostsByIds(postIds) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, posts, 3, "Expected 3 posts in results. Got %v", len(posts)) err = ss.Post().Delete(ro1.Id, model.GetMillis(), "") - require.Nil(t, err) + require.NoError(t, err) posts, err = ss.Post().GetPostsByIds(postIds) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, posts, 3, "Expected 3 posts in results. Got %v", len(posts)) } @@ -2502,14 +2502,14 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = c2.Id o2.UserId = model.NewId() o2.Message = "zz" + model.NewId() + "CCCCCCCCC" o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = c1.Id @@ -2518,10 +2518,10 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, ss store.Store) { o3.RootId = o1.Id o3.Message = "zz" + model.NewId() + "QQQQQQQQQQ" o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) r, err := ss.Post().GetPostsBatchForIndexing(o1.CreateAt, model.GetMillis()+100000, 100) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, r, 3, "Expected 3 posts in results. Got %v", len(r)) for _, p := range r { if p.Id == o1.Id { @@ -2546,7 +2546,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1.CreateAt = 1000 o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = model.NewId() @@ -2554,7 +2554,7 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) { o2.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o2.CreateAt = 1000 o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) o3 := &model.Post{} o3.ChannelId = model.NewId() @@ -2562,19 +2562,19 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) { o3.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o3.CreateAt = 100000 o3, err = ss.Post().Save(o3) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().PermanentDeleteBatch(2000, 1000) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Post().Get(o1.Id, false, false, false) - require.NotNil(t, err, "Should have not found post 1 after purge") + require.Error(t, err, "Should have not found post 1 after purge") _, err = ss.Post().Get(o2.Id, false, false, false) - require.NotNil(t, err, "Should have not found post 2 after purge") + require.Error(t, err, "Should have not found post 2 after purge") _, err = ss.Post().Get(o3.Id, false, false, false) - require.Nil(t, err, "Should have not found post 3 after purge") + require.NoError(t, err, "Should have not found post 3 after purge") } func testPostStoreGetOldest(t *testing.T, ss store.Store) { @@ -2584,7 +2584,7 @@ func testPostStoreGetOldest(t *testing.T, ss store.Store) { o0.Message = "zz" + model.NewId() + "b" o0.CreateAt = 3 o0, err := ss.Post().Save(o0) - require.Nil(t, err) + require.NoError(t, err) o1 := &model.Post{} o1.ChannelId = o0.Id @@ -2592,7 +2592,7 @@ func testPostStoreGetOldest(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "b" o1.CreateAt = 2 o1, err = ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) o2 := &model.Post{} o2.ChannelId = o1.ChannelId @@ -2600,11 +2600,11 @@ func testPostStoreGetOldest(t *testing.T, ss store.Store) { o2.Message = "zz" + model.NewId() + "b" o2.CreateAt = 1 o2, err = ss.Post().Save(o2) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Post().GetOldest() - require.Nil(t, err) + require.NoError(t, err) assert.EqualValues(t, o2.Id, r1.Id) } @@ -2620,7 +2620,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{} c1.TeamId = t1.Id @@ -2628,14 +2628,14 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := model.User{} u1.Username = model.NewId() u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err = ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) p1 := &model.Post{} p1.ChannelId = c1.Id @@ -2643,10 +2643,10 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) { p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" p1.CreateAt = 1000 p1, nErr = ss.Post().Save(p1) - require.Nil(t, nErr) + require.NoError(t, nErr) posts, err := ss.Post().GetParentsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, err) + assert.NoError(t, err) found := false for _, p := range posts { @@ -2669,7 +2669,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) c1 := model.Channel{} c1.TeamId = t1.Id @@ -2677,13 +2677,13 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) { c1.Name = "zz" + model.NewId() + "b" c1.Type = model.CHANNEL_OPEN _, nErr := ss.Channel().Save(&c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1 := model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err = ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) p1 := &model.Post{} p1.ChannelId = c1.Id @@ -2691,7 +2691,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) { p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" p1.CreateAt = 1000 p1, nErr = ss.Post().Save(p1) - require.Nil(t, nErr) + require.NoError(t, nErr) p2 := &model.Post{} p2.ChannelId = c1.Id @@ -2701,10 +2701,10 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) { p2.ParentId = p1.Id p2.RootId = p1.Id p2, nErr = ss.Post().Save(p2) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, err := ss.Post().GetRepliesForExport(p1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, r1, 1) @@ -2716,10 +2716,10 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) { // Checking whether replies by deleted user are exported u1.DeleteAt = 1002 _, err = ss.User().Update(&u1, false) - require.Nil(t, err) + require.NoError(t, err) r1, err = ss.Post().GetRepliesForExport(p1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, r1, 1) @@ -2743,17 +2743,17 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -2773,10 +2773,10 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" p1.CreateAt = 1000 p1, nErr = ss.Post().Save(p1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Equal(t, p1.Message, r1[0].Message) @@ -2798,18 +2798,18 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.DeleteAt = 1 u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -2825,7 +2825,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto o1.DeleteAt = 1 nErr = ss.Channel().SetDeleteAt(o1.Id, 1, 1) - assert.Nil(t, nErr) + assert.NoError(t, nErr) p1 := &model.Post{} p1.ChannelId = o1.Id @@ -2833,16 +2833,16 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto p1.Message = "zz" + model.NewId() + "BBBBBBBBBBBB" p1.CreateAt = 1000 p1, nErr = ss.Post().Save(p1) - require.Nil(t, nErr) + require.NoError(t, nErr) o1a := p1.Clone() o1a.DeleteAt = 1 o1a.Message = p1.Message + "BBBBBBBBBB" _, nErr = ss.Post().Update(o1a, p1) - require.Nil(t, nErr) + require.NoError(t, nErr) r1, nErr := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Equal(t, 0, len(r1)) @@ -2865,17 +2865,17 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m1 := model.ChannelMember{} m1.ChannelId = o1.Id @@ -2895,14 +2895,14 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto p1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" p1.CreateAt = 1000 p1, nErr = ss.Post().Save(p1) - require.Nil(t, nErr) + require.NoError(t, nErr) postIds = append(postIds, p1.Id) } sort.Slice(postIds, func(i, j int) bool { return postIds[i] < postIds[j] }) // Get all posts r1, err := ss.Post().GetDirectPostParentsForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, len(postIds), len(r1)) var exportedPostIds []string for i := range r1 { @@ -2913,7 +2913,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto // Get 100 r1, err = ss.Post().GetDirectPostParentsForExportAfter(100, strings.Repeat("0", 26)) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, 100, len(r1)) exportedPostIds = []string{} for i := range r1 { diff --git a/store/storetest/preference_store.go b/store/storetest/preference_store.go index c7e87465a3..dd177eba2a 100644 --- a/store/storetest/preference_store.go +++ b/store/storetest/preference_store.go @@ -43,7 +43,7 @@ func testPreferenceSave(t *testing.T, ss store.Store) { }, } err := ss.Preference().Save(&preferences) - require.Nil(t, err, "saving preference returned error") + require.NoError(t, err, "saving preference returned error") for _, preference := range preferences { data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name) @@ -53,7 +53,7 @@ func testPreferenceSave(t *testing.T, ss store.Store) { preferences[0].Value = "value2a" preferences[1].Value = "value2b" err = ss.Preference().Save(&preferences) - require.Nil(t, err, "saving preference returned error") + require.NoError(t, err, "saving preference returned error") for _, preference := range preferences { data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name) @@ -90,15 +90,15 @@ func testPreferenceGet(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) data, err := ss.Preference().Get(userId, category, name) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, preferences[0].ToJson(), data.ToJson(), "got incorrect preference") // make sure getting a missing preference fails _, err = ss.Preference().Get(model.NewId(), model.NewId(), model.NewId()) - require.NotNil(t, err, "no error on getting a missing preference") + require.Error(t, err, "no error on getting a missing preference") } func testPreferenceGetCategory(t *testing.T, ss store.Store) { @@ -133,10 +133,10 @@ func testPreferenceGetCategory(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) preferencesByCategory, err := ss.Preference().GetCategory(userId, category) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 2, len(preferencesByCategory), "got the wrong number of preferences") require.True( t, @@ -146,7 +146,7 @@ func testPreferenceGetCategory(t *testing.T, ss store.Store) { // make sure getting a missing preference category doesn't fail preferencesByCategory, err = ss.Preference().GetCategory(model.NewId(), model.NewId()) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 0, len(preferencesByCategory), "shouldn't have got any preferences") } @@ -182,10 +182,10 @@ func testPreferenceGetAll(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) result, err := ss.Preference().GetAll(userId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 3, len(result), "got the wrong number of preferences") for i := 0; i < 3; i++ { @@ -226,10 +226,10 @@ func testPreferenceDeleteByUser(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&preferences) - require.Nil(t, err) + require.NoError(t, err) err = ss.Preference().PermanentDeleteByUser(userId) - require.Nil(t, err) + require.NoError(t, err) } func testPreferenceDelete(t *testing.T, ss store.Store) { @@ -241,16 +241,16 @@ func testPreferenceDelete(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&model.Preferences{preference}) - require.Nil(t, err) + require.NoError(t, err) preferences, err := ss.Preference().GetAll(preference.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, preferences, 1, "should've returned 1 preference") err = ss.Preference().Delete(preference.UserId, preference.Category, preference.Name) - require.Nil(t, err) + require.NoError(t, err) preferences, err = ss.Preference().GetAll(preference.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, preferences, "should've returned no preferences") } @@ -273,17 +273,17 @@ func testPreferenceDeleteCategory(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&model.Preferences{preference1, preference2}) - require.Nil(t, err) + require.NoError(t, err) preferences, err := ss.Preference().GetAll(userId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, preferences, 2, "should've returned 2 preferences") err = ss.Preference().DeleteCategory(userId, category) - require.Nil(t, err) + require.NoError(t, err) preferences, err = ss.Preference().GetAll(userId) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, preferences, "should've returned no preferences") } @@ -308,25 +308,25 @@ func testPreferenceDeleteCategoryAndName(t *testing.T, ss store.Store) { } err := ss.Preference().Save(&model.Preferences{preference1, preference2}) - require.Nil(t, err) + require.NoError(t, err) preferences, err := ss.Preference().GetAll(userId) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, preferences, 1, "should've returned 1 preference") preferences, err = ss.Preference().GetAll(userId2) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, preferences, 1, "should've returned 1 preference") err = ss.Preference().DeleteCategoryAndName(category, name) - require.Nil(t, err) + require.NoError(t, err) preferences, err = ss.Preference().GetAll(userId) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, preferences, "should've returned no preference") preferences, err = ss.Preference().GetAll(userId2) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, preferences, "should've returned no preference") } @@ -340,7 +340,7 @@ func testPreferenceCleanupFlagsBatch(t *testing.T, ss store.Store) { o1.Message = "zz" + model.NewId() + "AAAAAAAAAAA" o1.CreateAt = 1000 o1, err := ss.Post().Save(o1) - require.Nil(t, err) + require.NoError(t, err) preference1 := model.Preference{ UserId: userId, @@ -357,14 +357,14 @@ func testPreferenceCleanupFlagsBatch(t *testing.T, ss store.Store) { } nErr := ss.Preference().Save(&model.Preferences{preference1, preference2}) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Preference().CleanupFlagsBatch(10000) - assert.Nil(t, nErr) + assert.NoError(t, nErr) _, nErr = ss.Preference().Get(userId, category, preference1.Name) - assert.Nil(t, nErr) + assert.NoError(t, nErr) _, nErr = ss.Preference().Get(userId, category, preference2.Name) - assert.NotNil(t, nErr) + assert.Error(t, nErr) } diff --git a/store/storetest/reaction_store.go b/store/storetest/reaction_store.go index 33970257c2..65b9e14de8 100644 --- a/store/storetest/reaction_store.go +++ b/store/storetest/reaction_store.go @@ -31,7 +31,7 @@ func testReactionSave(t *testing.T, ss store.Store) { ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) firstUpdateAt := post.UpdateAt reaction1 := &model.Reaction{ @@ -42,7 +42,7 @@ func testReactionSave(t *testing.T, ss store.Store) { time.Sleep(time.Millisecond) reaction, nErr := ss.Reaction().Save(reaction1) - require.Nil(t, nErr) + require.NoError(t, nErr) saved := reaction assert.Equal(t, saved.UserId, reaction1.UserId, "should've saved reaction user_id and returned it") @@ -53,7 +53,7 @@ func testReactionSave(t *testing.T, ss store.Store) { var secondUpdateAt int64 postList, err := ss.Post().Get(reaction1.PostId, false, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, postList.Posts[post.Id].HasReactions, "should've set HasReactions = true on post") assert.NotEqual(t, postList.Posts[post.Id].UpdateAt, firstUpdateAt, "should've marked post as updated when HasReactions changed") @@ -63,7 +63,7 @@ func testReactionSave(t *testing.T, ss store.Store) { } _, nErr = ss.Reaction().Save(reaction1) - assert.Nil(t, nErr, "should've allowed saving a duplicate reaction") + assert.NoError(t, nErr, "should've allowed saving a duplicate reaction") // different user reaction2 := &model.Reaction{ @@ -74,10 +74,10 @@ func testReactionSave(t *testing.T, ss store.Store) { time.Sleep(time.Millisecond) _, nErr = ss.Reaction().Save(reaction2) - require.Nil(t, nErr) + require.NoError(t, nErr) postList, err = ss.Post().Get(reaction2.PostId, false, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, postList.Posts[post.Id].UpdateAt, secondUpdateAt, "should've marked post as updated even if HasReactions doesn't change") @@ -88,7 +88,7 @@ func testReactionSave(t *testing.T, ss store.Store) { EmojiName: reaction1.EmojiName, } _, nErr = ss.Reaction().Save(reaction3) - require.Nil(t, nErr) + require.NoError(t, nErr) // different emoji reaction4 := &model.Reaction{ @@ -97,7 +97,7 @@ func testReactionSave(t *testing.T, ss store.Store) { EmojiName: model.NewId(), } _, nErr = ss.Reaction().Save(reaction4) - require.Nil(t, nErr) + require.NoError(t, nErr) // invalid reaction reaction5 := &model.Reaction{ @@ -105,7 +105,7 @@ func testReactionSave(t *testing.T, ss store.Store) { PostId: reaction1.PostId, } _, nErr = ss.Reaction().Save(reaction5) - require.NotNil(t, nErr, "should've failed for invalid reaction") + require.Error(t, nErr, "should've failed for invalid reaction") } @@ -115,7 +115,7 @@ func testReactionDelete(t *testing.T, ss store.Store) { ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) reaction := &model.Reaction{ UserId: model.NewId(), @@ -124,23 +124,23 @@ func testReactionDelete(t *testing.T, ss store.Store) { } _, nErr := ss.Reaction().Save(reaction) - require.Nil(t, nErr) + require.NoError(t, nErr) result, err := ss.Post().Get(reaction.PostId, false, false, false) - require.Nil(t, err) + require.NoError(t, err) firstUpdateAt := result.Posts[post.Id].UpdateAt _, nErr = ss.Reaction().Delete(reaction) - require.Nil(t, nErr) + require.NoError(t, nErr) reactions, rErr := ss.Reaction().GetForPost(post.Id, false) - require.Nil(t, rErr) + require.NoError(t, rErr) assert.Empty(t, reactions, "should've deleted reaction") postList, err := ss.Post().Get(post.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, postList.Posts[post.Id].HasReactions, "should've set HasReactions = false on post") assert.NotEqual(t, postList.Posts[post.Id].UpdateAt, firstUpdateAt, "should mark post as updated after deleting reactions") @@ -151,7 +151,7 @@ func testReactionDelete(t *testing.T, ss store.Store) { ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) reaction := &model.Reaction{ UserId: model.NewId(), @@ -160,19 +160,19 @@ func testReactionDelete(t *testing.T, ss store.Store) { } savedReaction, nErr := ss.Reaction().Save(reaction) - require.Nil(t, nErr) + require.NoError(t, nErr) updateAt := savedReaction.UpdateAt _, nErr = ss.Reaction().Delete(savedReaction) - require.Nil(t, nErr) + require.NoError(t, nErr) // add same reaction back and ensure update_at is set _, nErr = ss.Reaction().Save(savedReaction) - require.Nil(t, nErr) + require.NoError(t, nErr) reactions, err := ss.Reaction().GetForPost(post.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, reactions, 1) assert.GreaterOrEqual(t, reactions[0].UpdateAt, updateAt) @@ -209,7 +209,7 @@ func testReactionGetForPost(t *testing.T, ss store.Store) { for _, reaction := range reactions { _, err := ss.Reaction().Save(reaction) - require.Nil(t, err) + require.NoError(t, err) } // save and delete an additional reaction to test soft deletion @@ -219,12 +219,12 @@ func testReactionGetForPost(t *testing.T, ss store.Store) { EmojiName: "grin", } savedTmp, err := ss.Reaction().Save(temp) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Reaction().Delete(savedTmp) - require.Nil(t, err) + require.NoError(t, err) returned, err := ss.Reaction().GetForPost(postId, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, returned, 3, "should've returned 3 reactions") for _, reaction := range reactions { @@ -247,7 +247,7 @@ func testReactionGetForPost(t *testing.T, ss store.Store) { // Should return cached item returned, err = ss.Reaction().GetForPost(postId, true) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, returned, 3, "should've returned 3 reactions") for _, reaction := range reactions { @@ -276,17 +276,17 @@ func testReactionDeleteAllWithEmojiName(t *testing.T, ss store.Store, s SqlStore ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err1) + require.NoError(t, err1) post2, err2 := ss.Post().Save(&model.Post{ ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err2) + require.NoError(t, err2) post3, err3 := ss.Post().Save(&model.Post{ ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err3) + require.NoError(t, err3) userId := model.NewId() @@ -320,7 +320,7 @@ func testReactionDeleteAllWithEmojiName(t *testing.T, ss store.Store, s SqlStore for _, reaction := range reactions { _, err := ss.Reaction().Save(reaction) - require.Nil(t, err) + require.NoError(t, err) } // make at least one Reaction record contain NULL for Update and DeleteAt to simulate post schema upgrade case. @@ -336,17 +336,17 @@ func testReactionDeleteAllWithEmojiName(t *testing.T, ss store.Store, s SqlStore "PostId": post.Id, "EmojiName": emojiToDelete, }) - require.Nil(t, err) + require.NoError(t, err) rowsAffected, err := sqlResult.RowsAffected() - require.Nil(t, err) + require.NoError(t, err) require.NotZero(t, rowsAffected) err = ss.Reaction().DeleteAllWithEmojiName(emojiToDelete) - require.Nil(t, err) + require.NoError(t, err) // check that the reactions were deleted returned, err := ss.Reaction().GetForPost(post.Id, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, returned, 1, "should've only removed reactions with emoji name") for _, reaction := range returned { @@ -354,24 +354,24 @@ func testReactionDeleteAllWithEmojiName(t *testing.T, ss store.Store, s SqlStore } returned, err = ss.Reaction().GetForPost(post2.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, returned, 1, "should've only removed reactions with emoji name") returned, err = ss.Reaction().GetForPost(post3.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, returned, "should've only removed reactions with emoji name") // check that the posts are updated postList, err := ss.Post().Get(post.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, postList.Posts[post.Id].HasReactions, "post should still have reactions") postList, err = ss.Post().Get(post2.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, postList.Posts[post2.Id].HasReactions, "post should still have reactions") postList, err = ss.Post().Get(post3.Id, false, false, false) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, postList.Posts[post3.Id].HasReactions, "post shouldn't have reactions any more") } @@ -381,7 +381,7 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, ss store.Store) { ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err1) + require.NoError(t, err1) reactions := []*model.Reaction{ { @@ -415,22 +415,22 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, ss store.Store) { for _, reaction := range reactions { var nErr error lastReaction, nErr = ss.Reaction().Save(reaction) - require.Nil(t, nErr) + require.NoError(t, nErr) } returned, err := ss.Reaction().GetForPost(post.Id, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, returned, 4, "expected 4 reactions") _, err = ss.Reaction().PermanentDeleteBatch(1800, 1000) - require.Nil(t, err) + require.NoError(t, err) // This is to force a clear of the cache. _, err = ss.Reaction().Delete(lastReaction) - require.Nil(t, err) + require.NoError(t, err) returned, err = ss.Reaction().GetForPost(post.Id, false) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, returned, 1, "expected 1 reaction. Got: %v", len(returned)) } @@ -477,12 +477,12 @@ func testReactionBulkGetForPosts(t *testing.T, ss store.Store) { for _, reaction := range reactions { _, err := ss.Reaction().Save(reaction) - require.Nil(t, err) + require.NoError(t, err) } postIds := []string{postId, post2Id, post3Id} returned, err := ss.Reaction().BulkGetForPosts(postIds) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, returned, 5, "should've returned 5 reactions") post4IdFound := false @@ -506,7 +506,7 @@ func testReactionDeadlock(t *testing.T, ss store.Store) { ChannelId: model.NewId(), UserId: model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) reaction1 := &model.Reaction{ UserId: model.NewId(), @@ -514,7 +514,7 @@ func testReactionDeadlock(t *testing.T, ss store.Store) { EmojiName: model.NewId(), } _, nErr := ss.Reaction().Save(reaction1) - require.Nil(t, nErr) + require.NoError(t, nErr) // different user reaction2 := &model.Reaction{ @@ -523,7 +523,7 @@ func testReactionDeadlock(t *testing.T, ss store.Store) { EmojiName: reaction1.EmojiName, } _, nErr = ss.Reaction().Save(reaction2) - require.Nil(t, nErr) + require.NoError(t, nErr) // different post reaction3 := &model.Reaction{ @@ -532,7 +532,7 @@ func testReactionDeadlock(t *testing.T, ss store.Store) { EmojiName: reaction1.EmojiName, } _, nErr = ss.Reaction().Save(reaction3) - require.Nil(t, nErr) + require.NoError(t, nErr) // different emoji reaction4 := &model.Reaction{ @@ -541,7 +541,7 @@ func testReactionDeadlock(t *testing.T, ss store.Store) { EmojiName: model.NewId(), } _, nErr = ss.Reaction().Save(reaction4) - require.Nil(t, nErr) + require.NoError(t, nErr) var wg sync.WaitGroup wg.Add(2) @@ -549,14 +549,14 @@ func testReactionDeadlock(t *testing.T, ss store.Store) { go func() { defer wg.Done() err := ss.Reaction().DeleteAllWithEmojiName(reaction1.EmojiName) - require.Nil(t, err) + require.NoError(t, err) }() // 2nd tx go func() { defer wg.Done() _, err := ss.Reaction().Delete(reaction2) - require.Nil(t, err) + require.NoError(t, err) }() wg.Wait() } diff --git a/store/storetest/role_store.go b/store/storetest/role_store.go index 98d88c43e3..b7ff31f497 100644 --- a/store/storetest/role_store.go +++ b/store/storetest/role_store.go @@ -41,7 +41,7 @@ func testRoleStoreSave(t *testing.T, ss store.Store) { } d1, err := ss.Role().Save(r1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) assert.Equal(t, r1.Name, d1.Name) assert.Equal(t, r1.DisplayName, d1.DisplayName) @@ -57,7 +57,7 @@ func testRoleStoreSave(t *testing.T, ss store.Store) { } d2, err := ss.Role().Save(d1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d2.Id, 26) assert.Equal(t, r1.Name, d2.Name) assert.Equal(t, r1.DisplayName, d2.DisplayName) @@ -80,7 +80,7 @@ func testRoleStoreSave(t *testing.T, ss store.Store) { } _, err = ss.Role().Save(r3) - assert.NotNil(t, err) + assert.Error(t, err) // Try saving one with a duplicate "name" field. r4 := &model.Role{ @@ -96,12 +96,12 @@ func testRoleStoreSave(t *testing.T, ss store.Store) { } _, err = ss.Role().Save(r4) - assert.NotNil(t, err) + assert.Error(t, err) } func testRoleStoreGetAll(t *testing.T, ss store.Store) { prev, err := ss.Role().GetAll() - require.Nil(t, err) + require.NoError(t, err) prevCount := len(prev) // Save a role to test with. @@ -118,7 +118,7 @@ func testRoleStoreGetAll(t *testing.T, ss store.Store) { } _, err = ss.Role().Save(r1) - require.Nil(t, err) + require.NoError(t, err) r2 := &model.Role{ Name: model.NewId(), @@ -132,10 +132,10 @@ func testRoleStoreGetAll(t *testing.T, ss store.Store) { SchemeManaged: false, } _, err = ss.Role().Save(r2) - require.Nil(t, err) + require.NoError(t, err) data, err := ss.Role().GetAll() - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, data, prevCount+2) } @@ -154,12 +154,12 @@ func testRoleStoreGet(t *testing.T, ss store.Store) { } d1, err := ss.Role().Save(r1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) // Get a valid role d2, err := ss.Role().Get(d1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, d1.Id, d2.Id) assert.Equal(t, r1.Name, d2.Name) assert.Equal(t, r1.DisplayName, d2.DisplayName) @@ -169,7 +169,7 @@ func testRoleStoreGet(t *testing.T, ss store.Store) { // Get an invalid role _, err = ss.Role().Get(model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) } func testRoleStoreGetByName(t *testing.T, ss store.Store) { @@ -187,12 +187,12 @@ func testRoleStoreGetByName(t *testing.T, ss store.Store) { } d1, err := ss.Role().Save(r1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) // Get a valid role d2, err := ss.Role().GetByName(d1.Name) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, d1.Id, d2.Id) assert.Equal(t, r1.Name, d2.Name) assert.Equal(t, r1.DisplayName, d2.DisplayName) @@ -202,7 +202,7 @@ func testRoleStoreGetByName(t *testing.T, ss store.Store) { // Get an invalid role _, err = ss.Role().GetByName(model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) } func testRoleStoreGetByNames(t *testing.T, ss store.Store) { @@ -242,21 +242,21 @@ func testRoleStoreGetByNames(t *testing.T, ss store.Store) { } d1, err := ss.Role().Save(r1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) d2, err := ss.Role().Save(r2) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d2.Id, 26) d3, err := ss.Role().Save(r3) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d3.Id, 26) // Get two valid roles. n4 := []string{r1.Name, r2.Name} roles4, err := ss.Role().GetByNames(n4) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, roles4, 2) assert.Contains(t, roles4, d1) assert.Contains(t, roles4, d2) @@ -265,13 +265,13 @@ func testRoleStoreGetByNames(t *testing.T, ss store.Store) { // Get two invalid roles. n5 := []string{model.NewId(), model.NewId()} roles5, err := ss.Role().GetByNames(n5) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, roles5) // Get one valid one and one invalid one. n6 := []string{r1.Name, model.NewId()} roles6, err := ss.Role().GetByNames(n6) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, roles6, 1) assert.Contains(t, roles6, d1) assert.NotContains(t, roles6, d2) @@ -293,29 +293,29 @@ func testRoleStoreDelete(t *testing.T, ss store.Store) { } d1, err := ss.Role().Save(r1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) // Check the role is there. _, err = ss.Role().Get(d1.Id) - assert.Nil(t, err) + assert.NoError(t, err) // Delete the role. _, err = ss.Role().Delete(d1.Id) - assert.Nil(t, err) + assert.NoError(t, err) // Check the role is deleted there. d2, err := ss.Role().Get(d1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, d2.DeleteAt) d3, err := ss.Role().GetByName(d1.Name) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, d3.DeleteAt) // Try and delete a role that does not exist. _, err = ss.Role().Delete(model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) } func testRoleStorePermanentDeleteAll(t *testing.T, ss store.Store) { @@ -344,19 +344,19 @@ func testRoleStorePermanentDeleteAll(t *testing.T, ss store.Store) { } _, err := ss.Role().Save(r1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Role().Save(r2) - require.Nil(t, err) + require.NoError(t, err) roles, err := ss.Role().GetByNames([]string{r1.Name, r2.Name}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, roles, 2) err = ss.Role().PermanentDeleteAll() - assert.Nil(t, err) + assert.NoError(t, err) roles, err = ss.Role().GetByNames([]string{r1.Name, r2.Name}) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, roles) } @@ -370,7 +370,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } teamScheme1, err := ss.Scheme().Save(teamScheme1) - require.Nil(t, err) + require.NoError(t, err) defer ss.Scheme().Delete(teamScheme1.Id) teamScheme2 := &model.Scheme{ @@ -380,7 +380,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } teamScheme2, err = ss.Scheme().Save(teamScheme2) - require.Nil(t, err) + require.NoError(t, err) defer ss.Scheme().Delete(teamScheme2.Id) channelScheme1 := &model.Scheme{ @@ -390,7 +390,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } channelScheme1, err = ss.Scheme().Save(channelScheme1) - require.Nil(t, err) + require.NoError(t, err) defer ss.Scheme().Delete(channelScheme1.Id) channelScheme2 := &model.Scheme{ @@ -400,7 +400,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } channelScheme2, err = ss.Scheme().Save(channelScheme2) - require.Nil(t, err) + require.NoError(t, err) defer ss.Scheme().Delete(channelScheme1.Id) team1 := &model.Team{ @@ -411,7 +411,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { SchemeId: &teamScheme1.Id, } team1, err = ss.Team().Save(team1) - require.Nil(t, err) + require.NoError(t, err) defer ss.Team().PermanentDelete(team1.Id) team2 := &model.Team{ @@ -422,7 +422,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { SchemeId: &teamScheme2.Id, } team2, err = ss.Team().Save(team2) - require.Nil(t, err) + require.NoError(t, err) defer ss.Team().PermanentDelete(team2.Id) channel1 := &model.Channel{ @@ -433,7 +433,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { SchemeId: &channelScheme1.Id, } channel1, nErr := ss.Channel().Save(channel1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().Delete(channel1.Id, 0) channel2 := &model.Channel{ @@ -444,13 +444,13 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { SchemeId: &channelScheme2.Id, } channel2, nErr = ss.Channel().Save(channel2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().Delete(channel2.Id, 0) t.Run("ChannelRolesUnderTeamRole", func(t *testing.T) { t.Run("guest role for the right team's channels are returned", func(t *testing.T) { actualRoles, err := ss.Role().ChannelRolesUnderTeamRole(teamScheme1.DefaultChannelGuestRole) - require.Nil(t, err) + require.NoError(t, err) var actualRoleNames []string for _, role := range actualRoles { @@ -463,7 +463,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { t.Run("user role for the right team's channels are returned", func(t *testing.T) { actualRoles, err := ss.Role().ChannelRolesUnderTeamRole(teamScheme1.DefaultChannelUserRole) - require.Nil(t, err) + require.NoError(t, err) var actualRoleNames []string for _, role := range actualRoles { @@ -476,7 +476,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { t.Run("admin role for the right team's channels are returned", func(t *testing.T) { actualRoles, err := ss.Role().ChannelRolesUnderTeamRole(teamScheme1.DefaultChannelAdminRole) - require.Nil(t, err) + require.NoError(t, err) var actualRoleNames []string for _, role := range actualRoles { @@ -491,7 +491,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) { t.Run("AllChannelSchemeRoles", func(t *testing.T) { t.Run("guest role for the right team's channels are returned", func(t *testing.T) { actualRoles, err := ss.Role().AllChannelSchemeRoles() - require.Nil(t, err) + require.NoError(t, err) var actualRoleNames []string for _, role := range actualRoles { @@ -524,7 +524,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t Scope: model.SCHEME_SCOPE_TEAM, } teamScheme, err := ss.Scheme().Save(teamScheme) - require.Nil(t, err) + require.NoError(t, err) defer ss.Scheme().Delete(teamScheme.Id) channelScheme := &model.Scheme{ @@ -534,7 +534,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t Scope: model.SCHEME_SCOPE_CHANNEL, } channelScheme, err = ss.Scheme().Save(channelScheme) - require.Nil(t, err) + require.NoError(t, err) defer ss.Scheme().Delete(channelScheme.Id) team := &model.Team{ @@ -545,7 +545,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t SchemeId: &teamScheme.Id, } team, err = ss.Team().Save(team) - require.Nil(t, err) + require.NoError(t, err) defer ss.Team().PermanentDelete(team.Id) channel := &model.Channel{ @@ -556,42 +556,42 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t SchemeId: &channelScheme.Id, } channel, nErr := ss.Channel().Save(channel, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Channel().Delete(channel.Id, 0) channelSchemeUserRole, err := ss.Role().GetByName(channelScheme.DefaultChannelUserRole) - require.Nil(t, err) + require.NoError(t, err) channelSchemeUserRole.Permissions = []string{} _, err = ss.Role().Save(channelSchemeUserRole) - require.Nil(t, err) + require.NoError(t, err) teamSchemeUserRole, err := ss.Role().GetByName(teamScheme.DefaultChannelUserRole) - require.Nil(t, err) + require.NoError(t, err) teamSchemeUserRole.Permissions = []string{model.PERMISSION_UPLOAD_FILE.Id} _, err = ss.Role().Save(teamSchemeUserRole) - require.Nil(t, err) + require.NoError(t, err) // get the channel scheme user role again and ensure that it has the permission inherited from the team // scheme user role roleMapBefore, err := ss.Role().ChannelHigherScopedPermissions([]string{channelSchemeUserRole.Name}) - require.Nil(t, err) + require.NoError(t, err) // blank-out the guest role to simulate an old team scheme, ensure it's blank result, sqlErr := s.GetMaster().Exec(fmt.Sprintf("UPDATE Schemes SET DefaultChannelGuestRole = '' WHERE Id = '%s'", teamScheme.Id)) - require.Nil(t, sqlErr) + require.NoError(t, sqlErr) rows, serr := result.RowsAffected() - require.Nil(t, serr) + require.NoError(t, serr) require.Equal(t, int64(1), rows) teamScheme, err = ss.Scheme().Get(teamScheme.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "", teamScheme.DefaultChannelGuestRole) // trigger a cache clear _, err = ss.Role().Save(channelSchemeUserRole) - require.Nil(t, err) + require.NoError(t, err) roleMapAfter, err := ss.Role().ChannelHigherScopedPermissions([]string{channelSchemeUserRole.Name}) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, len(roleMapBefore), len(roleMapAfter)) } diff --git a/store/storetest/scheme_store.go b/store/storetest/scheme_store.go index f163f60527..f5f7079df5 100644 --- a/store/storetest/scheme_store.go +++ b/store/storetest/scheme_store.go @@ -91,7 +91,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) { // Check all fields saved correctly. d1, err := ss.Scheme().Save(s1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) assert.Equal(t, s1.DisplayName, d1.DisplayName) assert.Equal(t, s1.Name, d1.Name) @@ -109,32 +109,32 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) { // Check the default roles were created correctly. role1, err := ss.Role().GetByName(d1.DefaultTeamAdminRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role1.Permissions, []string{"delete_others_posts"}) assert.True(t, role1.SchemeManaged) role2, err := ss.Role().GetByName(d1.DefaultTeamUserRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role2.Permissions, []string{"view_team", "add_user_to_team"}) assert.True(t, role2.SchemeManaged) role3, err := ss.Role().GetByName(d1.DefaultChannelAdminRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role3.Permissions, []string{"manage_public_channel_members", "manage_private_channel_members"}) assert.True(t, role3.SchemeManaged) role4, err := ss.Role().GetByName(d1.DefaultChannelUserRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role4.Permissions, []string{"read_channel", "create_post"}) assert.True(t, role4.SchemeManaged) role5, err := ss.Role().GetByName(d1.DefaultTeamGuestRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role5.Permissions, []string{"view_team"}) assert.True(t, role5.SchemeManaged) role6, err := ss.Role().GetByName(d1.DefaultChannelGuestRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role6.Permissions, []string{"read_channel", "create_post"}) assert.True(t, role6.SchemeManaged) @@ -142,7 +142,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) { d1.Description = model.NewId() d2, err := ss.Scheme().Save(d1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, d1.Id, d2.Id) assert.Equal(t, s1.DisplayName, d2.DisplayName) assert.Equal(t, s1.Name, d2.Name) @@ -168,7 +168,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) { } _, err = ss.Scheme().Save(s3) - assert.NotNil(t, err) + assert.Error(t, err) } func testSchemeStoreGet(t *testing.T, ss store.Store) { @@ -181,12 +181,12 @@ func testSchemeStoreGet(t *testing.T, ss store.Store) { } d1, err := ss.Scheme().Save(s1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) // Get a valid scheme d2, err := ss.Scheme().Get(d1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, d1.Id, d2.Id) assert.Equal(t, s1.DisplayName, d2.DisplayName) assert.Equal(t, s1.Name, d2.Name) @@ -204,7 +204,7 @@ func testSchemeStoreGet(t *testing.T, ss store.Store) { // Get an invalid scheme _, err = ss.Scheme().Get(model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) } func testSchemeStoreGetByName(t *testing.T, ss store.Store) { @@ -217,12 +217,12 @@ func testSchemeStoreGetByName(t *testing.T, ss store.Store) { } d1, err := ss.Scheme().Save(s1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) // Get a valid scheme d2, err := ss.Scheme().GetByName(d1.Name) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, d1.Id, d2.Id) assert.Equal(t, s1.DisplayName, d2.DisplayName) assert.Equal(t, s1.Name, d2.Name) @@ -240,7 +240,7 @@ func testSchemeStoreGetByName(t *testing.T, ss store.Store) { // Get an invalid scheme _, err = ss.Scheme().GetByName(model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) } func testSchemeStoreGetAllPage(t *testing.T, ss store.Store) { @@ -274,15 +274,15 @@ func testSchemeStoreGetAllPage(t *testing.T, ss store.Store) { for _, scheme := range schemes { _, err := ss.Scheme().Save(scheme) - require.Nil(t, err) + require.NoError(t, err) } s1, err := ss.Scheme().GetAllPage("", 0, 2) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, s1, 2) s2, err := ss.Scheme().GetAllPage("", 2, 2) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, s2, 2) assert.NotEqual(t, s1[0].DisplayName, s2[0].DisplayName) assert.NotEqual(t, s1[0].DisplayName, s2[1].DisplayName) @@ -294,14 +294,14 @@ func testSchemeStoreGetAllPage(t *testing.T, ss store.Store) { assert.NotEqual(t, s1[1].Name, s2[1].Name) s3, err := ss.Scheme().GetAllPage("team", 0, 1000) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, len(s3)) for _, s := range s3 { assert.Equal(t, "team", s.Scope) } s4, err := ss.Scheme().GetAllPage("channel", 0, 1000) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, len(s4)) for _, s := range s4 { assert.Equal(t, "channel", s.Scope) @@ -319,7 +319,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) { // Check all fields saved correctly. d1, err := ss.Scheme().Save(s1) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1.Id, 26) assert.Equal(t, s1.DisplayName, d1.DisplayName) assert.Equal(t, s1.Name, d1.Name) @@ -337,68 +337,68 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) { // Check the default roles were created correctly. role1, err := ss.Role().GetByName(d1.DefaultTeamAdminRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role1.Permissions, []string{"delete_others_posts"}) assert.True(t, role1.SchemeManaged) role2, err := ss.Role().GetByName(d1.DefaultTeamUserRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role2.Permissions, []string{"view_team", "add_user_to_team"}) assert.True(t, role2.SchemeManaged) role3, err := ss.Role().GetByName(d1.DefaultChannelAdminRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role3.Permissions, []string{"manage_public_channel_members", "manage_private_channel_members"}) assert.True(t, role3.SchemeManaged) role4, err := ss.Role().GetByName(d1.DefaultChannelUserRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role4.Permissions, []string{"read_channel", "create_post"}) assert.True(t, role4.SchemeManaged) role5, err := ss.Role().GetByName(d1.DefaultTeamGuestRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role5.Permissions, []string{"view_team"}) assert.True(t, role5.SchemeManaged) role6, err := ss.Role().GetByName(d1.DefaultChannelGuestRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, role6.Permissions, []string{"read_channel", "create_post"}) assert.True(t, role6.SchemeManaged) // Delete the scheme. d2, err := ss.Scheme().Delete(d1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.NotZero(t, d2.DeleteAt) // Check that the roles are deleted too. role7, err := ss.Role().GetByName(d1.DefaultTeamAdminRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, role7.DeleteAt) role8, err := ss.Role().GetByName(d1.DefaultTeamUserRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, role8.DeleteAt) role9, err := ss.Role().GetByName(d1.DefaultChannelAdminRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, role9.DeleteAt) role10, err := ss.Role().GetByName(d1.DefaultChannelUserRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, role10.DeleteAt) role11, err := ss.Role().GetByName(d1.DefaultTeamGuestRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, role11.DeleteAt) role12, err := ss.Role().GetByName(d1.DefaultChannelGuestRole) - assert.Nil(t, err) + assert.NoError(t, err) assert.NotZero(t, role12.DeleteAt) // Try deleting a scheme that does not exist. _, err = ss.Scheme().Delete(model.NewId()) - assert.NotNil(t, err) + assert.Error(t, err) // Try deleting a team scheme that's in use. s4 := &model.Scheme{ @@ -408,7 +408,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } d4, err := ss.Scheme().Save(s4) - assert.Nil(t, err) + assert.NoError(t, err) t4 := &model.Team{ Name: "xx" + model.NewId(), @@ -418,13 +418,13 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) { SchemeId: &d4.Id, } t4, err = ss.Team().Save(t4) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Scheme().Delete(d4.Id) - assert.Nil(t, err) + assert.NoError(t, err) t5, err := ss.Team().Get(t4.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "", *t5.SchemeId) // Try deleting a channel scheme that's in use. @@ -435,7 +435,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_CHANNEL, } d5, err := ss.Scheme().Save(s5) - assert.Nil(t, err) + assert.NoError(t, err) c5 := &model.Channel{ TeamId: model.NewId(), @@ -445,13 +445,13 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) { SchemeId: &d5.Id, } c5, nErr := ss.Channel().Save(c5, -1) - assert.Nil(t, nErr) + assert.NoError(t, nErr) _, err = ss.Scheme().Delete(d5.Id) - assert.Nil(t, err) + assert.NoError(t, err) c6, nErr := ss.Channel().Get(c5.Id, true) - assert.Nil(t, nErr) + assert.NoError(t, nErr) assert.Equal(t, "", *c6.SchemeId) } @@ -471,32 +471,32 @@ func testSchemeStorePermanentDeleteAll(t *testing.T, ss store.Store) { } s1, err := ss.Scheme().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2, err = ss.Scheme().Save(s2) - require.Nil(t, err) + require.NoError(t, err) err = ss.Scheme().PermanentDeleteAll() - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.Scheme().Get(s1.Id) - assert.NotNil(t, err) + assert.Error(t, err) _, err = ss.Scheme().Get(s2.Id) - assert.NotNil(t, err) + assert.Error(t, err) schemes, err := ss.Scheme().GetAllPage("", 0, 100000) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, schemes) } func testSchemeStoreCountByScope(t *testing.T, ss store.Store) { testCounts := func(expectedTeamCount, expectedChannelCount int) { actualCount, err := ss.Scheme().CountByScope(model.SCHEME_SCOPE_TEAM) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(expectedTeamCount), actualCount) actualCount, err = ss.Scheme().CountByScope(model.SCHEME_SCOPE_CHANNEL) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(expectedChannelCount), actualCount) } @@ -507,11 +507,11 @@ func testSchemeStoreCountByScope(t *testing.T, ss store.Store) { Description: model.NewId(), Scope: scope, }) - require.Nil(t, err) + require.NoError(t, err) } err := ss.Scheme().PermanentDeleteAll() - require.Nil(t, err) + require.NoError(t, err) createScheme(model.SCHEME_SCOPE_CHANNEL) createScheme(model.SCHEME_SCOPE_TEAM) @@ -532,17 +532,17 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) { Description: model.NewId(), Scope: scope, }) - require.Nil(t, err) + require.NoError(t, err) return scheme } getRoles := func(scheme *model.Scheme) (channelUser, channelGuest *model.Role) { var err error channelUser, err = ss.Role().GetByName(scheme.DefaultChannelUserRole) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, channelUser) channelGuest, err = ss.Role().GetByName(scheme.DefaultChannelGuestRole) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, channelGuest) return } @@ -573,11 +573,11 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) { } teamUserCount, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeUser) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(0), teamUserCount) teamGuestCount, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeGuest) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(0), teamGuestCount) var tests = []struct { @@ -604,7 +604,7 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) { roleMatched = true role.Permissions = []string{} _, err = ss.Role().Save(role) - require.Nil(t, err) + require.NoError(t, err) } } require.True(t, roleMatched) @@ -614,19 +614,19 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) { removePermission(test.removePermissionFromRole) count, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeUser) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(test.expectTeamSchemeChannelUserCount), count) count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeGuest) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(test.expectTeamSchemeChannelGuestCount), count) count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_CHANNEL, perm, model.RoleScopeChannel, model.RoleTypeUser) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(test.expectChannelSchemeChannelUserCount), count) count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_CHANNEL, perm, model.RoleScopeChannel, model.RoleTypeGuest) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(test.expectChannelSchemeChannelGuestCount), count) } } diff --git a/store/storetest/session_store.go b/store/storetest/session_store.go index b7fd9cde17..bca6f5f07b 100644 --- a/store/storetest/session_store.go +++ b/store/storetest/session_store.go @@ -42,7 +42,7 @@ func testSessionStoreSave(t *testing.T, ss store.Store) { s1.UserId = model.NewId() _, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) } func testSessionGet(t *testing.T, ss store.Store) { @@ -50,27 +50,27 @@ func testSessionGet(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2 := &model.Session{} s2.UserId = s1.UserId s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) s3 := &model.Session{} s3.UserId = s1.UserId s3.ExpiresAt = 1 s3, err = ss.Session().Save(s3) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, session.Id, s1.Id, "should match") data, err := ss.Session().GetSessions(s1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, data, 3, "should match len") } @@ -80,7 +80,7 @@ func testSessionGetWithDeviceId(t *testing.T, ss store.Store) { s1.ExpiresAt = model.GetMillis() + 10000 s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2 := &model.Session{} s2.UserId = s1.UserId @@ -88,7 +88,7 @@ func testSessionGetWithDeviceId(t *testing.T, ss store.Store) { s2.ExpiresAt = model.GetMillis() + 10000 s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) s3 := &model.Session{} s3.UserId = s1.UserId @@ -96,10 +96,10 @@ func testSessionGetWithDeviceId(t *testing.T, ss store.Store) { s3.DeviceId = model.NewId() s3, err = ss.Session().Save(s3) - require.Nil(t, err) + require.NoError(t, err) data, err := ss.Session().GetSessionsWithActiveDeviceIds(s1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, data, 1, "should match len") } @@ -108,17 +108,17 @@ func testSessionRemove(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, session.Id, s1.Id, "should match") removeErr := ss.Session().Remove(s1.Id) - require.Nil(t, removeErr) + require.NoError(t, removeErr) _, err = ss.Session().Get(s1.Id) - require.NotNil(t, err, "should have been removed") + require.Error(t, err, "should have been removed") } func testSessionRemoveAll(t *testing.T, ss store.Store) { @@ -126,17 +126,17 @@ func testSessionRemoveAll(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, session.Id, s1.Id, "should match") removeErr := ss.Session().RemoveAllSessions() - require.Nil(t, removeErr) + require.NoError(t, removeErr) _, err = ss.Session().Get(s1.Id) - require.NotNil(t, err, "should have been removed") + require.Error(t, err, "should have been removed") } func testSessionRemoveByUser(t *testing.T, ss store.Store) { @@ -144,17 +144,17 @@ func testSessionRemoveByUser(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, session.Id, s1.Id, "should match") deleteErr := ss.Session().PermanentDeleteSessionsByUser(s1.UserId) - require.Nil(t, deleteErr) + require.NoError(t, deleteErr) _, err = ss.Session().Get(s1.Id) - require.NotNil(t, err, "should have been removed") + require.Error(t, err, "should have been removed") } func testSessionRemoveToken(t *testing.T, ss store.Store) { @@ -162,20 +162,20 @@ func testSessionRemoveToken(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, session.Id, s1.Id, "should match") removeErr := ss.Session().Remove(s1.Token) - require.Nil(t, removeErr) + require.NoError(t, removeErr) _, err = ss.Session().Get(s1.Id) - require.NotNil(t, err, "should have been removed") + require.Error(t, err, "should have been removed") data, err := ss.Session().GetSessions(s1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, data, "should match len") } @@ -184,19 +184,19 @@ func testSessionUpdateDeviceId(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt) - require.Nil(t, err) + require.NoError(t, err) s2 := &model.Session{} s2.UserId = model.NewId() s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt) - require.Nil(t, err) + require.NoError(t, err) } func testSessionUpdateDeviceId2(t *testing.T, ss store.Store) { @@ -204,19 +204,19 @@ func testSessionUpdateDeviceId2(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE_REACT_NATIVE+":1234567890", s1.ExpiresAt) - require.Nil(t, err) + require.NoError(t, err) s2 := &model.Session{} s2.UserId = model.NewId() s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE_REACT_NATIVE+":1234567890", s1.ExpiresAt) - require.Nil(t, err) + require.NoError(t, err) } func testSessionStoreUpdateExpiresAt(t *testing.T, ss store.Store) { @@ -224,13 +224,13 @@ func testSessionStoreUpdateExpiresAt(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) err = ss.Session().UpdateExpiresAt(s1.Id, 1234567890) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, session.ExpiresAt, 1234567890, "ExpiresAt not updated correctly") } @@ -239,13 +239,13 @@ func testSessionStoreUpdateLastActivityAt(t *testing.T, ss store.Store) { s1.UserId = model.NewId() s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) err = ss.Session().UpdateLastActivityAt(s1.Id, 1234567890) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, session.LastActivityAt, 1234567890, "LastActivityAt not updated correctly") } @@ -255,10 +255,10 @@ func testSessionCount(t *testing.T, ss store.Store) { s1.ExpiresAt = model.GetMillis() + 100000 s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) count, err := ss.Session().AnalyticsSessionCount() - require.Nil(t, err) + require.NoError(t, err) require.NotZero(t, count, "should have at least 1 session") } @@ -270,48 +270,48 @@ func testSessionCleanup(t *testing.T, ss store.Store) { s1.ExpiresAt = 0 // never expires s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2 := &model.Session{} s2.UserId = s1.UserId s2.ExpiresAt = now + 1000000 // expires in the future s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) s3 := &model.Session{} s3.UserId = model.NewId() s3.ExpiresAt = 1 // expired s3, err = ss.Session().Save(s3) - require.Nil(t, err) + require.NoError(t, err) s4 := &model.Session{} s4.UserId = model.NewId() s4.ExpiresAt = 2 // expired s4, err = ss.Session().Save(s4) - require.Nil(t, err) + require.NoError(t, err) ss.Session().Cleanup(now, 1) _, err = ss.Session().Get(s1.Id) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.Session().Get(s2.Id) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.Session().Get(s3.Id) - assert.NotNil(t, err) + assert.Error(t, err) _, err = ss.Session().Get(s4.Id) - assert.NotNil(t, err) + assert.Error(t, err) removeErr := ss.Session().Remove(s1.Id) - require.Nil(t, removeErr) + require.NoError(t, removeErr) removeErr = ss.Session().Remove(s2.Id) - require.Nil(t, removeErr) + require.NoError(t, removeErr) } func testGetSessionsExpired(t *testing.T, ss store.Store) { @@ -319,49 +319,49 @@ func testGetSessionsExpired(t *testing.T, ss store.Store) { // Clear existing sessions. err := ss.Session().RemoveAllSessions() - require.Nil(t, err) + require.NoError(t, err) s1 := &model.Session{} s1.UserId = model.NewId() s1.DeviceId = model.NewId() s1.ExpiresAt = 0 // never expires s1, err = ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2 := &model.Session{} s2.UserId = model.NewId() s2.DeviceId = model.NewId() s2.ExpiresAt = now - TenMinutes // expired within threshold s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) s3 := &model.Session{} s3.UserId = model.NewId() s3.DeviceId = model.NewId() s3.ExpiresAt = now - (TenMinutes * 100) // expired outside threshold s3, err = ss.Session().Save(s3) - require.Nil(t, err) + require.NoError(t, err) s4 := &model.Session{} s4.UserId = model.NewId() s4.ExpiresAt = now - TenMinutes // expired within threshold, but not mobile s4, err = ss.Session().Save(s4) - require.Nil(t, err) + require.NoError(t, err) s5 := &model.Session{} s5.UserId = model.NewId() s5.DeviceId = model.NewId() s5.ExpiresAt = now + (TenMinutes * 100000) // not expired s5, err = ss.Session().Save(s5) - require.Nil(t, err) + require.NoError(t, err) sessions, err := ss.Session().GetSessionsExpired(TenMinutes*2, true, true) // mobile only - require.Nil(t, err) + require.NoError(t, err) require.Len(t, sessions, 1) require.Equal(t, s2.Id, sessions[0].Id) sessions, err = ss.Session().GetSessionsExpired(TenMinutes*2, false, true) // all client types - require.Nil(t, err) + require.NoError(t, err) require.Len(t, sessions, 2) expected := []string{s2.Id, s4.Id} for _, sess := range sessions { @@ -375,21 +375,21 @@ func testUpdateExpiredNotify(t *testing.T, ss store.Store) { s1.DeviceId = model.NewId() s1.ExpiresAt = model.GetMillis() + TenMinutes s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) session, err := ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.False(t, session.ExpiredNotify) err = ss.Session().UpdateExpiredNotify(session.Id, true) - require.Nil(t, err) + require.NoError(t, err) session, err = ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.True(t, session.ExpiredNotify) err = ss.Session().UpdateExpiredNotify(session.Id, false) - require.Nil(t, err) + require.NoError(t, err) session, err = ss.Session().Get(s1.Id) - require.Nil(t, err) + require.NoError(t, err) require.False(t, session.ExpiredNotify) } diff --git a/store/storetest/status_store.go b/store/storetest/status_store.go index 7a1fdfc1f8..1c3d13a803 100644 --- a/store/storetest/status_store.go +++ b/store/storetest/status_store.go @@ -19,40 +19,40 @@ func TestStatusStore(t *testing.T, ss store.Store) { func testStatusStore(t *testing.T, ss store.Store) { status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(status)) + require.NoError(t, ss.Status().SaveOrUpdate(status)) status.LastActivityAt = 10 _, err := ss.Status().Get(status.UserId) - require.Nil(t, err) + require.NoError(t, err) status2 := &model.Status{UserId: model.NewId(), Status: model.STATUS_AWAY, Manual: false, LastActivityAt: 0, ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(status2)) + require.NoError(t, ss.Status().SaveOrUpdate(status2)) status3 := &model.Status{UserId: model.NewId(), Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(status3)) + require.NoError(t, ss.Status().SaveOrUpdate(status3)) statuses, err := ss.Status().GetByIds([]string{status.UserId, "junk"}) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, statuses, 1, "should only have 1 status") err = ss.Status().ResetAll() - require.Nil(t, err) + require.NoError(t, err) statusParameter, err := ss.Status().Get(status.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, statusParameter.Status, model.STATUS_OFFLINE, "should be offline") err = ss.Status().UpdateLastActivityAt(status.UserId, 10) - require.Nil(t, err) + require.NoError(t, err) } func testActiveUserCount(t *testing.T, ss store.Store) { status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""} - require.Nil(t, ss.Status().SaveOrUpdate(status)) + require.NoError(t, ss.Status().SaveOrUpdate(status)) count, err := ss.Status().GetTotalActiveUsersCount() - require.Nil(t, err) + require.NoError(t, err) require.True(t, count > 0, "expected count > 0, got %d", count) } diff --git a/store/storetest/system_store.go b/store/storetest/system_store.go index 5d3267da06..8d5482e888 100644 --- a/store/storetest/system_store.go +++ b/store/storetest/system_store.go @@ -27,7 +27,7 @@ func TestSystemStore(t *testing.T, ss store.Store) { func testSystemStore(t *testing.T, ss store.Store) { system := &model.System{Name: model.NewId(), Value: "value"} err := ss.System().Save(system) - require.Nil(t, err) + require.NoError(t, err) systems, _ := ss.System().Get() @@ -35,7 +35,7 @@ func testSystemStore(t *testing.T, ss store.Store) { system.Value = "value2" err = ss.System().Update(system) - require.Nil(t, err) + require.NoError(t, err) systems2, _ := ss.System().Get() require.Equal(t, system.Value, systems2[system.Name]) @@ -48,38 +48,38 @@ func testSystemStoreSaveOrUpdate(t *testing.T, ss store.Store) { system := &model.System{Name: model.NewId(), Value: "value"} err := ss.System().SaveOrUpdate(system) - require.Nil(t, err) + require.NoError(t, err) system.Value = "value2" err = ss.System().SaveOrUpdate(system) - require.Nil(t, err) + require.NoError(t, err) } func testSystemStoreSaveOrUpdateWithWarnMetricHandling(t *testing.T, ss store.Store) { system := &model.System{Name: model.NewId(), Value: "value"} err := ss.System().SaveOrUpdateWithWarnMetricHandling(system) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY) - assert.NotNil(t, err) + assert.Error(t, err) system.Name = "warn_metric_number_of_active_users_100" system.Value = model.WARN_METRIC_STATUS_RUNONCE err = ss.System().SaveOrUpdateWithWarnMetricHandling(system) - require.Nil(t, err) + require.NoError(t, err) val1, nerr := ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY) - assert.Nil(t, nerr) + assert.NoError(t, nerr) system.Name = "warn_metric_number_of_active_users_100" system.Value = model.WARN_METRIC_STATUS_ACK err = ss.System().SaveOrUpdateWithWarnMetricHandling(system) - require.Nil(t, err) + require.NoError(t, err) val2, nerr := ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY) - assert.Nil(t, nerr) + assert.NoError(t, nerr) assert.Equal(t, val1, val2) } @@ -88,33 +88,33 @@ func testSystemStorePermanentDeleteByName(t *testing.T, ss store.Store) { s2 := &model.System{Name: model.NewId(), Value: "value"} err := ss.System().Save(s1) - require.Nil(t, err) + require.NoError(t, err) err = ss.System().Save(s2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.System().GetByName(s1.Name) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.System().GetByName(s2.Name) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.System().PermanentDeleteByName(s1.Name) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.System().GetByName(s1.Name) - assert.NotNil(t, err) + assert.Error(t, err) _, err = ss.System().GetByName(s2.Name) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.System().PermanentDeleteByName(s2.Name) - assert.Nil(t, err) + assert.NoError(t, err) _, err = ss.System().GetByName(s1.Name) - assert.NotNil(t, err) + assert.Error(t, err) _, err = ss.System().GetByName(s2.Name) - assert.NotNil(t, err) + assert.Error(t, err) } func testInsertIfExists(t *testing.T, ss store.Store) { @@ -122,13 +122,13 @@ func testInsertIfExists(t *testing.T, ss store.Store) { s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "somekey"} s2, err := ss.System().InsertIfExists(s1) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, s1.Value, s2.Value) s1New := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "anotherKey"} s3, err := ss.System().InsertIfExists(s1New) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, s1.Value, s3.Value) }) @@ -141,7 +141,7 @@ func testInsertIfExists(t *testing.T, ss store.Store) { s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "firstKey"} var err error s2, err = ss.System().InsertIfExists(s1) - require.Nil(t, err) + require.NoError(t, err) }() go func() { @@ -149,7 +149,7 @@ func testInsertIfExists(t *testing.T, ss store.Store) { s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "secondKey"} var err error s3, err = ss.System().InsertIfExists(s1) - require.Nil(t, err) + require.NoError(t, err) }() wg.Wait() assert.Equal(t, s2.Value, s3.Value) diff --git a/store/storetest/team_store.go b/store/storetest/team_store.go index 9e4d5f63cb..56299baa3a 100644 --- a/store/storetest/team_store.go +++ b/store/storetest/team_store.go @@ -22,7 +22,7 @@ func cleanupTeamStore(t *testing.T, ss store.Store) { for _, team := range allTeams { ss.Team().PermanentDelete(team.Id) } - assert.Nil(t, err) + assert.NoError(t, err) } func TestTeamStore(t *testing.T, ss store.Store) { @@ -81,14 +81,14 @@ func testTeamStoreSave(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") _, err = ss.Team().Save(&o1) - require.NotNil(t, err, "shouldn't be able to update from save") + require.Error(t, err, "shouldn't be able to update from save") o1.Id = "" _, err = ss.Team().Save(&o1) - require.NotNil(t, err, "should be unique domain") + require.Error(t, err, "should be unique domain") } func testTeamStoreUpdate(t *testing.T, ss store.Store) { @@ -98,20 +98,20 @@ func testTeamStoreUpdate(t *testing.T, ss store.Store) { o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(100 * time.Millisecond) _, err = ss.Team().Update(&o1) - require.Nil(t, err) + require.NoError(t, err) o1.Id = "missing" _, err = ss.Team().Update(&o1) - require.NotNil(t, err, "Update should have failed because of missing key") + require.Error(t, err, "Update should have failed because of missing key") o1.Id = model.NewId() _, err = ss.Team().Update(&o1) - require.NotNil(t, err, "Update should have faile because id change") + require.Error(t, err, "Update should have faile because id change") } func testTeamStoreGet(t *testing.T, ss store.Store) { @@ -121,14 +121,14 @@ func testTeamStoreGet(t *testing.T, ss store.Store) { o1.Email = MakeEmail() o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) r1, err := ss.Team().Get(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r1.ToJson(), o1.ToJson()) _, err = ss.Team().Get("") - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testTeamStoreGetByNames(t *testing.T, ss store.Store) { @@ -139,7 +139,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName2" @@ -148,19 +148,19 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) t.Run("Get empty list", func(t *testing.T) { var teams []*model.Team teams, err = ss.Team().GetByNames([]string{}) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, teams) }) t.Run("Get existing teams", func(t *testing.T) { var teams []*model.Team teams, err = ss.Team().GetByNames([]string{o1.Name, o2.Name}) - require.Nil(t, err) + require.NoError(t, err) teamsIds := []string{} for _, team := range teams { teamsIds = append(teamsIds, team.Id) @@ -171,16 +171,16 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) { t.Run("Get existing team and one invalid team name", func(t *testing.T) { _, err = ss.Team().GetByNames([]string{o1.Name, ""}) - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Get existing team and not existing team", func(t *testing.T) { _, err = ss.Team().GetByNames([]string{o1.Name, "not-existing-team-name"}) - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Get not existing teams", func(t *testing.T) { _, err = ss.Team().GetByNames([]string{"not-existing-team-name", "not-existing-team-name-2"}) - require.NotNil(t, err) + require.Error(t, err) }) } @@ -192,23 +192,23 @@ func testTeamStoreGetByName(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) t.Run("Get existing team", func(t *testing.T) { var team *model.Team team, err = ss.Team().GetByName(o1.Name) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, *team, o1, "invalid returned team") }) t.Run("Get invalid team name", func(t *testing.T) { _, err = ss.Team().GetByName("") - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") }) t.Run("Get not existing team", func(t *testing.T) { _, err = ss.Team().GetByName("not-existing-team-name") - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") }) } @@ -221,7 +221,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { o.AllowOpenInvite = true _, err := ss.Team().Save(&o) - require.Nil(t, err) + require.NoError(t, err) p := model.Team{} p.DisplayName = "BDisplayName" + model.NewId() @@ -231,7 +231,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { p.AllowOpenInvite = false _, err = ss.Team().Save(&p) - require.Nil(t, err) + require.NoError(t, err) g := model.Team{} g.DisplayName = "CDisplayName" + model.NewId() @@ -242,7 +242,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { g.GroupConstrained = model.NewBool(true) _, err = ss.Team().Save(&g) - require.Nil(t, err) + require.NoError(t, err) q := model.Team{} q.DisplayName = "CHOCOLATE" @@ -252,7 +252,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { q.AllowOpenInvite = false _, err = ss.Team().Save(&q) - require.Nil(t, err) + require.NoError(t, err) testCases := []struct { Name string @@ -373,7 +373,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { response, err := ss.Team().SearchAll(tc.Opts.Term, tc.Opts) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, tc.ExpectedLenth, len(response)) responseTeamIds := []string{} for _, team := range response { @@ -393,7 +393,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { o.AllowOpenInvite = true _, err := ss.Team().Save(&o) - require.Nil(t, err) + require.NoError(t, err) p := model.Team{} p.DisplayName = "ADisplayName" + model.NewId() @@ -403,7 +403,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { p.AllowOpenInvite = false _, err = ss.Team().Save(&p) - require.Nil(t, err) + require.NoError(t, err) q := model.Team{} q.DisplayName = "PINEAPPLEPIE" @@ -413,7 +413,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { q.AllowOpenInvite = true _, err = ss.Team().Save(&q) - require.Nil(t, err) + require.NoError(t, err) testCases := []struct { Name string @@ -480,7 +480,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { r1, err := ss.Team().SearchOpen(tc.Term) - require.Nil(t, err) + require.NoError(t, err) results := r1 require.Equal(t, tc.ExpectedLength, len(results)) if tc.ExpectedFirstId != "" { @@ -499,7 +499,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { o.AllowOpenInvite = true _, err := ss.Team().Save(&o) - require.Nil(t, err) + require.NoError(t, err) p := model.Team{} p.DisplayName = "ADisplayName" + model.NewId() @@ -509,7 +509,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { p.AllowOpenInvite = false _, err = ss.Team().Save(&p) - require.Nil(t, err) + require.NoError(t, err) q := model.Team{} q.DisplayName = "FOOBARDISPLAYNAME" @@ -519,7 +519,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { q.AllowOpenInvite = false _, err = ss.Team().Save(&q) - require.Nil(t, err) + require.NoError(t, err) testCases := []struct { Name string @@ -586,7 +586,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { r1, err := ss.Team().SearchPrivate(tc.Term) - require.Nil(t, err) + require.NoError(t, err) results := r1 require.Equal(t, tc.ExpectedLength, len(results)) if tc.ExpectedFirstId != "" { @@ -605,7 +605,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) { o1.InviteId = model.NewId() save1, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -614,11 +614,11 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN r1, err := ss.Team().GetByInviteId(save1.InviteId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, *r1, o1, "invalid returned team") _, err = ss.Team().GetByInviteId("") - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testTeamStoreByUserId(t *testing.T, ss store.Store) { @@ -629,14 +629,14 @@ func testTeamStoreByUserId(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.InviteId = model.NewId() o1, err := ss.Team().Save(o1) - require.Nil(t, err) + require.NoError(t, err) m1 := &model.TeamMember{TeamId: o1.Id, UserId: model.NewId()} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) teams, err := ss.Team().GetTeamsByUserId(m1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, teams, 1, "Should return a team") require.Equal(t, teams[0].Id, o1.Id, "should be a member") } @@ -649,7 +649,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -657,7 +657,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName" @@ -666,7 +666,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true _, err = ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) o4 := model.Team{} o4.DisplayName = "DisplayName" @@ -674,10 +674,10 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) { o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE _, err = ss.Team().Save(&o4) - require.Nil(t, err) + require.NoError(t, err) teams, err := ss.Team().GetAllTeamListing() - require.Nil(t, err) + require.NoError(t, err) for _, team := range teams { require.True(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as true") } @@ -693,7 +693,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -702,7 +702,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName" @@ -711,7 +711,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true _, err = ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) o4 := model.Team{} o4.DisplayName = "DisplayName" @@ -720,10 +720,10 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o4.Type = model.TEAM_INVITE o4.AllowOpenInvite = false _, err = ss.Team().Save(&o4) - require.Nil(t, err) + require.NoError(t, err) teams, err := ss.Team().GetAllTeamPageListing(0, 10) - require.Nil(t, err) + require.NoError(t, err) for _, team := range teams { require.True(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as true") @@ -738,10 +738,10 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { o5.Type = model.TEAM_OPEN o5.AllowOpenInvite = true _, err = ss.Team().Save(&o5) - require.Nil(t, err) + require.NoError(t, err) teams, err = ss.Team().GetAllTeamPageListing(0, 4) - require.Nil(t, err) + require.NoError(t, err) for _, team := range teams { require.True(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as true") @@ -750,7 +750,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) { require.LessOrEqual(t, len(teams), 4, "should have returned max of 4 teams") teams, err = ss.Team().GetAllTeamPageListing(1, 1) - require.Nil(t, err) + require.NoError(t, err) for _, team := range teams { require.True(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as true") @@ -767,7 +767,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -775,7 +775,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName" @@ -784,7 +784,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true _, err = ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) o4 := model.Team{} o4.DisplayName = "DisplayName" @@ -792,10 +792,10 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) { o4.Email = MakeEmail() o4.Type = model.TEAM_INVITE _, err = ss.Team().Save(&o4) - require.Nil(t, err) + require.NoError(t, err) teams, err := ss.Team().GetAllPrivateTeamListing() - require.Nil(t, err) + require.NoError(t, err) require.NotEmpty(t, teams, "failed team listing") for _, team := range teams { @@ -811,7 +811,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -820,7 +820,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName" @@ -829,7 +829,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true _, err = ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) o4 := model.Team{} o4.DisplayName = "DisplayName" @@ -838,10 +838,10 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o4.Type = model.TEAM_INVITE o4.AllowOpenInvite = false _, err = ss.Team().Save(&o4) - require.Nil(t, err) + require.NoError(t, err) teams, listErr := ss.Team().GetAllPrivateTeamPageListing(0, 10) - require.Nil(t, listErr) + require.NoError(t, listErr) for _, team := range teams { require.False(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as false") } @@ -855,10 +855,10 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { o5.Type = model.TEAM_OPEN o5.AllowOpenInvite = true _, err = ss.Team().Save(&o5) - require.Nil(t, err) + require.NoError(t, err) teams, listErr = ss.Team().GetAllPrivateTeamPageListing(0, 4) - require.Nil(t, listErr) + require.NoError(t, listErr) for _, team := range teams { require.False(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as false") } @@ -866,7 +866,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) { require.LessOrEqual(t, len(teams), 4, "should have returned max of 4 teams") teams, listErr = ss.Team().GetAllPrivateTeamPageListing(1, 1) - require.Nil(t, listErr) + require.NoError(t, listErr) for _, team := range teams { require.False(t, team.AllowOpenInvite, "should have returned team with AllowOpenInvite as false") } @@ -884,7 +884,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true t1, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName2" @@ -893,7 +893,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName3" @@ -902,7 +902,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o3.Type = model.TEAM_INVITE o3.AllowOpenInvite = true t3, err := ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) o4 := model.Team{} o4.DisplayName = "DisplayName4" @@ -911,10 +911,10 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o4.Type = model.TEAM_INVITE o4.AllowOpenInvite = false _, err = ss.Team().Save(&o4) - require.Nil(t, err) + require.NoError(t, err) teams, err := ss.Team().GetAllPublicTeamPageListing(0, 10) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []*model.Team{t1, t3}, teams) o5 := model.Team{} @@ -924,14 +924,14 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) { o5.Type = model.TEAM_OPEN o5.AllowOpenInvite = true t5, err := ss.Team().Save(&o5) - require.Nil(t, err) + require.NoError(t, err) teams, err = ss.Team().GetAllPublicTeamPageListing(0, 4) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, []*model.Team{t1, t3, t5}, teams) _, err = ss.Team().GetAllPublicTeamPageListing(1, 1) - assert.Nil(t, err) + assert.NoError(t, err) } func testDelete(t *testing.T, ss store.Store) { @@ -942,7 +942,7 @@ func testDelete(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -950,10 +950,10 @@ func testDelete(t *testing.T, ss store.Store) { o2.Email = MakeEmail() o2.Type = model.TEAM_OPEN _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) r1 := ss.Team().PermanentDelete(o1.Id) - require.Nil(t, r1) + require.NoError(t, r1) } func testPublicTeamCount(t *testing.T, ss store.Store) { @@ -966,7 +966,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -975,7 +975,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = false _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName" @@ -984,10 +984,10 @@ func testPublicTeamCount(t *testing.T, ss store.Store) { o3.Type = model.TEAM_OPEN o3.AllowOpenInvite = true _, err = ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) teamCount, err := ss.Team().AnalyticsPublicTeamCount() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(2), teamCount, "should only be 1 team") } @@ -1001,7 +1001,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = false _, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) o2 := model.Team{} o2.DisplayName = "DisplayName" @@ -1010,7 +1010,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { o2.Type = model.TEAM_OPEN o2.AllowOpenInvite = true _, err = ss.Team().Save(&o2) - require.Nil(t, err) + require.NoError(t, err) o3 := model.Team{} o3.DisplayName = "DisplayName" @@ -1019,10 +1019,10 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) { o3.Type = model.TEAM_OPEN o3.AllowOpenInvite = false _, err = ss.Team().Save(&o3) - require.Nil(t, err) + require.NoError(t, err) teamCount, err := ss.Team().AnalyticsPrivateTeamCount() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int64(2), teamCount, "should only be 1 team") } @@ -1034,25 +1034,25 @@ func testTeamCount(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.AllowOpenInvite = true team, err := ss.Team().Save(&o1) - require.Nil(t, err) + require.NoError(t, err) // not including deleted teams teamCount, err := ss.Team().AnalyticsTeamCount(false) - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, 0, int(teamCount), "should be at least 1 team") // delete the team for the next check team.DeleteAt = model.GetMillis() _, err = ss.Team().Update(team) - require.Nil(t, err) + require.NoError(t, err) // get the count of teams not including deleted countNotIncludingDeleted, err := ss.Team().AnalyticsTeamCount(false) - require.Nil(t, err) + require.NoError(t, err) // get the count of teams including deleted countIncludingDeleted, err := ss.Team().AnalyticsTeamCount(true) - require.Nil(t, err) + require.NoError(t, err) // count including deleted should be one greater than not including deleted require.Equal(t, countNotIncludingDeleted+1, countIncludingDeleted) @@ -1072,11 +1072,11 @@ func testGetMembers(t *testing.T, ss store.Store) { m6 := &model.TeamMember{TeamId: teamId2, UserId: "00000000000000000000000000"} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Gets users ordered by UserId ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, ms, 5) assert.Equal(t, "11111111111111111111111111", ms[0].UserId) assert.Equal(t, "22222222222222222222222222", ms[1].UserId) @@ -1097,17 +1097,17 @@ func testGetMembers(t *testing.T, ss store.Store) { u6 := &model.User{Username: "d", Email: MakeEmail()} u1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) u3, err = ss.User().Save(u3) - require.Nil(t, err) + require.NoError(t, err) u4, err = ss.User().Save(u4) - require.Nil(t, err) + require.NoError(t, err) u5, err = ss.User().Save(u5) - require.Nil(t, err) + require.NoError(t, err) u6, err = ss.User().Save(u6) - require.Nil(t, err) + require.NoError(t, err) m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamId1, UserId: u2.Id} @@ -1117,11 +1117,11 @@ func testGetMembers(t *testing.T, ss store.Store) { m6 := &model.TeamMember{TeamId: teamId2, UserId: u6.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5, m6}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Gets users ordered by UserName ms, nErr := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, ms, 5) assert.Equal(t, u1.Id, ms[0].UserId) assert.Equal(t, u3.Id, ms[1].UserId) @@ -1131,7 +1131,7 @@ func testGetMembers(t *testing.T, ss store.Store) { // Gets users ordered by UserName and excludes deleted members ms, nErr = ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{Sort: model.USERNAME, ExcludeDeletedUsers: true}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, ms, 2) assert.Equal(t, u2.Id, ms[0].UserId) assert.Equal(t, u4.Id, ms[1].UserId) @@ -1149,17 +1149,17 @@ func testGetMembers(t *testing.T, ss store.Store) { u6 := &model.User{Email: MakeEmail(), DeleteAt: int64(5)} u1, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) u3, err = ss.User().Save(u3) - require.Nil(t, err) + require.NoError(t, err) u4, err = ss.User().Save(u4) - require.Nil(t, err) + require.NoError(t, err) u5, err = ss.User().Save(u5) - require.Nil(t, err) + require.NoError(t, err) u6, err = ss.User().Save(u6) - require.Nil(t, err) + require.NoError(t, err) m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamId1, UserId: u2.Id} @@ -1169,21 +1169,21 @@ func testGetMembers(t *testing.T, ss store.Store) { m6 := &model.TeamMember{TeamId: teamId2, UserId: u6.Id} t1, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t3, nErr := ss.Team().SaveMember(m3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t5, nErr := ss.Team().SaveMember(m5, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m6, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Gets users ordered by UserName ms, nErr := ss.Team().GetMembers(teamId1, 0, 100, &model.TeamMembersGetOptions{ExcludeDeletedUsers: true}) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Len(t, ms, 3) require.ElementsMatch(t, ms, [3]*model.TeamMember{t1, t3, t5}) }) @@ -1198,76 +1198,76 @@ func testTeamMembers(t *testing.T, ss store.Store) { m3 := &model.TeamMember{TeamId: teamId2, UserId: model.NewId()} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, ms, 2) ms, err = ss.Team().GetMembers(teamId2, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, ms, 1) require.Equal(t, m3.UserId, ms[0].UserId) ctx := context.Background() ms, err = ss.Team().GetTeamsForUser(ctx, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, ms, 1) require.Equal(t, m1.TeamId, ms[0].TeamId) err = ss.Team().RemoveMember(teamId1, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) ms, err = ss.Team().GetMembers(teamId1, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, ms, 1) require.Equal(t, m2.UserId, ms[0].UserId) _, nErr = ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.Team().RemoveAllMembersByTeam(teamId1) - require.Nil(t, err) + require.NoError(t, err) ms, err = ss.Team().GetMembers(teamId1, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, ms) uid := model.NewId() m4 := &model.TeamMember{TeamId: teamId1, UserId: uid} m5 := &model.TeamMember{TeamId: teamId2, UserId: uid} _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ms, err = ss.Team().GetTeamsForUser(ctx, uid) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, ms, 2) nErr = ss.Team().RemoveAllMembersByUser(uid) - require.Nil(t, nErr) + require.NoError(t, nErr) ms, err = ss.Team().GetTeamsForUser(ctx, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, ms) } func testTeamSaveMember(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) t.Run("not valid team member", func(t *testing.T) { member := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} _, nErr := ss.Team().SaveMember(member, -1) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "TeamMember.IsValid: model.team_member.is_valid.team_id.app_error, ", nErr.Error()) }) t.Run("too many members", func(t *testing.T) { member := &model.TeamMember{TeamId: model.NewId(), UserId: u1.Id} _, nErr := ss.Team().SaveMember(member, 0) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 1 metadata: team members limit exceeded", nErr.Error()) }) @@ -1278,7 +1278,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { _, nErr := ss.Team().SaveMember(m1, 1) m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} _, nErr = ss.Team().SaveMember(m2, 1) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 2 metadata: team members limit exceeded", nErr.Error()) }) @@ -1286,10 +1286,10 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { teamID1 := model.NewId() m1 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m2 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} _, nErr = ss.Team().SaveMember(m2, -1) - require.NotNil(t, nErr) + require.Error(t, nErr) require.IsType(t, &store.ErrConflict{}, nErr) }) @@ -1302,7 +1302,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -1422,7 +1422,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { ExplicitRoles: tc.ExplicitRoles, } member, nErr := ss.Team().SaveMember(member, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Team().RemoveMember(team.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) @@ -1442,7 +1442,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -1453,7 +1453,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -1573,7 +1573,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { ExplicitRoles: tc.ExplicitRoles, } member, nErr := ss.Team().SaveMember(member, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Team().RemoveMember(team.Id, u1.Id) assert.Equal(t, tc.ExpectedRoles, member.Roles) @@ -1588,19 +1588,19 @@ func testTeamSaveMember(t *testing.T, ss store.Store) { func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) t.Run("any not valid team member", func(t *testing.T) { m1 := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} m2 := &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "TeamMember.IsValid: model.team_member.is_valid.team_id.app_error, ", nErr.Error()) }) @@ -1609,7 +1609,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 0) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 2 metadata: team members limit exceeded", nErr.Error()) }) @@ -1620,10 +1620,10 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { m3 := &model.TeamMember{TeamId: teamID, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID, UserId: u4.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 3) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m3, m4}, 3) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 4 metadata: team members limit exceeded", nErr.Error()) }) @@ -1636,7 +1636,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { m4 := &model.TeamMember{TeamId: teamID2, UserId: u1.Id} m5 := &model.TeamMember{TeamId: teamID2, UserId: u2.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4, m5}, 2) - require.NotNil(t, nErr) + require.Error(t, nErr) require.Equal(t, "limit exceeded: what: TeamMember count: 3 metadata: team members limit exceeded", nErr.Error()) }) @@ -1645,7 +1645,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamID1, UserId: u1.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, 10) - require.NotNil(t, nErr) + require.Error(t, nErr) require.IsType(t, &store.ErrConflict{}, nErr) }) @@ -1658,7 +1658,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -1787,7 +1787,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { } var members []*model.TeamMember members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] defer ss.Team().RemoveMember(team.Id, u1.Id) @@ -1810,7 +1810,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -1821,7 +1821,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -1949,7 +1949,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { ExplicitRoles: tc.ExplicitRoles, } members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] defer ss.Team().RemoveMember(team.Id, u1.Id) @@ -1967,12 +1967,12 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) { func testTeamUpdateMember(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) t.Run("not valid team member", func(t *testing.T) { member := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} _, nErr := ss.Team().UpdateMember(member) - require.NotNil(t, nErr) + require.Error(t, nErr) var appErr *model.AppError require.True(t, errors.As(nErr, &appErr)) require.Equal(t, "model.team_member.is_valid.team_id.app_error", appErr.Id) @@ -1987,11 +1987,11 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} member, nErr = ss.Team().SaveMember(member, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -2108,7 +2108,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { member.ExplicitRoles = tc.ExplicitRoles member, nErr = ss.Team().UpdateMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) @@ -2127,7 +2127,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -2138,11 +2138,11 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} member, nErr = ss.Team().SaveMember(member, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Name string @@ -2259,7 +2259,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { member.ExplicitRoles = tc.ExplicitRoles member, nErr = ss.Team().UpdateMember(member) - require.Nil(t, nErr) + require.NoError(t, nErr) assert.Equal(t, tc.ExpectedRoles, member.Roles) assert.Equal(t, tc.ExpectedExplicitRoles, member.ExplicitRoles) @@ -2273,15 +2273,15 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) { func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) t.Run("any not valid team member", func(t *testing.T) { m1 := &model.TeamMember{TeamId: "wrong", UserId: u1.Id} m2 := &model.TeamMember{TeamId: model.NewId(), UserId: u2.Id} _, nErr := ss.Team().UpdateMultipleMembers([]*model.TeamMember{m1, m2}) - require.NotNil(t, nErr) + require.Error(t, nErr) var appErr *model.AppError require.True(t, errors.As(nErr, &appErr)) require.Equal(t, "model.team_member.is_valid.team_id.app_error", appErr.Id) @@ -2296,13 +2296,13 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { } team, nErr := ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} otherMember := &model.TeamMember{TeamId: team.Id, UserId: u2.Id} var members []*model.TeamMember members, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] otherMember = members[1] @@ -2423,7 +2423,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { var members []*model.TeamMember members, nErr = ss.Team().UpdateMultipleMembers([]*model.TeamMember{member, otherMember}) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] @@ -2444,7 +2444,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } ts, nErr := ss.Scheme().Save(ts) - require.Nil(t, nErr) + require.NoError(t, nErr) team := &model.Team{ DisplayName: "Name", @@ -2455,12 +2455,12 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { } team, nErr = ss.Team().Save(team) - require.Nil(t, nErr) + require.NoError(t, nErr) member := &model.TeamMember{TeamId: team.Id, UserId: u1.Id} otherMember := &model.TeamMember{TeamId: team.Id, UserId: u2.Id} members, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{member, otherMember}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, members, 2) member = members[0] otherMember = members[1] @@ -2580,7 +2580,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { member.ExplicitRoles = tc.ExplicitRoles members, err := ss.Team().UpdateMultipleMembers([]*model.TeamMember{member, otherMember}) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, members, 2) member = members[0] @@ -2596,101 +2596,101 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) { func testTeamRemoveMember(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) teamID := model.NewId() m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} m3 := &model.TeamMember{TeamId: teamID, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID, UserId: u4.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("remove member from not existing team", func(t *testing.T) { nErr = ss.Team().RemoveMember("not-existing-team", u1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 4) }) t.Run("remove not existing member from an existing team", func(t *testing.T) { nErr = ss.Team().RemoveMember(teamID, model.NewId()) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 4) }) t.Run("remove existing member from an existing team", func(t *testing.T) { nErr = ss.Team().RemoveMember(teamID, u1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Team().SaveMember(m1, -1) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 3) }) } func testTeamRemoveMembers(t *testing.T, ss store.Store) { u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()}) - require.Nil(t, err) + require.NoError(t, err) teamID := model.NewId() m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id} m2 := &model.TeamMember{TeamId: teamID, UserId: u2.Id} m3 := &model.TeamMember{TeamId: teamID, UserId: u3.Id} m4 := &model.TeamMember{TeamId: teamID, UserId: u4.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("remove members from not existing team", func(t *testing.T) { nErr = ss.Team().RemoveMembers("not-existing-team", []string{u1.Id, u2.Id, u3.Id, u4.Id}) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 4) }) t.Run("remove not existing members from an existing team", func(t *testing.T) { nErr = ss.Team().RemoveMembers(teamID, []string{model.NewId(), model.NewId()}) - require.Nil(t, nErr) + require.NoError(t, nErr) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 4) }) t.Run("remove not existing and not existing members from an existing team", func(t *testing.T) { nErr = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, model.NewId(), model.NewId()}) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 2) }) t.Run("remove existing members from an existing team", func(t *testing.T) { nErr = ss.Team().RemoveMembers(teamID, []string{u1.Id, u2.Id, u3.Id}) - require.Nil(t, nErr) + require.NoError(t, nErr) defer ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) var membersOtherTeam []*model.TeamMember membersOtherTeam, nErr = ss.Team().GetMembers(teamID, 0, 100, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, membersOtherTeam, 1) }) } @@ -2704,44 +2704,44 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) { m3 := &model.TeamMember{TeamId: teamId2, UserId: model.NewId()} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ms, errTeam := ss.Team().GetTeamsForUserWithPagination(m1.UserId, 0, 1) - require.Nil(t, errTeam) + require.NoError(t, errTeam) require.Len(t, ms, 1) require.Equal(t, m1.TeamId, ms[0].TeamId) e := ss.Team().RemoveMember(teamId1, m1.UserId) - require.Nil(t, e) + require.NoError(t, e) ms, err := ss.Team().GetMembers(teamId1, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, ms, 1) require.Equal(t, m2.UserId, ms[0].UserId) _, nErr = ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.Team().RemoveAllMembersByTeam(teamId1) - require.Nil(t, err) + require.NoError(t, err) uid := model.NewId() m4 := &model.TeamMember{TeamId: teamId1, UserId: uid} m5 := &model.TeamMember{TeamId: teamId2, UserId: uid} _, nErr = ss.Team().SaveMultipleMembers([]*model.TeamMember{m4, m5}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) result, err := ss.Team().GetTeamsForUserWithPagination(uid, 0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, result, 1) nErr = ss.Team().RemoveAllMembersByUser(uid) - require.Nil(t, nErr) + require.NoError(t, nErr) result, err = ss.Team().GetTeamsForUserWithPagination(uid, 1, 1) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, result) } @@ -2753,7 +2753,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { Name: "z-z-z" + model.NewId() + "b", Type: model.TEAM_OPEN, }) - require.Nil(t, errSave) + require.NoError(t, errSave) defer func() { ss.Team().PermanentDelete(team.Id) }() @@ -2765,7 +2765,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { Username: model.NewId(), Email: MakeEmail(), }) - require.Nil(t, err) + require.NoError(t, err) userIds[i] = user.Id defer func(userId string) { @@ -2776,7 +2776,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { TeamId: team.Id, UserId: userIds[i], }, maxUsersPerTeam) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func(userId string) { ss.Team().RemoveMember(team.Id, userId) @@ -2784,14 +2784,14 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { } totalMemberCount, err := ss.Team().GetTotalMemberCount(team.Id, nil) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, int(totalMemberCount), maxUsersPerTeam, "should start with 5 team members, had %v instead", totalMemberCount) user, nErr := ss.User().Save(&model.User{ Username: model.NewId(), Email: MakeEmail(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) newUserId := user.Id defer func() { ss.User().PermanentDelete(newUserId) @@ -2801,10 +2801,10 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { TeamId: team.Id, UserId: newUserId, }, maxUsersPerTeam) - require.NotNil(t, nErr, "shouldn't be able to save member when at maximum members per team") + require.Error(t, nErr, "shouldn't be able to save member when at maximum members per team") totalMemberCount, teamErr := ss.Team().GetTotalMemberCount(team.Id, nil) - require.Nil(t, teamErr) + require.NoError(t, teamErr) require.Equal(t, maxUsersPerTeam, int(totalMemberCount), "should still have 5 team members, had %v instead", totalMemberCount) // Leaving the team from the UI sets DeleteAt instead of using TeamStore.RemoveMember @@ -2813,36 +2813,36 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) { UserId: userIds[0], DeleteAt: 1234, }) - require.Nil(t, teamErr) + require.NoError(t, teamErr) totalMemberCount, teamErr = ss.Team().GetTotalMemberCount(team.Id, nil) - require.Nil(t, teamErr) + require.NoError(t, teamErr) require.Equal(t, maxUsersPerTeam-1, int(totalMemberCount), "should now only have 4 team members, had %v instead", totalMemberCount) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId}, maxUsersPerTeam) - require.Nil(t, nErr, "should've been able to save new member after deleting one") + require.NoError(t, nErr, "should've been able to save new member after deleting one") defer ss.Team().RemoveMember(team.Id, newUserId) totalMemberCount, teamErr = ss.Team().GetTotalMemberCount(team.Id, nil) - require.Nil(t, teamErr) + require.NoError(t, teamErr) require.Equal(t, maxUsersPerTeam, int(totalMemberCount), "should have 5 team members again, had %v instead", totalMemberCount) // Deactivating a user should make them stop counting against max members user2, nErr := ss.User().Get(userIds[1]) - require.Nil(t, nErr) + require.NoError(t, nErr) user2.DeleteAt = 1234 _, nErr = ss.User().Update(user2, true) - require.Nil(t, nErr) + require.NoError(t, nErr) user, nErr = ss.User().Save(&model.User{ Username: model.NewId(), Email: MakeEmail(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) newUserId2 := user.Id _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team.Id, UserId: newUserId2}, maxUsersPerTeam) - require.Nil(t, nErr, "should've been able to save new member after deleting one") + require.NoError(t, nErr, "should've been able to save new member after deleting one") defer ss.Team().RemoveMember(team.Id, newUserId2) } @@ -2852,21 +2852,21 @@ func testGetTeamMember(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) var rm1 *model.TeamMember rm1, err := ss.Team().GetMember(m1.TeamId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, rm1.TeamId, m1.TeamId, "bad team id") require.Equal(t, rm1.UserId, m1.UserId, "bad user id") _, err = ss.Team().GetMember(m1.TeamId, "") - require.NotNil(t, err, "empty user id - should have failed") + require.Error(t, err, "empty user id - should have failed") _, err = ss.Team().GetMember("", m1.UserId) - require.NotNil(t, err, "empty team id - should have failed") + require.Error(t, err, "empty team id - should have failed") // Test with a custom team scheme. s2 := &model.Scheme{ @@ -2876,7 +2876,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } s2, nErr = ss.Scheme().Save(s2) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Log(s2) t2, nErr := ss.Team().Save(&model.Team{ @@ -2885,7 +2885,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, SchemeId: &s2.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) defer func() { ss.Team().PermanentDelete(t2.Id) @@ -2893,20 +2893,20 @@ func testGetTeamMember(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeUser: true} _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m3, err := ss.Team().GetMember(m2.TeamId, m2.UserId) - require.Nil(t, err) + require.NoError(t, err) t.Log(m3) assert.Equal(t, s2.DefaultTeamUserRole, m3.Roles) m4 := &model.TeamMember{TeamId: t2.Id, UserId: model.NewId(), SchemeGuest: true} _, nErr = ss.Team().SaveMember(m4, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m5, err := ss.Team().GetMember(m4.TeamId, m4.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, s2.DefaultTeamGuestRole, m5.Roles) } @@ -2916,11 +2916,11 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) var r []*model.TeamMember r, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId}, nil) - require.Nil(t, err) + require.NoError(t, err) rm1 := r[0] require.Equal(t, rm1.TeamId, m1.TeamId, "bad team id") @@ -2928,58 +2928,58 @@ func testGetTeamMembersByIds(t *testing.T, ss store.Store) { m2 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) rm, err := ss.Team().GetMembersByIds(m1.TeamId, []string{m1.UserId, m2.UserId, model.NewId()}, nil) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, rm, 2, "return wrong number of results") _, err = ss.Team().GetMembersByIds(m1.TeamId, []string{}, nil) - require.NotNil(t, err, "empty user ids - should have failed") + require.Error(t, err, "empty user ids - should have failed") } func testTeamStoreMemberCount(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{} u2.Email = MakeEmail() u2.DeleteAt = 1 _, err = ss.User().Save(u2) - require.Nil(t, err) + require.NoError(t, err) teamId1 := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: u1.Id} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) m2 := &model.TeamMember{TeamId: teamId1, UserId: u2.Id} _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) var totalMemberCount int64 totalMemberCount, nErr = ss.Team().GetTotalMemberCount(teamId1, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, int(totalMemberCount), 2, "wrong count") var result int64 result, nErr = ss.Team().GetActiveMemberCount(teamId1, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, 1, int(result), "wrong count") m3 := &model.TeamMember{TeamId: teamId1, UserId: model.NewId()} _, nErr = ss.Team().SaveMember(m3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) totalMemberCount, nErr = ss.Team().GetTotalMemberCount(teamId1, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, 2, int(totalMemberCount), "wrong count") result, nErr = ss.Team().GetActiveMemberCount(teamId1, nil) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, 1, int(result), "wrong count") } @@ -2991,27 +2991,27 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) { m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} m2 := &model.TeamMember{TeamId: teamId2, UserId: uid} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(m2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} _, nErr = ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} _, nErr = ss.Channel().Save(c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} _, err := ss.Channel().SaveMember(cm1) - require.Nil(t, err) + require.NoError(t, err) cm2 := &model.ChannelMember{ChannelId: c2.Id, UserId: m2.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} _, err = ss.Channel().SaveMember(cm2) - require.Nil(t, err) + require.NoError(t, err) ms1, nErr := ss.Team().GetChannelUnreadsForAllTeams("", uid) - require.Nil(t, nErr) + require.NoError(t, nErr) membersMap := make(map[string]bool) for i := range ms1 { id := ms1[i].TeamId @@ -3024,7 +3024,7 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) { require.Equal(t, 10, int(ms1[0].MsgCount), "subtraction failed") ms2, nErr := ss.Team().GetChannelUnreadsForAllTeams(teamId1, uid) - require.Nil(t, nErr) + require.NoError(t, nErr) membersMap = make(map[string]bool) for i := range ms2 { id := ms2[i].TeamId @@ -3038,7 +3038,7 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) { require.Equal(t, 10, int(ms2[0].MsgCount), "subtraction failed") nErr = ss.Team().RemoveAllMembersByUser(uid) - require.Nil(t, nErr) + require.NoError(t, nErr) } func testGetChannelUnreadsForTeam(t *testing.T, ss store.Store) { @@ -3047,25 +3047,25 @@ func testGetChannelUnreadsForTeam(t *testing.T, ss store.Store) { uid := model.NewId() m1 := &model.TeamMember{TeamId: teamId1, UserId: uid} _, nErr := ss.Team().SaveMember(m1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} _, nErr = ss.Channel().Save(c1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100} _, nErr = ss.Channel().Save(c2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) cm1 := &model.ChannelMember{ChannelId: c1.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} _, nErr = ss.Channel().SaveMember(cm1) - require.Nil(t, nErr) + require.NoError(t, nErr) cm2 := &model.ChannelMember{ChannelId: c2.Id, UserId: m1.UserId, NotifyProps: model.GetDefaultChannelNotifyProps(), MsgCount: 90} _, nErr = ss.Channel().SaveMember(cm2) - require.Nil(t, nErr) + require.NoError(t, nErr) ms, err := ss.Team().GetChannelUnreadsForTeam(m1.TeamId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, ms, 2, "wrong length") require.Equal(t, 10, int(ms[0].MsgCount), "subtraction failed") @@ -3083,15 +3083,15 @@ func testUpdateLastTeamIconUpdate(t *testing.T, ss store.Store) { o1.Type = model.TEAM_OPEN o1.LastTeamIconUpdate = lastTeamIconUpdateInitial o1, err := ss.Team().Save(o1) - require.Nil(t, err) + require.NoError(t, err) curTime := model.GetMillis() err = ss.Team().UpdateLastTeamIconUpdate(o1.Id, curTime) - require.Nil(t, err) + require.NoError(t, err) ro1, err := ss.Team().Get(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Greater(t, ro1.LastTeamIconUpdate, lastTeamIconUpdateInitial, "LastTeamIconUpdate not updated") } @@ -3113,9 +3113,9 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) { } s1, err := ss.Scheme().Save(s1) - require.Nil(t, err) + require.NoError(t, err) s2, err = ss.Scheme().Save(s2) - require.Nil(t, err) + require.NoError(t, err) // Create and save some teams. t1 := &model.Team{ @@ -3142,27 +3142,27 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) { } _, err = ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Team().Save(t2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Team().Save(t3) - require.Nil(t, err) + require.NoError(t, err) // Get the teams by a valid Scheme ID. d, err := ss.Team().GetTeamsByScheme(s1.Id, 0, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d, 2) // Get the teams by a valid Scheme ID where there aren't any matching Teams. d, err = ss.Team().GetTeamsByScheme(s2.Id, 0, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, d) // Get the teams by an invalid Scheme ID. d, err = ss.Team().GetTeamsByScheme(model.NewId(), 0, 100) - assert.Nil(t, err) + assert.NoError(t, err) assert.Empty(t, d) } @@ -3177,7 +3177,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { SchemeId: &s1, } t1, err := ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) tm1 := &model.TeamMember{ TeamId: t1.Id, @@ -3196,7 +3196,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { } memberships, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{tm1, tm2, tm3}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Len(t, memberships, 3) tm1 = memberships[0] tm2 = memberships[1] @@ -3207,7 +3207,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { for { res, e := ss.Team().MigrateTeamMembers(lastDoneTeamId, lastDoneUserId) - if assert.Nil(t, e) { + if assert.NoError(t, e) { if res == nil { break } @@ -3217,19 +3217,19 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) { } tm1b, err := ss.Team().GetMember(tm1.TeamId, tm1.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "", tm1b.ExplicitRoles) assert.True(t, tm1b.SchemeUser) assert.True(t, tm1b.SchemeAdmin) tm2b, err := ss.Team().GetMember(tm2.TeamId, tm2.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "", tm2b.ExplicitRoles) assert.True(t, tm2b.SchemeUser) assert.False(t, tm2b.SchemeAdmin) tm3b, err := ss.Team().GetMember(tm3.TeamId, tm3.UserId) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "something_else", tm3b.ExplicitRoles) assert.False(t, tm3b.SchemeUser) assert.False(t, tm3b.SchemeAdmin) @@ -3243,7 +3243,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } s1, err := ss.Scheme().Save(s1) - require.Nil(t, err) + require.NoError(t, err) t1 := &model.Team{ Name: "zz" + model.NewId(), @@ -3262,21 +3262,21 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) { } t1, err = ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) t2, err = ss.Team().Save(t2) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, s1.Id, *t1.SchemeId) assert.Equal(t, s1.Id, *t2.SchemeId) res := ss.Team().ResetAllTeamSchemes() - assert.Nil(t, res) + assert.NoError(t, res) t1, err = ss.Team().Get(t1.Id) - require.Nil(t, err) + require.NoError(t, err) t2, err = ss.Team().Get(t2.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "", *t1.SchemeId) assert.Equal(t, "", *t2.SchemeId) @@ -3305,24 +3305,24 @@ func testTeamStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) { } _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2, m3, m4}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) - require.Nil(t, (ss.Team().ClearAllCustomRoleAssignments())) + require.NoError(t, (ss.Team().ClearAllCustomRoleAssignments())) r1, err := ss.Team().GetMember(m1.TeamId, m1.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, m1.ExplicitRoles, r1.Roles) r2, err := ss.Team().GetMember(m2.TeamId, m2.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "team_user team_admin", r2.Roles) r3, err := ss.Team().GetMember(m3.TeamId, m3.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, m3.ExplicitRoles, r3.Roles) r4, err := ss.Team().GetMember(m4.TeamId, m4.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, "", r4.Roles) } @@ -3334,10 +3334,10 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { Scope: model.SCHEME_SCOPE_TEAM, } s1, err := ss.Scheme().Save(s1) - require.Nil(t, err) + require.NoError(t, err) count1, err := ss.Team().AnalyticsGetTeamCountForScheme(s1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, int64(0), count1) t1 := &model.Team{ @@ -3348,10 +3348,10 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { SchemeId: &s1.Id, } _, err = ss.Team().Save(t1) - require.Nil(t, err) + require.NoError(t, err) count2, err := ss.Team().AnalyticsGetTeamCountForScheme(s1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, int64(1), count2) t2 := &model.Team{ @@ -3362,10 +3362,10 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { SchemeId: &s1.Id, } _, err = ss.Team().Save(t2) - require.Nil(t, err) + require.NoError(t, err) count3, err := ss.Team().AnalyticsGetTeamCountForScheme(s1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, int64(2), count3) t3 := &model.Team{ @@ -3375,10 +3375,10 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { Type: model.TEAM_OPEN, } _, err = ss.Team().Save(t3) - require.Nil(t, err) + require.NoError(t, err) count4, err := ss.Team().AnalyticsGetTeamCountForScheme(s1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, int64(2), count4) t4 := &model.Team{ @@ -3390,10 +3390,10 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) { DeleteAt: model.GetMillis(), } _, err = ss.Team().Save(t4) - require.Nil(t, err) + require.NoError(t, err) count5, err := ss.Team().AnalyticsGetTeamCountForScheme(s1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, int64(2), count5) } @@ -3404,10 +3404,10 @@ func testTeamStoreGetAllForExportAfter(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) d1, err := ss.Team().GetAllForExportAfter(10000, strings.Repeat("0", 26)) - assert.Nil(t, err) + assert.NoError(t, err) found := false for _, team := range d1 { @@ -3428,27 +3428,27 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) { t1.Email = MakeEmail() t1.Type = model.TEAM_OPEN _, err := ss.Team().Save(&t1) - require.Nil(t, err) + require.NoError(t, err) u1 := model.User{} u1.Email = MakeEmail() u1.Nickname = model.NewId() _, err = ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) u2 := model.User{} u2.Email = MakeEmail() u2.Nickname = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err) + require.NoError(t, err) m1 := &model.TeamMember{TeamId: t1.Id, UserId: u1.Id} m2 := &model.TeamMember{TeamId: t1.Id, UserId: u2.Id} _, nErr := ss.Team().SaveMultipleMembers([]*model.TeamMember{m1, m2}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) d1, err := ss.Team().GetTeamMembersForExport(u1.Id) - assert.Nil(t, err) + assert.NoError(t, err) assert.Len(t, d1, 1) @@ -3466,7 +3466,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) { Type: model.TEAM_INVITE, GroupConstrained: model.NewBool(true), }) - require.Nil(t, err) + require.NoError(t, err) require.True(t, team1.IsGroupConstrained()) defer ss.Team().PermanentDelete(team1.Id) @@ -3476,20 +3476,20 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) { Email: MakeEmail(), Type: model.TEAM_INVITE, }) - require.Nil(t, err) + require.NoError(t, err) require.False(t, team2.IsGroupConstrained()) defer ss.Team().PermanentDelete(team2.Id) count, err := ss.Team().GroupSyncedTeamCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, count, int64(1)) team2.GroupConstrained = model.NewBool(true) team2, err = ss.Team().Update(team2) - require.Nil(t, err) + require.NoError(t, err) require.True(t, team2.IsGroupConstrained()) countAfter, err := ss.Team().GroupSyncedTeamCount() - require.Nil(t, err) + require.NoError(t, err) require.GreaterOrEqual(t, countAfter, count+1) } diff --git a/store/storetest/terms_of_service_store.go b/store/storetest/terms_of_service_store.go index eba076c202..75908d06ca 100644 --- a/store/storetest/terms_of_service_store.go +++ b/store/storetest/terms_of_service_store.go @@ -36,12 +36,12 @@ func testSaveTermsOfService(t *testing.T, ss store.Store) { u1.Username = model.NewId() u1.Email = MakeEmail() u1.Nickname = model.NewId() - _, appErr := ss.User().Save(&u1) - require.Nil(t, appErr) + _, err := ss.User().Save(&u1) + require.NoError(t, err) termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id} savedTermsOfService, err := ss.TermsOfService().Save(termsOfService) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, savedTermsOfService.Id, 26, "Id should have been populated") @@ -55,15 +55,15 @@ func testGetLatestTermsOfService(t *testing.T, ss store.Store) { u1.Username = model.NewId() u1.Email = MakeEmail() u1.Nickname = model.NewId() - _, appErr := ss.User().Save(&u1) - require.Nil(t, appErr) + _, err := ss.User().Save(&u1) + require.NoError(t, err) termsOfService := &model.TermsOfService{Text: "terms of service 2", UserId: u1.Id} - _, err := ss.TermsOfService().Save(termsOfService) - require.Nil(t, err) + _, err = ss.TermsOfService().Save(termsOfService) + require.NoError(t, err) fetchedTermsOfService, err := ss.TermsOfService().GetLatest(true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, termsOfService.Text, fetchedTermsOfService.Text) assert.Equal(t, termsOfService.UserId, fetchedTermsOfService.UserId) } @@ -75,18 +75,18 @@ func testGetTermsOfService(t *testing.T, ss store.Store) { u1.Username = model.NewId() u1.Email = MakeEmail() u1.Nickname = model.NewId() - _, appErr := ss.User().Save(&u1) - require.Nil(t, appErr) + _, err := ss.User().Save(&u1) + require.NoError(t, err) termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id} - _, err := ss.TermsOfService().Save(termsOfService) - require.Nil(t, err) + _, err = ss.TermsOfService().Save(termsOfService) + require.NoError(t, err) r1, err := ss.TermsOfService().Get("an_invalid_id", true) - assert.NotNil(t, err) + assert.Error(t, err) assert.Nil(t, r1) receivedTermsOfService, err := ss.TermsOfService().Get(termsOfService.Id, true) - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "terms of service", receivedTermsOfService.Text) } diff --git a/store/storetest/thread_store.go b/store/storetest/thread_store.go index f99a2d058d..11774bfb40 100644 --- a/store/storetest/thread_store.go +++ b/store/storetest/thread_store.go @@ -27,7 +27,7 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { } u, err := ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) c, err2 := ss.Channel().Save(&model.Channel{ DisplayName: model.NewId(), @@ -73,7 +73,7 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { o1 := olist.Posts[olist.Order[0]] newPosts = append([]*model.Post{o1}, newPosts...) - require.Nil(t, err3, "couldn't save item") + require.NoError(t, err3, "couldn't save item") require.Equal(t, -1, errIdx) require.Len(t, newPosts, 4) require.Equal(t, int64(2), newPosts[0].ReplyCount) @@ -86,7 +86,7 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { t.Run("Save replies creates a thread", func(t *testing.T) { newPosts := makeSomePosts() thread, err := ss.Thread().Get(newPosts[0].Id) - require.Nil(t, err, "couldn't get thread") + require.NoError(t, err, "couldn't get thread") require.NotNil(t, thread) require.Equal(t, int64(2), thread.ReplyCount) require.ElementsMatch(t, model.StringArray{newPosts[0].UserId, newPosts[1].UserId}, thread.Participants) @@ -98,10 +98,10 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { o5.Message = "zz" + model.NewId() + "b" _, _, err = ss.Post().SaveMultiple([]*model.Post{&o5}) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") thread, err = ss.Thread().Get(newPosts[0].Id) - require.Nil(t, err, "couldn't get thread") + require.NoError(t, err, "couldn't get thread") require.NotNil(t, thread) require.Equal(t, int64(3), thread.ReplyCount) require.ElementsMatch(t, model.StringArray{newPosts[0].UserId, newPosts[1].UserId, o5.UserId}, thread.Participants) @@ -110,16 +110,16 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { t.Run("Delete a reply updates count on a thread", func(t *testing.T) { newPosts := makeSomePosts() thread, err := ss.Thread().Get(newPosts[0].Id) - require.Nil(t, err, "couldn't get thread") + require.NoError(t, err, "couldn't get thread") require.NotNil(t, thread) require.Equal(t, int64(2), thread.ReplyCount) require.ElementsMatch(t, model.StringArray{newPosts[0].UserId, newPosts[1].UserId}, thread.Participants) err = ss.Post().Delete(newPosts[1].Id, 1234, model.NewId()) - require.Nil(t, err, "couldn't delete post") + require.NoError(t, err, "couldn't delete post") thread, err = ss.Thread().Get(newPosts[0].Id) - require.Nil(t, err, "couldn't get thread") + require.NoError(t, err, "couldn't get thread") require.NotNil(t, thread) require.Equal(t, int64(1), thread.ReplyCount) require.ElementsMatch(t, model.StringArray{newPosts[0].UserId, newPosts[1].UserId}, thread.Participants) @@ -139,13 +139,13 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { replyPost.RootId = rootPost.RootId newPosts, _, err := ss.Post().SaveMultiple([]*model.Post{&rootPost, &replyPost}) - require.Nil(t, err) + require.NoError(t, err) thread1, err := ss.Thread().Get(newPosts[0].RootId) - require.Nil(t, err) + require.NoError(t, err) rrootPost, err := ss.Post().GetSingle(rootPost.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, rrootPost.UpdateAt, rootPost.UpdateAt) replyPost2 := model.Post{} @@ -161,14 +161,14 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { replyPost3.RootId = rootPost.Id _, _, err = ss.Post().SaveMultiple([]*model.Post{&replyPost2, &replyPost3}) - require.Nil(t, err) + require.NoError(t, err) rrootPost2, err := ss.Post().GetSingle(rootPost.Id) - require.Nil(t, err) + require.NoError(t, err) require.Greater(t, rrootPost2.UpdateAt, rrootPost.UpdateAt) thread2, err := ss.Thread().Get(rootPost.Id) - require.Nil(t, err) + require.NoError(t, err) require.Greater(t, thread2.LastReplyAt, thread1.LastReplyAt) }) @@ -186,18 +186,18 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { replyPost.RootId = rootPost.RootId newPosts, _, err := ss.Post().SaveMultiple([]*model.Post{&rootPost, &replyPost}) - require.Nil(t, err) + require.NoError(t, err) thread1, err := ss.Thread().Get(newPosts[0].RootId) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, thread1.ReplyCount, 2) require.Len(t, thread1.Participants, 2) err = ss.Post().Delete(replyPost.Id, 123, model.NewId()) - require.Nil(t, err) + require.NoError(t, err) thread2, err := ss.Thread().Get(rootPost.RootId) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, thread2.ReplyCount, 1) require.Len(t, thread2.Participants, 2) }) @@ -209,7 +209,7 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { rootPost.Message = "zz" + model.NewId() + "b" newPosts1, _, err := ss.Post().SaveMultiple([]*model.Post{&rootPost}) - require.Nil(t, err) + require.NoError(t, err) replyPost := model.Post{} replyPost.ChannelId = rootPost.ChannelId @@ -218,15 +218,15 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { replyPost.RootId = newPosts1[0].Id _, _, err = ss.Post().SaveMultiple([]*model.Post{&replyPost}) - require.Nil(t, err) + require.NoError(t, err) thread1, err := ss.Thread().Get(newPosts1[0].Id) - require.Nil(t, err) + require.NoError(t, err) require.EqualValues(t, thread1.ReplyCount, 1) require.Len(t, thread1.Participants, 2) err = ss.Post().PermanentDeleteByUser(rootPost.UserId) - require.Nil(t, err) + require.NoError(t, err) thread2, _ := ss.Thread().Get(rootPost.Id) require.Nil(t, thread2) @@ -235,19 +235,19 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { t.Run("Thread last updated is changed when channel is updated after UpdateLastViewedAtPost", func(t *testing.T) { newPosts := makeSomePosts() - require.Nil(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) + require.NoError(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) m, err1 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err1) + require.NoError(t, err1) m.LastUpdated -= 1000 _, err := ss.Thread().UpdateMembership(m) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().UpdateLastViewedAtPost(newPosts[0], newPosts[0].UserId, 0, true) - require.Nil(t, err) + require.NoError(t, err) assert.Eventually(t, func() bool { m2, err2 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err2) + require.NoError(t, err2) return m2.LastUpdated > m.LastUpdated }, time.Second, 10*time.Millisecond) }) @@ -255,19 +255,19 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { t.Run("Thread last updated is changed when channel is updated after IncrementMentionCount", func(t *testing.T) { newPosts := makeSomePosts() - require.Nil(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) + require.NoError(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) m, err1 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err1) + require.NoError(t, err1) m.LastUpdated -= 1000 _, err := ss.Thread().UpdateMembership(m) - require.Nil(t, err) + require.NoError(t, err) err = ss.Channel().IncrementMentionCount(newPosts[0].ChannelId, newPosts[0].UserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Eventually(t, func() bool { m2, err2 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err2) + require.NoError(t, err2) return m2.LastUpdated > m.LastUpdated }, time.Second, 10*time.Millisecond) }) @@ -275,19 +275,19 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { t.Run("Thread last updated is changed when channel is updated after UpdateLastViewedAt", func(t *testing.T) { newPosts := makeSomePosts() - require.Nil(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) + require.NoError(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) m, err1 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err1) + require.NoError(t, err1) m.LastUpdated -= 1000 _, err := ss.Thread().UpdateMembership(m) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().UpdateLastViewedAt([]string{newPosts[0].ChannelId}, newPosts[0].UserId, true) - require.Nil(t, err) + require.NoError(t, err) assert.Eventually(t, func() bool { m2, err2 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err2) + require.NoError(t, err2) return m2.LastUpdated > m.LastUpdated }, time.Second, 10*time.Millisecond) }) @@ -295,19 +295,19 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) { t.Run("Thread last updated is changed when channel is updated after UpdateLastViewedAtPost for mark unread", func(t *testing.T) { newPosts := makeSomePosts() - require.Nil(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) + require.NoError(t, ss.Thread().CreateMembershipIfNeeded(newPosts[0].UserId, newPosts[0].Id, true, false, true)) m, err1 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err1) + require.NoError(t, err1) m.LastUpdated += 1000 _, err := ss.Thread().UpdateMembership(m) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().UpdateLastViewedAtPost(newPosts[0], newPosts[0].UserId, 0, true) - require.Nil(t, err) + require.NoError(t, err) assert.Eventually(t, func() bool { m2, err2 := ss.Thread().GetMembershipForUser(newPosts[0].UserId, newPosts[0].Id) - require.Nil(t, err2) + require.NoError(t, err2) return m2.LastUpdated < m.LastUpdated }, time.Second, 10*time.Millisecond) }) diff --git a/store/storetest/user_access_token_store.go b/store/storetest/user_access_token_store.go index b57e5c7b6c..ef02c3af7c 100644 --- a/store/storetest/user_access_token_store.go +++ b/store/storetest/user_access_token_store.go @@ -30,57 +30,57 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) { s1.Token = uat.Token s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.UserAccessToken().Save(uat) - require.Nil(t, nErr) + require.NoError(t, nErr) result, terr := ss.UserAccessToken().Get(uat.Id) - require.Nil(t, terr) + require.NoError(t, terr) require.Equal(t, result.Token, uat.Token, "received incorrect token after save") received, err2 := ss.UserAccessToken().GetByToken(uat.Token) - require.Nil(t, err2) + require.NoError(t, err2) require.Equal(t, received.Token, uat.Token, "received incorrect token after save") _, nErr = ss.UserAccessToken().GetByToken("notarealtoken") - require.NotNil(t, nErr, "should have failed on bad token") + require.Error(t, nErr, "should have failed on bad token") received2, err2 := ss.UserAccessToken().GetByUser(uat.UserId, 0, 100) - require.Nil(t, err2) + require.NoError(t, err2) require.Equal(t, 1, len(received2), "received incorrect number of tokens after save") - result2, appError := ss.UserAccessToken().GetAll(0, 100) - require.Nil(t, appError) + result2, err := ss.UserAccessToken().GetAll(0, 100) + require.NoError(t, err) require.Equal(t, 1, len(result2), "received incorrect number of tokens after save") nErr = ss.UserAccessToken().Delete(uat.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Session().Get(s1.Token) - require.NotNil(t, err, "should error - session should be deleted") + require.Error(t, err, "should error - session should be deleted") _, nErr = ss.UserAccessToken().GetByToken(s1.Token) - require.NotNil(t, nErr, "should error - access token should be deleted") + require.Error(t, nErr, "should error - access token should be deleted") s2 := &model.Session{} s2.UserId = uat.UserId s2.Token = uat.Token s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.UserAccessToken().Save(uat) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.UserAccessToken().DeleteAllForUser(uat.UserId) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Session().Get(s2.Token) - require.NotNil(t, err, "should error - session should be deleted") + require.Error(t, err, "should error - session should be deleted") _, nErr = ss.UserAccessToken().GetByToken(s2.Token) - require.NotNil(t, nErr, "should error - access token should be deleted") + require.Error(t, nErr, "should error - access token should be deleted") } func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) { @@ -95,26 +95,26 @@ func testUserAccessTokenDisableEnable(t *testing.T, ss store.Store) { s1.Token = uat.Token s1, err := ss.Session().Save(s1) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.UserAccessToken().Save(uat) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.UserAccessToken().UpdateTokenDisable(uat.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Session().Get(s1.Token) - require.NotNil(t, err, "should error - session should be deleted") + require.Error(t, err, "should error - session should be deleted") s2 := &model.Session{} s2.UserId = uat.UserId s2.Token = uat.Token s2, err = ss.Session().Save(s2) - require.Nil(t, err) + require.NoError(t, err) nErr = ss.UserAccessToken().UpdateTokenEnable(uat.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) } func testUserAccessTokenSearch(t *testing.T, ss store.Store) { @@ -123,7 +123,7 @@ func testUserAccessTokenSearch(t *testing.T, ss store.Store) { u1.Username = model.NewId() _, err := ss.User().Save(&u1) - require.Nil(t, err) + require.NoError(t, err) uat := &model.UserAccessToken{ Token: model.NewId(), @@ -136,21 +136,21 @@ func testUserAccessTokenSearch(t *testing.T, ss store.Store) { s1.Token = uat.Token s1, nErr := ss.Session().Save(s1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.UserAccessToken().Save(uat) - require.Nil(t, nErr) + require.NoError(t, nErr) received, nErr := ss.UserAccessToken().Search(uat.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, 1, len(received), "received incorrect number of tokens after search") received, nErr = ss.UserAccessToken().Search(uat.UserId) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, 1, len(received), "received incorrect number of tokens after search") received, nErr = ss.UserAccessToken().Search(u1.Username) - require.Nil(t, nErr) + require.NoError(t, nErr) require.Equal(t, 1, len(received), "received incorrect number of tokens after search") } diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index ecc6581421..59f6ff6e77 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -23,16 +23,16 @@ const ( func cleanupStatusStore(t *testing.T, s SqlStore) { _, execerr := s.GetMaster().ExecNoTimeout(` DELETE FROM Status `) - require.Nil(t, execerr) + require.NoError(t, execerr) } func TestUserStore(t *testing.T, ss store.Store, s SqlStore) { users, err := ss.User().GetAll() - require.Nil(t, err, "failed cleaning up test users") + require.NoError(t, err, "failed cleaning up test users") for _, u := range users { err := ss.User().PermanentDelete(u.Id) - require.Nil(t, err, "failed cleaning up test user %s", u.Username) + require.NoError(t, err, "failed cleaning up test user %s", u.Username) } t.Run("Count", func(t *testing.T) { testCount(t, ss) }) @@ -100,31 +100,31 @@ func testUserStoreSave(t *testing.T, ss store.Store) { } _, err := ss.User().Save(&u1) - require.Nil(t, err, "couldn't save user") + require.NoError(t, err, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.User().Save(&u1) - require.NotNil(t, err, "shouldn't be able to update user from save") + require.Error(t, err, "shouldn't be able to update user from save") u2 := model.User{ Email: u1.Email, Username: model.NewId(), } _, err = ss.User().Save(&u2) - require.NotNil(t, err, "should be unique email") + require.Error(t, err, "should be unique email") u2.Email = MakeEmail() u2.Username = u1.Username _, err = ss.User().Save(&u1) - require.NotNil(t, err, "should be unique username") + require.Error(t, err, "should be unique username") u2.Username = "" _, err = ss.User().Save(&u1) - require.NotNil(t, err, "should be unique username") + require.Error(t, err, "should be unique username") for i := 0; i < 49; i++ { u := model.User{ @@ -132,24 +132,24 @@ func testUserStoreSave(t *testing.T, ss store.Store) { Username: model.NewId(), } _, err = ss.User().Save(&u) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") - defer func() { require.Nil(t, ss.User().PermanentDelete(u.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u.Id}, maxUsersPerTeam) - require.Nil(t, nErr) + require.NoError(t, nErr) } u2.Id = "" u2.Email = MakeEmail() u2.Username = model.NewId() _, err = ss.User().Save(&u2) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, maxUsersPerTeam) - require.NotNil(t, nErr, "should be the limit") + require.Error(t, nErr, "should be the limit") } func testUserStoreUpdate(t *testing.T, ss store.Store) { @@ -157,37 +157,37 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) { Email: MakeEmail(), } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{ Email: MakeEmail(), AuthService: "ldap", } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.User().Update(u1, false) - require.Nil(t, err) + require.NoError(t, err) missing := &model.User{} _, err = ss.User().Update(missing, false) - require.NotNil(t, err, "Update should have failed because of missing key") + require.Error(t, err, "Update should have failed because of missing key") newId := &model.User{ Id: model.NewId(), } _, err = ss.User().Update(newId, false) - require.NotNil(t, err, "Update should have failed because id change") + require.Error(t, err, "Update should have failed because id change") u2.Email = MakeEmail() _, err = ss.User().Update(u2, false) - require.NotNil(t, err, "Update should have failed because you can't modify AD/LDAP fields") + require.Error(t, err, "Update should have failed because you can't modify AD/LDAP fields") u3 := &model.User{ Email: MakeEmail(), @@ -195,39 +195,39 @@ func testUserStoreUpdate(t *testing.T, ss store.Store) { } oldEmail := u3.Email _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.Email = MakeEmail() userUpdate, err := ss.User().Update(u3, false) - require.Nil(t, err, "Update should not have failed") + require.NoError(t, err, "Update should not have failed") assert.Equal(t, oldEmail, userUpdate.New.Email, "Email should not have been updated as the update is not trusted") u3.Email = MakeEmail() userUpdate, err = ss.User().Update(u3, true) - require.Nil(t, err, "Update should not have failed") + require.NoError(t, err, "Update should not have failed") assert.NotEqual(t, oldEmail, userUpdate.New.Email, "Email should have been updated as the update is trusted") err = ss.User().UpdateLastPictureUpdate(u1.Id) - require.Nil(t, err, "Update should not have failed") + require.NoError(t, err, "Update should not have failed") } func testUserStoreUpdateUpdateAt(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.User().UpdateUpdateAt(u1.Id) - require.Nil(t, err) + require.NoError(t, err) user, err := ss.User().Get(u1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Less(t, u1.UpdateAt, user.UpdateAt, "UpdateAt not updated correctly") } @@ -235,16 +235,16 @@ func testUserStoreUpdateFailedPasswordAttempts(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().UpdateFailedPasswordAttempts(u1.Id, 3) - require.Nil(t, err) + require.NoError(t, err) user, err := ss.User().Get(u1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 3, user.FailedAttempts, "FailedAttempts not updated correctly") } @@ -253,8 +253,8 @@ func testUserStoreGet(t *testing.T, ss store.Store) { Email: MakeEmail(), } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2, _ := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -266,30 +266,30 @@ func testUserStoreGet(t *testing.T, ss store.Store) { Description: "bot description", OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u2.IsBot = true u2.BotDescription = "bot description" - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u2.Id)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u2.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("fetch empty id", func(t *testing.T) { _, err := ss.User().Get("") - require.NotNil(t, err) + require.Error(t, err) }) t.Run("fetch user 1", func(t *testing.T) { actual, err := ss.User().Get(u1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, u1, actual) require.False(t, actual.IsBot) }) t.Run("fetch user 2, also a bot", func(t *testing.T) { actual, err := ss.User().Get(u2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, u2, actual) require.True(t, actual.IsBot) require.Equal(t, "bot description", actual.BotDescription) @@ -304,55 +304,55 @@ func testGetAllUsingAuthService(t *testing.T, ss store.Store) { Username: "u1" + model.NewId(), AuthService: "service", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), AuthService: "service", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), AuthService: "service2", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() t.Run("get by unknown auth service", func(t *testing.T) { users, err := ss.User().GetAllUsingAuthService("unknown") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{}, users) }) t.Run("get by auth service", func(t *testing.T) { users, err := ss.User().GetAllUsingAuthService("service") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1, u2}, users) }) t.Run("get by other auth service", func(t *testing.T) { users, err := ss.User().GetAllUsingAuthService("service2") - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u3}, users) }) } @@ -370,47 +370,47 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { Username: "u1" + model.NewId(), Roles: model.SYSTEM_USER_ROLE_ID, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), Roles: model.SYSTEM_USER_ROLE_ID, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) _, nErr := ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), Roles: "system_user some-other-role", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() u5, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u5" + model.NewId(), Roles: "system_admin", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u5.Id)) }() u6, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -418,8 +418,8 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { DeleteAt: model.GetMillis(), Roles: "system_admin", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u6.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u6.Id)) }() u7, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -427,13 +427,13 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { DeleteAt: model.GetMillis(), Roles: model.SYSTEM_USER_ROLE_ID, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u7.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u7.Id)) }() t.Run("get offset 0, limit 100", func(t *testing.T) { options := &model.UserGetOptions{Page: 0, PerPage: 100} actual, userErr := ss.User().GetAllProfiles(options) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u1), @@ -451,7 +451,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { Page: 0, PerPage: 1, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u1), }, actual) @@ -459,7 +459,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { t.Run("get all", func(t *testing.T) { actual, userErr := ss.User().GetAll() - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ u1, @@ -478,8 +478,8 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { uNew := &model.User{} uNew.Email = MakeEmail() _, userErr := ss.User().Save(uNew) - require.Nil(t, userErr) - defer func() { require.Nil(t, ss.User().PermanentDelete(uNew.Id)) }() + require.NoError(t, userErr) + defer func() { require.NoError(t, ss.User().PermanentDelete(uNew.Id)) }() updatedEtag := ss.User().GetEtagForAllProfiles() require.NotEqual(t, etag, updatedEtag) @@ -491,7 +491,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { PerPage: 10, Role: "system_admin", }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u5), sanitized(u6), @@ -505,7 +505,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { Role: "system_admin", Inactive: true, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u6), }, actual) @@ -517,7 +517,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { PerPage: 10, Inactive: true, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u6), sanitized(u7), @@ -530,7 +530,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { PerPage: 10, Active: true, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -547,7 +547,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { Inactive: true, Active: true, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u6), sanitized(u7), @@ -560,8 +560,8 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { DeleteAt: model.GetMillis(), Roles: "system_user_manager system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u8.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u8.Id)) }() u9, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -569,8 +569,8 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { DeleteAt: model.GetMillis(), Roles: "system_manager system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u9.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u9.Id)) }() u10, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -578,8 +578,8 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { DeleteAt: model.GetMillis(), Roles: "system_read_only_admin system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u10.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u10.Id)) }() t.Run("filter by system_user_manager role", func(t *testing.T) { actual, userErr := ss.User().GetAllProfiles(&model.UserGetOptions{ @@ -587,7 +587,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { PerPage: 10, Roles: []string{"system_user_manager"}, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u8), }, actual) @@ -599,7 +599,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { PerPage: 10, Roles: []string{"system_manager", "system_user_manager", "system_read_only_admin", "system_admin"}, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u10), sanitized(u5), @@ -615,7 +615,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) { PerPage: 10, Roles: []string{"system_user"}, }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -631,56 +631,56 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), Roles: "system_admin", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u5, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u5" + model.NewId(), DeleteAt: model.GetMillis(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u5.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u5.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("get page 0, perPage 100", func(t *testing.T) { actual, err := ss.User().GetProfiles(&model.UserGetOptions{ @@ -688,7 +688,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { Page: 0, PerPage: 100, }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{ sanitized(u1), @@ -705,7 +705,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { Page: 0, PerPage: 1, }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{sanitized(u1)}, actual) }) @@ -716,7 +716,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { Page: 0, PerPage: 100, }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{}, actual) }) @@ -727,10 +727,10 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { uNew := &model.User{} uNew.Email = MakeEmail() _, err := ss.User().Save(uNew) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(uNew.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(uNew.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: uNew.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) updatedEtag := ss.User().GetEtagForProfiles(teamId) require.NotEqual(t, etag, updatedEtag) @@ -743,7 +743,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { PerPage: 10, Role: "system_admin", }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{ sanitized(u4), }, actual) @@ -756,7 +756,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { PerPage: 10, Inactive: true, }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{ sanitized(u5), }, actual) @@ -769,7 +769,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { PerPage: 10, Active: true, }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -786,7 +786,7 @@ func testUserStoreGetProfiles(t *testing.T, ss store.Store) { Inactive: true, Active: true, }) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, []*model.User{ sanitized(u5), }, actual) @@ -800,45 +800,45 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch1 := &model.Channel{ TeamId: teamId, @@ -847,7 +847,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := &model.Channel{ TeamId: teamId, @@ -856,46 +856,46 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } c2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u4.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) u4.DeleteAt = 1 _, err = ss.User().Update(u4, true) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("get all users in channel 1, offset 0, limit 100", func(t *testing.T) { users, err := ss.User().GetProfilesInChannel(&model.UserGetOptions{ @@ -903,7 +903,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { Page: 0, PerPage: 100, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u1), sanitized(u2), sanitized(u3), sanitized(u4)}, users) }) @@ -914,7 +914,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { PerPage: 100, Active: true, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u1), sanitized(u2), sanitized(u3)}, users) }) @@ -925,7 +925,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { PerPage: 100, Inactive: true, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u4)}, users) }) @@ -935,13 +935,13 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { Page: 1, PerPage: 1, }) - require.Nil(t, err) + require.NoError(t, err) users_p2, err2 := ss.User().GetProfilesInChannel(&model.UserGetOptions{ InChannelId: c1.Id, Page: 2, PerPage: 1, }) - require.Nil(t, err2) + require.NoError(t, err2) users = append(users, users_p2...) assert.Equal(t, []*model.User{sanitized(u2), sanitized(u3)}, users) }) @@ -952,7 +952,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) { Page: 0, PerPage: 1, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u1)}, users) }) } @@ -967,45 +967,45 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch1 := &model.Channel{ TeamId: teamId, @@ -1014,7 +1014,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := &model.Channel{ TeamId: teamId, @@ -1023,55 +1023,55 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S Type: model.CHANNEL_PRIVATE, } c2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u4.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) u4.DeleteAt = 1 _, err = ss.User().Update(u4, true) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{ + require.NoError(t, nErr) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{ UserId: u1.Id, Status: model.STATUS_DND, })) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{ + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{ UserId: u2.Id, Status: model.STATUS_AWAY, })) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{ + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{ UserId: u3.Id, Status: model.STATUS_ONLINE, })) @@ -1082,7 +1082,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S Page: 0, PerPage: 100, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u1), sanitized(u2), sanitized(u3), sanitized(u4)}, users) }) @@ -1093,7 +1093,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S PerPage: 100, Active: true, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u3), sanitized(u2), sanitized(u1)}, users) }) @@ -1104,7 +1104,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S PerPage: 100, Inactive: true, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u4)}, users) }) @@ -1114,7 +1114,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S Page: 0, PerPage: 1, }) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u1)}, users) }) } @@ -1126,17 +1126,17 @@ func testUserStoreGetProfilesWithoutTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1144,44 +1144,44 @@ func testUserStoreGetProfilesWithoutTeam(t *testing.T, ss store.Store) { DeleteAt: 1, Roles: "system_admin", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("get, page 0, per_page 100", func(t *testing.T) { users, err := ss.User().GetProfilesWithoutTeam(&model.UserGetOptions{Page: 0, PerPage: 100}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u2), sanitized(u3)}, users) }) t.Run("get, page 1, per_page 1", func(t *testing.T) { users, err := ss.User().GetProfilesWithoutTeam(&model.UserGetOptions{Page: 1, PerPage: 1}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u3)}, users) }) t.Run("get, page 2, per_page 1", func(t *testing.T) { users, err := ss.User().GetProfilesWithoutTeam(&model.UserGetOptions{Page: 2, PerPage: 1}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{}, users) }) t.Run("get, page 0, per_page 100, inactive", func(t *testing.T) { users, err := ss.User().GetProfilesWithoutTeam(&model.UserGetOptions{Page: 0, PerPage: 100, Inactive: true}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u3)}, users) }) t.Run("get, page 0, per_page 100, role", func(t *testing.T) { users, err := ss.User().GetProfilesWithoutTeam(&model.UserGetOptions{Page: 0, PerPage: 100, Role: "system_admin"}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{sanitized(u3)}, users) }) } @@ -1193,36 +1193,36 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() ch1 := &model.Channel{ TeamId: teamId, @@ -1231,7 +1231,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := &model.Channel{ TeamId: teamId, @@ -1240,40 +1240,40 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } c2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("all profiles in channel 1, no caching", func(t *testing.T) { var profiles map[string]*model.User profiles, err = ss.User().GetAllProfilesInChannel(c1.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, map[string]*model.User{ u1.Id: sanitized(u1), u2.Id: sanitized(u2), @@ -1284,7 +1284,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { t.Run("all profiles in channel 2, no caching", func(t *testing.T) { var profiles map[string]*model.User profiles, err = ss.User().GetAllProfilesInChannel(c2.Id, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, map[string]*model.User{ u1.Id: sanitized(u1), }, profiles) @@ -1293,7 +1293,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { t.Run("all profiles in channel 2, caching", func(t *testing.T) { var profiles map[string]*model.User profiles, err = ss.User().GetAllProfilesInChannel(c2.Id, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, map[string]*model.User{ u1.Id: sanitized(u1), }, profiles) @@ -1302,7 +1302,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) { t.Run("all profiles in channel 2, caching [repeated]", func(t *testing.T) { var profiles map[string]*model.User profiles, err = ss.User().GetAllProfilesInChannel(c2.Id, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, map[string]*model.User{ u1.Id: sanitized(u1), }, profiles) @@ -1319,36 +1319,36 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() ch1 := &model.Channel{ TeamId: teamId, @@ -1357,7 +1357,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := &model.Channel{ TeamId: teamId, @@ -1366,12 +1366,12 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } c2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("get team 1, channel 1, offset 0, limit 100", func(t *testing.T) { var profiles []*model.User profiles, err = ss.User().GetProfilesNotInChannel(teamId, c1.Id, false, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -1382,7 +1382,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { t.Run("get team 1, channel 2, offset 0, limit 100", func(t *testing.T) { var profiles []*model.User profiles, err = ss.User().GetProfilesNotInChannel(teamId, c2.Id, false, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -1395,40 +1395,40 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("get team 1, channel 1, offset 0, limit 100, after update", func(t *testing.T) { var profiles []*model.User profiles, err = ss.User().GetProfilesNotInChannel(teamId, c1.Id, false, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{}, profiles) }) t.Run("get team 1, channel 2, offset 0, limit 100, after update", func(t *testing.T) { var profiles []*model.User profiles, err = ss.User().GetProfilesNotInChannel(teamId, c2.Id, false, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u2), sanitized(u3), @@ -1438,7 +1438,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { t.Run("get team 1, channel 2, offset 0, limit 0, setting group constrained when it's not", func(t *testing.T) { var profiles []*model.User profiles, err = ss.User().GetProfilesNotInChannel(teamId, c2.Id, true, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, profiles) }) @@ -1449,12 +1449,12 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: "ri_" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) // add two members to the group for _, u := range []*model.User{u1, u2} { _, err = ss.Group().UpsertMember(group.Id, u.Id) - require.Nil(t, err) + require.NoError(t, err) } // associate the group with the channel @@ -1463,11 +1463,11 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) { SyncableId: c2.Id, Type: model.GroupSyncableTypeChannel, }) - require.Nil(t, err) + require.NoError(t, err) t.Run("get team 1, channel 2, offset 0, limit 0, setting group constrained", func(t *testing.T) { profiles, err := ss.User().GetProfilesNotInChannel(teamId, c2.Id, true, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u2), }, profiles) @@ -1481,72 +1481,72 @@ func testUserStoreGetProfilesByIds(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) time.Sleep(time.Millisecond) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() t.Run("get u1 by id, no caching", func(t *testing.T) { users, err := ss.User().GetProfileByIds([]string{u1.Id}, nil, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1}, users) }) t.Run("get u1 by id, caching", func(t *testing.T) { users, err := ss.User().GetProfileByIds([]string{u1.Id}, nil, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1}, users) }) t.Run("get u1, u2, u3 by id, no caching", func(t *testing.T) { users, err := ss.User().GetProfileByIds([]string{u1.Id, u2.Id, u3.Id}, nil, false) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1, u2, u3}, users) }) t.Run("get u1, u2, u3 by id, caching", func(t *testing.T) { users, err := ss.User().GetProfileByIds([]string{u1.Id, u2.Id, u3.Id}, nil, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1, u2, u3}, users) }) t.Run("get unknown id, caching", func(t *testing.T) { users, err := ss.User().GetProfileByIds([]string{"123"}, nil, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{}, users) }) @@ -1554,7 +1554,7 @@ func testUserStoreGetProfilesByIds(t *testing.T, ss store.Store) { users, err := ss.User().GetProfileByIds([]string{u1.Id, u2.Id, u3.Id, u4.Id}, &store.UserGetByIdsOpts{ Since: u2.CreateAt, }, true) - require.Nil(t, err) + require.NoError(t, err) // u3 comes from the cache, and u4 does not assert.Equal(t, []*model.User{u3, u4}, users) @@ -1566,36 +1566,36 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() gc1, nErr := ss.Channel().Save(&model.Channel{ DisplayName: "Profiles in private", Name: "profiles-" + model.NewId(), Type: model.CHANNEL_GROUP, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, uId := range []string{u1.Id, u2.Id, u3.Id} { _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ @@ -1603,7 +1603,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor UserId: uId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) } gc2, nErr := ss.Channel().Save(&model.Channel{ @@ -1611,7 +1611,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor Name: "profiles-" + model.NewId(), Type: model.CHANNEL_GROUP, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) for _, uId := range []string{u1.Id, u3.Id, u4.Id} { _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ @@ -1619,7 +1619,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor UserId: uId, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) } testCases := []struct { @@ -1662,7 +1662,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { res, err := ss.User().GetProfileByGroupChannelIdsForUser(tc.UserId, tc.ChannelIds) - require.Nil(t, err) + require.NoError(t, err) for channelId, expectedUsers := range tc.ExpectedUserIdsByChannel { users, ok := res[channelId] @@ -1691,64 +1691,64 @@ func testUserStoreGetProfilesByUsernames(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: team2Id, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("get by u1 and u2 usernames, team id 1", func(t *testing.T) { users, err := ss.User().GetProfilesByUsernames([]string{u1.Username, u2.Username}, &model.ViewUsersRestrictions{Teams: []string{teamId}}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1, u2}, users) }) t.Run("get by u1 username, team id 1", func(t *testing.T) { users, err := ss.User().GetProfilesByUsernames([]string{u1.Username}, &model.ViewUsersRestrictions{Teams: []string{teamId}}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1}, users) }) t.Run("get by u1 and u3 usernames, no team id", func(t *testing.T) { users, err := ss.User().GetProfilesByUsernames([]string{u1.Username, u3.Username}, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1, u3}, users) }) t.Run("get by u1 and u3 usernames, team id 1", func(t *testing.T) { users, err := ss.User().GetProfilesByUsernames([]string{u1.Username, u3.Username}, &model.ViewUsersRestrictions{Teams: []string{teamId}}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u1}, users) }) t.Run("get by u1 and u3 usernames, team id 2", func(t *testing.T) { users, err := ss.User().GetProfilesByUsernames([]string{u1.Username, u3.Username}, &model.ViewUsersRestrictions{Teams: []string{team2Id}}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{u3}, users) }) } @@ -1761,41 +1761,41 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) { Roles: model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID, Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Roles: model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID, Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("all system admin profiles", func(t *testing.T) { result, userError := ss.User().GetSystemAdminProfiles() - require.Nil(t, userError) + require.NoError(t, userError) assert.Equal(t, map[string]*model.User{ u1.Id: sanitized(u1), u3.Id: sanitized(u3), @@ -1810,63 +1810,63 @@ func testUserStoreGetByEmail(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("get u1 by email", func(t *testing.T) { u, err := ss.User().GetByEmail(u1.Email) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, u) }) t.Run("get u2 by email", func(t *testing.T) { u, err := ss.User().GetByEmail(u2.Email) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u2, u) }) t.Run("get u3 by email", func(t *testing.T) { u, err := ss.User().GetByEmail(u3.Email) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u3, u) }) t.Run("get by empty email", func(t *testing.T) { _, err := ss.User().GetByEmail("") - require.NotNil(t, err) + require.Error(t, err) }) t.Run("get by unknown", func(t *testing.T) { _, err := ss.User().GetByEmail("unknown") - require.NotNil(t, err) + require.Error(t, err) }) } @@ -1881,19 +1881,19 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { AuthData: &auth1, AuthService: "service", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -1901,34 +1901,34 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { AuthData: &auth3, AuthService: "service2", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("get by u1 auth", func(t *testing.T) { u, err := ss.User().GetByAuth(u1.AuthData, u1.AuthService) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, u) }) t.Run("get by u3 auth", func(t *testing.T) { u, err := ss.User().GetByAuth(u3.AuthData, u3.AuthService) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u3, u) }) t.Run("get by u1 auth, unknown service", func(t *testing.T) { _, err := ss.User().GetByAuth(u1.AuthData, "unknown") - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) @@ -1936,7 +1936,7 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { t.Run("get by unknown auth, u1 service", func(t *testing.T) { unknownAuth := "" _, err := ss.User().GetByAuth(&unknownAuth, u1.AuthService) - require.NotNil(t, err) + require.Error(t, err) var invErr *store.ErrInvalidInput require.True(t, errors.As(err, &invErr)) }) @@ -1944,7 +1944,7 @@ func testUserStoreGetByAuthData(t *testing.T, ss store.Store) { t.Run("get by unknown auth, unknown service", func(t *testing.T) { unknownAuth := "" _, err := ss.User().GetByAuth(&unknownAuth, "unknown") - require.NotNil(t, err) + require.Error(t, err) var invErr *store.ErrInvalidInput require.True(t, errors.As(err, &invErr)) }) @@ -1957,65 +1957,65 @@ func testUserStoreGetByUsername(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("get u1 by username", func(t *testing.T) { result, err := ss.User().GetByUsername(u1.Username) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, result) }) t.Run("get u2 by username", func(t *testing.T) { result, err := ss.User().GetByUsername(u2.Username) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u2, result) }) t.Run("get u3 by username", func(t *testing.T) { result, err := ss.User().GetByUsername(u3.Username) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u3, result) }) t.Run("get by empty username", func(t *testing.T) { _, err := ss.User().GetByUsername("") - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) t.Run("get by unknown", func(t *testing.T) { _, err := ss.User().GetByUsername("unknown") - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr)) }) @@ -2034,10 +2034,10 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) { AuthData: &auth, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -2045,10 +2045,10 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) { AuthService: model.USER_AUTH_SERVICE_LDAP, AuthData: &auth2, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), @@ -2056,70 +2056,70 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) { AuthService: model.USER_AUTH_SERVICE_LDAP, AuthData: &auth3, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() t.Run("get u1 by username, allow both", func(t *testing.T) { user, err := ss.User().GetForLogin(u1.Username, true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, user) }) t.Run("get u1 by username, check for case issues", func(t *testing.T) { user, err := ss.User().GetForLogin(strings.ToUpper(u1.Username), true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, user) }) t.Run("get u1 by username, allow only email", func(t *testing.T) { _, err := ss.User().GetForLogin(u1.Username, false, true) - require.NotNil(t, err) + require.Error(t, err) require.Equal(t, "user not found", err.Error()) }) t.Run("get u1 by email, allow both", func(t *testing.T) { user, err := ss.User().GetForLogin(u1.Email, true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, user) }) t.Run("get u1 by email, check for case issues", func(t *testing.T) { user, err := ss.User().GetForLogin(strings.ToUpper(u1.Email), true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1, user) }) t.Run("get u1 by email, allow only username", func(t *testing.T) { _, err := ss.User().GetForLogin(u1.Email, true, false) - require.NotNil(t, err) + require.Error(t, err) require.Equal(t, "user not found", err.Error()) }) t.Run("get u2 by username, allow both", func(t *testing.T) { user, err := ss.User().GetForLogin(u2.Username, true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u2, user) }) t.Run("get u2 by email, allow both", func(t *testing.T) { user, err := ss.User().GetForLogin(u2.Email, true, true) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u2, user) }) t.Run("get u2 by username, allow neither", func(t *testing.T) { _, err := ss.User().GetForLogin(u2.Username, false, false) - require.NotNil(t, err) + require.Error(t, err) require.Equal(t, "sign in with username and email are disabled", err.Error()) }) } @@ -2130,18 +2130,18 @@ func testUserStoreUpdatePassword(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) hashedPassword := model.HashPassword("newpwd") err = ss.User().UpdatePassword(u1.Id, hashedPassword) - require.Nil(t, err) + require.NoError(t, err) user, err := ss.User().GetByEmail(u1.Email) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, user.Password, hashedPassword, "Password was not updated correctly") } @@ -2149,13 +2149,13 @@ func testUserStoreDelete(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PermanentDelete(u1.Id) - require.Nil(t, err) + require.NoError(t, err) } func testUserStoreUpdateAuthData(t *testing.T, ss store.Store) { @@ -2164,19 +2164,19 @@ func testUserStoreUpdateAuthData(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) service := "someservice" authData := model.NewId() _, err = ss.User().UpdateAuthData(u1.Id, service, &authData, "", true) - require.Nil(t, err) + require.NoError(t, err) user, err := ss.User().GetByEmail(u1.Email) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, service, user.AuthService, "AuthService was not updated correctly") require.Equal(t, authData, *user.AuthData, "AuthData was not updated correctly") require.Equal(t, "", user.Password, "Password was not cleared properly") @@ -2201,22 +2201,22 @@ func testUserUnreadCount(t *testing.T, ss store.Store) { u1.Username = "user1" + model.NewId() u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2 := &model.User{} u2.Email = MakeEmail() u2.Username = "user2" + model.NewId() _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().Save(&c1, -1) - require.Nil(t, nErr, "couldn't save item") + require.NoError(t, nErr, "couldn't save item") m1 := model.ChannelMember{} m1.ChannelId = c1.Id @@ -2229,13 +2229,13 @@ func testUserUnreadCount(t *testing.T, ss store.Store) { m2.NotifyProps = model.GetDefaultChannelNotifyProps() _, nErr = ss.Channel().SaveMember(&m2) - require.Nil(t, nErr) + require.NoError(t, nErr) m1.ChannelId = c2.Id m2.ChannelId = c2.Id _, nErr = ss.Channel().SaveDirectChannel(&c2, &m1, &m2) - require.Nil(t, nErr, "couldn't save direct channel") + require.NoError(t, nErr, "couldn't save direct channel") p1 := model.Post{} p1.ChannelId = c1.Id @@ -2244,9 +2244,9 @@ func testUserUnreadCount(t *testing.T, ss store.Store) { // Post one message with mention to open channel _, nErr = ss.Post().Save(&p1) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().IncrementMentionCount(c1.Id, u2.Id, false) - require.Nil(t, nErr) + require.NoError(t, nErr) // Post 2 messages without mention to direct channel p2 := model.Post{} @@ -2255,30 +2255,30 @@ func testUserUnreadCount(t *testing.T, ss store.Store) { p2.Message = "first message" _, nErr = ss.Post().Save(&p2) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().IncrementMentionCount(c2.Id, u2.Id, false) - require.Nil(t, nErr) + require.NoError(t, nErr) p3 := model.Post{} p3.ChannelId = c2.Id p3.UserId = u1.Id p3.Message = "second message" _, nErr = ss.Post().Save(&p3) - require.Nil(t, nErr) + require.NoError(t, nErr) nErr = ss.Channel().IncrementMentionCount(c2.Id, u2.Id, false) - require.Nil(t, nErr) + require.NoError(t, nErr) badge, unreadCountErr := ss.User().GetUnreadCount(u2.Id) - require.Nil(t, unreadCountErr) + require.NoError(t, unreadCountErr) require.Equal(t, int64(3), badge, "should have 3 unread messages") badge, unreadCountErr = ss.User().GetUnreadCountForChannel(u2.Id, c1.Id) - require.Nil(t, unreadCountErr) + require.NoError(t, unreadCountErr) require.Equal(t, int64(1), badge, "should have 1 unread messages for that channel") badge, unreadCountErr = ss.User().GetUnreadCountForChannel(u2.Id, c2.Id) - require.Nil(t, unreadCountErr) + require.NoError(t, unreadCountErr) require.Equal(t, int64(2), badge, "should have 2 unread messages for that channel") } @@ -2286,35 +2286,35 @@ func testUserStoreUpdateMfaSecret(t *testing.T, ss store.Store) { u1 := model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(&u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() err = ss.User().UpdateMfaSecret(u1.Id, "12345") - require.Nil(t, err) + require.NoError(t, err) // should pass, no update will occur though err = ss.User().UpdateMfaSecret("junk", "12345") - require.Nil(t, err) + require.NoError(t, err) } func testUserStoreUpdateMfaActive(t *testing.T, ss store.Store) { u1 := model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(&u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() time.Sleep(time.Millisecond) err = ss.User().UpdateMfaActive(u1.Id, true) - require.Nil(t, err) + require.NoError(t, err) err = ss.User().UpdateMfaActive(u1.Id, false) - require.Nil(t, err) + require.NoError(t, err) // should pass, no update will occur though err = ss.User().UpdateMfaActive("junk", true) - require.Nil(t, err) + require.NoError(t, err) } func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s SqlStore) { @@ -2327,49 +2327,49 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() millis := model.GetMillis() u3.LastActivityAt = millis u2.LastActivityAt = millis - 1 u1.LastActivityAt = millis - 1 - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u1.LastActivityAt, ActiveChannel: ""})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u2.LastActivityAt, ActiveChannel: ""})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u3.LastActivityAt, ActiveChannel: ""})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u1.LastActivityAt, ActiveChannel: ""})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u2.LastActivityAt, ActiveChannel: ""})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u3.LastActivityAt, ActiveChannel: ""})) t.Run("get team 1, offset 0, limit 100", func(t *testing.T) { users, err := ss.User().GetRecentlyActiveUsersForTeam(teamId, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u3), sanitized(u1), @@ -2379,7 +2379,7 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s t.Run("get team 1, offset 0, limit 1", func(t *testing.T) { users, err := ss.User().GetRecentlyActiveUsersForTeam(teamId, 0, 1, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u3), }, users) @@ -2387,7 +2387,7 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s t.Run("get team 1, offset 2, limit 1", func(t *testing.T) { users, err := ss.User().GetRecentlyActiveUsersForTeam(teamId, 2, 1, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u2), }, users) @@ -2402,49 +2402,49 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "Yuka", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "Leia", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "Ali", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("get team 1, offset 0, limit 100", func(t *testing.T) { result, err := ss.User().GetNewUsersForTeam(teamId, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u3), sanitized(u2), @@ -2454,7 +2454,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { t.Run("get team 1, offset 0, limit 1", func(t *testing.T) { result, err := ss.User().GetNewUsersForTeam(teamId, 0, 1, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u3), }, result) @@ -2462,7 +2462,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { t.Run("get team 1, offset 2, limit 1", func(t *testing.T) { result, err := ss.User().GetNewUsersForTeam(teamId, 2, 1, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u1), }, result) @@ -2470,7 +2470,7 @@ func testUserStoreGetNewUsersForTeam(t *testing.T, ss store.Store) { t.Run("get team 2, offset 0, limit 100", func(t *testing.T) { result, err := ss.User().GetNewUsersForTeam(teamId2, 0, 100, nil) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{ sanitized(u4), }, result) @@ -2503,8 +2503,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) { Roles: "system_user system_admin", } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2 := &model.User{ Username: "jim2-bobby" + model.NewId(), @@ -2512,8 +2512,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) { Roles: "system_user system_user_manager", } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3 := &model.User{ Username: "jimbo3" + model.NewId(), @@ -2521,8 +2521,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) { Roles: "system_guest", } _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -2533,11 +2533,11 @@ func testUserStoreSearch(t *testing.T, ss store.Store) { t1id := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u1.Id, SchemeAdmin: true, SchemeUser: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u2.Id, SchemeAdmin: true, SchemeUser: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: t1id, UserId: u3.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Description string @@ -2634,7 +2634,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) { testCase.Term, testCase.Options, ) - require.Nil(t, err) + require.NoError(t, err) assertUsers(t, testCase.Expected, users) }) } @@ -2649,16 +2649,16 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) { Email: "harold" + model.NewId() + "@simulator.amazonses.com", } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2 := &model.User{ Username: "jim2-bobby" + model.NewId(), Email: MakeEmail(), } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3 := &model.User{ Username: "jimbo3" + model.NewId(), @@ -2666,24 +2666,24 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) { DeleteAt: 1, } _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -2700,7 +2700,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(&ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := model.Channel{ TeamId: tid, @@ -2709,26 +2709,26 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c2, nErr := ss.Channel().Save(&ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Description string @@ -2860,7 +2860,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) { testCase.Term, testCase.Options, ) - require.Nil(t, err) + require.NoError(t, err) assertUsers(t, testCase.Expected, users) }) } @@ -2876,8 +2876,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { Roles: "system_user system_admin", } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2 := &model.User{ Username: "jim-bobby" + model.NewId(), @@ -2885,8 +2885,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { Roles: "system_user", } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3 := &model.User{ Username: "jimbo3" + model.NewId(), @@ -2895,24 +2895,24 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { Roles: "system_user", } _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -2929,7 +2929,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(&ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := model.Channel{ TeamId: tid, @@ -2938,7 +2938,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c2, nErr := ss.Channel().Save(&ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, @@ -2947,7 +2947,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { SchemeAdmin: true, SchemeUser: true, }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u2.Id, @@ -2955,7 +2955,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { SchemeAdmin: false, SchemeUser: true, }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u3.Id, @@ -2963,7 +2963,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { SchemeAdmin: false, SchemeUser: true, }) - require.Nil(t, nErr) + require.NoError(t, nErr) testCases := []struct { Description string @@ -3094,7 +3094,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) { testCase.Term, testCase.Options, ) - require.Nil(t, err) + require.NoError(t, err) assertUsers(t, testCase.Expected, users) }) } @@ -3109,16 +3109,16 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { Email: "harold" + model.NewId() + "@simulator.amazonses.com", } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2 := &model.User{ Username: "jim-bobby" + model.NewId(), Email: MakeEmail(), } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3 := &model.User{ Username: "jimbo3" + model.NewId(), @@ -3126,16 +3126,16 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { DeleteAt: 1, } _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() u4 := &model.User{ Username: "simon" + model.NewId(), @@ -3143,8 +3143,8 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { DeleteAt: 0, } _, err = ss.User().Save(u4) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() u5 := &model.User{ Username: "yu" + model.NewId(), @@ -3154,8 +3154,8 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), } _, err = ss.User().Save(u5) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u5.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u5.Id)) }() u6 := &model.User{ Username: "underscore" + model.NewId(), @@ -3165,25 +3165,25 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), } _, err = ss.User().Save(u6) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u6.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u6.Id)) }() teamId1 := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // u4 is not in team 1 _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u5.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: u6.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) teamId2 := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -3286,7 +3286,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) { testCase.Term, testCase.Options, ) - require.Nil(t, err) + require.NoError(t, err) assertUsers(t, testCase.Expected, users) }) } @@ -3301,16 +3301,16 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) { Email: "harold" + model.NewId() + "@simulator.amazonses.com", } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2 := &model.User{ Username: "jim2-bobby" + model.NewId(), Email: MakeEmail(), } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3 := &model.User{ Username: "jimbo3" + model.NewId(), @@ -3318,20 +3318,20 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) { DeleteAt: 1, } _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() tid := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: tid, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // The users returned from the database will have AuthData as an empty string. nilAuthData := new(string) @@ -3391,7 +3391,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) { testCase.Term, testCase.Options, ) - require.Nil(t, err) + require.NoError(t, err) assertUsers(t, testCase.Expected, users) }) } @@ -3406,16 +3406,16 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) { Email: "harold" + model.NewId() + "@simulator.amazonses.com", } _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2 := &model.User{ Username: "jim-bobby" + model.NewId(), Email: MakeEmail(), } _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() u3 := &model.User{ Username: "jimbo3" + model.NewId(), @@ -3423,8 +3423,8 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) { DeleteAt: 1, } _, err = ss.User().Save(u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() // The users returned from the database will have AuthData as an empty string. nilAuthData := model.NewString("") @@ -3441,7 +3441,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } _, err = ss.Group().Create(g1) - require.Nil(t, err) + require.NoError(t, err) g2 := &model.Group{ Name: model.NewString(model.NewId()), @@ -3451,16 +3451,16 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) { RemoteId: model.NewId(), } _, err = ss.Group().Create(g2) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(g1.Id, u1.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(g2.Id, u2.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(g1.Id, u3.Id) - require.Nil(t, err) + require.NoError(t, err) testCases := []struct { Description string @@ -3531,7 +3531,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) { testCase.Term, testCase.Options, ) - require.Nil(t, err) + require.NoError(t, err) assertUsers(t, testCase.Expected, users) }) } @@ -3545,68 +3545,68 @@ func testCount(t *testing.T, ss store.Store) { regularUser.Email = MakeEmail() regularUser.Roles = model.SYSTEM_USER_ROLE_ID _, err := ss.User().Save(regularUser) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(regularUser.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(regularUser.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: regularUser.Id, SchemeAdmin: false, SchemeUser: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{UserId: regularUser.Id, ChannelId: channelId, SchemeAdmin: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) guestUser := &model.User{} guestUser.Email = MakeEmail() guestUser.Roles = model.SYSTEM_GUEST_ROLE_ID _, err = ss.User().Save(guestUser) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(guestUser.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(guestUser.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: guestUser.Id, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{UserId: guestUser.Id, ChannelId: channelId, SchemeAdmin: false, SchemeUser: false, SchemeGuest: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) teamAdmin := &model.User{} teamAdmin.Email = MakeEmail() teamAdmin.Roles = model.SYSTEM_USER_ROLE_ID _, err = ss.User().Save(teamAdmin) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(teamAdmin.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(teamAdmin.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: teamAdmin.Id, SchemeAdmin: true, SchemeUser: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{UserId: teamAdmin.Id, ChannelId: channelId, SchemeAdmin: true, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) sysAdmin := &model.User{} sysAdmin.Email = MakeEmail() sysAdmin.Roles = model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID _, err = ss.User().Save(sysAdmin) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(sysAdmin.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(sysAdmin.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: sysAdmin.Id, SchemeAdmin: false, SchemeUser: true}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{UserId: sysAdmin.Id, ChannelId: channelId, SchemeAdmin: true, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) // Deleted deletedUser := &model.User{} deletedUser.Email = MakeEmail() deletedUser.DeleteAt = model.GetMillis() _, err = ss.User().Save(deletedUser) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(deletedUser.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(deletedUser.Id)) }() // Bot botUser, err := ss.User().Save(&model.User{ Email: MakeEmail(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(botUser.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(botUser.Id)) }() _, nErr = ss.Bot().Save(&model.Bot{ UserId: botUser.Id, Username: botUser.Username, OwnerId: regularUser.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) botUser.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(botUser.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(botUser.Id)) }() testCases := []struct { Description string @@ -3817,7 +3817,7 @@ func testCount(t *testing.T, ss store.Store) { for _, testCase := range testCases { t.Run(testCase.Description, func(t *testing.T) { count, err := ss.User().Count(testCase.Options) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, testCase.Expected, count) }) } @@ -3833,33 +3833,33 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlStore) Email: MakeEmail(), Username: "u0" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u1, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer func() { - require.Nil(t, ss.User().PermanentDelete(u0.Id)) - require.Nil(t, ss.User().PermanentDelete(u1.Id)) - require.Nil(t, ss.User().PermanentDelete(u2.Id)) - require.Nil(t, ss.User().PermanentDelete(u3.Id)) - require.Nil(t, ss.User().PermanentDelete(u4.Id)) + require.NoError(t, ss.User().PermanentDelete(u0.Id)) + require.NoError(t, ss.User().PermanentDelete(u1.Id)) + require.NoError(t, ss.User().PermanentDelete(u2.Id)) + require.NoError(t, ss.User().PermanentDelete(u3.Id)) + require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ @@ -3867,7 +3867,7 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlStore) Username: u4.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) millis := model.GetMillis() millisTwoDaysAgo := model.GetMillis() - (2 * DayMilliseconds) @@ -3876,35 +3876,35 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlStore) // u0 last activity status is two months ago. // u1 last activity status is two days ago. // u2, u3, u4 last activity is within last day - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) // Daily counts (without bots) count, err := ss.User().AnalyticsActiveCount(DayMilliseconds, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: true}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(2), count) // Daily counts (with bots) count, err = ss.User().AnalyticsActiveCount(DayMilliseconds, model.UserCountOptions{IncludeBotAccounts: true, IncludeDeleted: true}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(3), count) // Monthly counts (without bots) count, err = ss.User().AnalyticsActiveCount(MonthMilliseconds, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: true}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(3), count) // Monthly counts - (with bots) count, err = ss.User().AnalyticsActiveCount(MonthMilliseconds, model.UserCountOptions{IncludeBotAccounts: true, IncludeDeleted: true}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(4), count) // Monthly counts - (with bots, excluding deleted) count, err = ss.User().AnalyticsActiveCount(MonthMilliseconds, model.UserCountOptions{IncludeBotAccounts: true, IncludeDeleted: false}) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, int64(4), count) } @@ -3918,33 +3918,33 @@ func testUserStoreAnalyticsActiveCountForPeriod(t *testing.T, ss store.Store, s Email: MakeEmail(), Username: "u0" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u1, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) defer func() { - require.Nil(t, ss.User().PermanentDelete(u0.Id)) - require.Nil(t, ss.User().PermanentDelete(u1.Id)) - require.Nil(t, ss.User().PermanentDelete(u2.Id)) - require.Nil(t, ss.User().PermanentDelete(u3.Id)) - require.Nil(t, ss.User().PermanentDelete(u4.Id)) + require.NoError(t, ss.User().PermanentDelete(u0.Id)) + require.NoError(t, ss.User().PermanentDelete(u1.Id)) + require.NoError(t, ss.User().PermanentDelete(u2.Id)) + require.NoError(t, ss.User().PermanentDelete(u3.Id)) + require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ @@ -3952,7 +3952,7 @@ func testUserStoreAnalyticsActiveCountForPeriod(t *testing.T, ss store.Store, s Username: u4.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) millis := model.GetMillis() millisTwoDaysAgo := model.GetMillis() - (2 * DayMilliseconds) @@ -3964,30 +3964,30 @@ func testUserStoreAnalyticsActiveCountForPeriod(t *testing.T, ss store.Store, s // u2 last activity is one day ago // u3 last activity is within last day // u4 last activity is within last day - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo + MonthMilliseconds})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo + DayMilliseconds})) - require.Nil(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo + MonthMilliseconds})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo + DayMilliseconds})) + require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis})) // Two months to two days (without bots) count, nerr := ss.User().AnalyticsActiveCountForPeriod(millisTwoMonthsAgo, millisTwoDaysAgo, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false}) - require.Nil(t, nerr) + require.NoError(t, nerr) assert.Equal(t, int64(2), count) // Two months to two days (without bots) count, nerr = ss.User().AnalyticsActiveCountForPeriod(millisTwoMonthsAgo, millisTwoDaysAgo, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: true}) - require.Nil(t, nerr) + require.NoError(t, nerr) assert.Equal(t, int64(2), count) // Two days to present - (with bots) count, nerr = ss.User().AnalyticsActiveCountForPeriod(millisTwoDaysAgo, millis, model.UserCountOptions{IncludeBotAccounts: true, IncludeDeleted: false}) - require.Nil(t, nerr) + require.NoError(t, nerr) assert.Equal(t, int64(2), count) // Two days to present - (with bots, excluding deleted) count, nerr = ss.User().AnalyticsActiveCountForPeriod(millisTwoDaysAgo, millis, model.UserCountOptions{IncludeBotAccounts: true, IncludeDeleted: true}) - require.Nil(t, nerr) + require.NoError(t, nerr) assert.Equal(t, int64(2), count) } @@ -3995,27 +3995,27 @@ func testUserStoreAnalyticsGetInactiveUsersCount(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() count, err := ss.User().AnalyticsGetInactiveUsersCount() - require.Nil(t, err) + require.NoError(t, err) u2 := &model.User{} u2.Email = MakeEmail() u2.DeleteAt = model.GetMillis() _, err = ss.User().Save(u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() newCount, err := ss.User().AnalyticsGetInactiveUsersCount() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, count, newCount-1, "Expected 1 more inactive users but found otherwise.") } func testUserStoreAnalyticsGetSystemAdminCount(t *testing.T, ss store.Store) { countBefore, err := ss.User().AnalyticsGetSystemAdminCount() - require.Nil(t, err) + require.NoError(t, err) u1 := model.User{} u1.Email = MakeEmail() @@ -4027,23 +4027,23 @@ func testUserStoreAnalyticsGetSystemAdminCount(t *testing.T, ss store.Store) { u2.Username = model.NewId() _, nErr := ss.User().Save(&u1) - require.Nil(t, nErr, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, nErr, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr = ss.User().Save(&u2) - require.Nil(t, nErr, "couldn't save user") + require.NoError(t, nErr, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() result, err := ss.User().AnalyticsGetSystemAdminCount() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, countBefore+1, result, "Did not get the expected number of system admins.") } func testUserStoreAnalyticsGetGuestCount(t *testing.T, ss store.Store) { countBefore, err := ss.User().AnalyticsGetGuestCount() - require.Nil(t, err) + require.NoError(t, err) u1 := model.User{} u1.Email = MakeEmail() @@ -4061,26 +4061,26 @@ func testUserStoreAnalyticsGetGuestCount(t *testing.T, ss store.Store) { u3.Roles = "system_guest" _, nErr := ss.User().Save(&u1) - require.Nil(t, nErr, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, nErr, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr = ss.User().Save(&u2) - require.Nil(t, nErr, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, nErr, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.User().Save(&u3) - require.Nil(t, nErr, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, nErr, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() result, err := ss.User().AnalyticsGetGuestCount() - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, countBefore+1, result, "Did not get the expected number of guests.") } func testUserStoreAnalyticsGetExternalUsers(t *testing.T, ss store.Store) { localHostDomain := "mattermost.com" result, err := ss.User().AnalyticsGetExternalUsers(localHostDomain) - require.Nil(t, err) + require.NoError(t, err) assert.False(t, result) u1 := model.User{} @@ -4099,19 +4099,19 @@ func testUserStoreAnalyticsGetExternalUsers(t *testing.T, ss store.Store) { u3.Roles = "system_guest" _, err = ss.User().Save(&u1) - require.Nil(t, err, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, err = ss.User().Save(&u2) - require.Nil(t, err, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, err = ss.User().Save(&u3) - require.Nil(t, err, "couldn't save user") - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err, "couldn't save user") + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() result, err = ss.User().AnalyticsGetExternalUsers(localHostDomain) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, result) } @@ -4121,7 +4121,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { Name: "zz" + model.NewId(), Type: model.TEAM_OPEN, }) - require.Nil(t, err) + require.NoError(t, err) teamId := team.Id teamId2 := model.NewId() @@ -4130,10 +4130,10 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Ensure update at timestamp changes time.Sleep(time.Millisecond) @@ -4142,10 +4142,10 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) // Ensure update at timestamp changes time.Sleep(time.Millisecond) @@ -4154,16 +4154,16 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() var etag1, etag2, etag3 string @@ -4173,7 +4173,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { t.Run("get not in team 1, offset 0, limit 100000", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId, false, 0, 100000, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Equal(t, []*model.User{ sanitized(u2), sanitized(u3), @@ -4182,7 +4182,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { t.Run("get not in team 1, offset 1, limit 1", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId, false, 1, 1, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Equal(t, []*model.User{ sanitized(u3), }, users) @@ -4190,7 +4190,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { t.Run("get not in team 2, offset 0, limit 100", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId2, false, 0, 100, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Equal(t, []*model.User{ sanitized(u1), sanitized(u3), @@ -4202,9 +4202,9 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { // Add u2 to team 1 _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2.UpdateAt, err = ss.User().UpdateUpdateAt(u2.Id) - require.Nil(t, err) + require.NoError(t, err) t.Run("etag for profiles not in team 1 after update", func(t *testing.T) { etag2 = ss.User().GetEtagForProfilesNotInTeam(teamId) @@ -4213,7 +4213,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { t.Run("get not in team 1, offset 0, limit 100000 after update", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId, false, 0, 100000, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Equal(t, []*model.User{ sanitized(u3), }, users) @@ -4223,14 +4223,14 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { time.Sleep(time.Millisecond) e := ss.Team().RemoveMember(teamId, u1.Id) - require.Nil(t, e) + require.NoError(t, e) e = ss.Team().RemoveMember(teamId, u2.Id) - require.Nil(t, e) + require.NoError(t, e) u1.UpdateAt, err = ss.User().UpdateUpdateAt(u1.Id) - require.Nil(t, err) + require.NoError(t, err) u2.UpdateAt, err = ss.User().UpdateUpdateAt(u2.Id) - require.Nil(t, err) + require.NoError(t, err) t.Run("etag for profiles not in team 1 after second update", func(t *testing.T) { etag3 = ss.User().GetEtagForProfilesNotInTeam(teamId) @@ -4240,7 +4240,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { t.Run("get not in team 1, offset 0, limit 100000 after second update", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId, false, 0, 100000, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -4255,10 +4255,10 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("etag for profiles not in team 1 after addition to team", func(t *testing.T) { etag4 := ss.User().GetEtagForProfilesNotInTeam(teamId) @@ -4267,9 +4267,9 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { // Add u3 to team 2 _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.UpdateAt, err = ss.User().UpdateUpdateAt(u3.Id) - require.Nil(t, err) + require.NoError(t, err) // GetEtagForProfilesNotInTeam produces a new etag every time a member, not // in the team, gets a new UpdateAt value. In the case that an older member @@ -4284,7 +4284,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { t.Run("get not in team 1, offset 0, limit 100000 after second update, setting group constrained when it's not", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId, true, 0, 100000, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Empty(t, users) }) @@ -4295,12 +4295,12 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: "ri_" + model.NewId(), }) - require.Nil(t, err) + require.NoError(t, err) // add two members to the group for _, u := range []*model.User{u1, u2} { _, err = ss.Group().UpsertMember(group.Id, u.Id) - require.Nil(t, err) + require.NoError(t, err) } // associate the group with the team @@ -4309,11 +4309,11 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) { SyncableId: teamId, Type: model.GroupSyncableTypeTeam, }) - require.Nil(t, err) + require.NoError(t, err) t.Run("get not in team 1, offset 0, limit 100000 after second update, setting group constrained", func(t *testing.T) { users, userErr := ss.User().GetProfilesNotInTeam(teamId, true, 0, 100000, nil) - require.Nil(t, userErr) + require.NoError(t, userErr) assert.Equal(t, []*model.User{ sanitized(u1), sanitized(u2), @@ -4344,34 +4344,34 @@ func testUserStoreClearAllCustomRoleAssignments(t *testing.T, ss store.Store) { } _, err := ss.User().Save(&u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, err = ss.User().Save(&u2) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, err = ss.User().Save(&u3) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, err = ss.User().Save(&u4) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() - require.Nil(t, ss.User().ClearAllCustomRoleAssignments()) + require.NoError(t, ss.User().ClearAllCustomRoleAssignments()) r1, err := ss.User().GetByUsername(u1.Username) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u1.Roles, r1.Roles) r2, err1 := ss.User().GetByUsername(u2.Username) - require.Nil(t, err1) + require.NoError(t, err1) assert.Equal(t, "system_user system_admin", r2.Roles) r3, err2 := ss.User().GetByUsername(u3.Username) - require.Nil(t, err2) + require.NoError(t, err2) assert.Equal(t, u3.Roles, r3.Roles) r4, err3 := ss.User().GetByUsername(u4.Username) - require.Nil(t, err3) + require.NoError(t, err3) assert.Equal(t, "", r4.Roles) } @@ -4381,23 +4381,23 @@ func testUserStoreGetAllAfter(t *testing.T, ss store.Store) { Username: model.NewId(), Roles: "system_user system_admin system_post_all", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr := ss.Bot().Save(&model.Bot{ UserId: u2.Id, Username: u2.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u2.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u2.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u2.Id)) }() expected := []*model.User{u1, u2} if strings.Compare(u2.Id, u1.Id) < 0 { @@ -4406,21 +4406,21 @@ func testUserStoreGetAllAfter(t *testing.T, ss store.Store) { t.Run("get after lowest possible id", func(t *testing.T) { actual, err := ss.User().GetAllAfter(10000, strings.Repeat("0", 26)) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, expected, actual) }) t.Run("get after first user", func(t *testing.T) { actual, err := ss.User().GetAllAfter(10000, expected[0].Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{expected[1]}, actual) }) t.Run("get after second user", func(t *testing.T) { actual, err := ss.User().GetAllAfter(10000, expected[1].Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, []*model.User{}, actual) }) @@ -4433,21 +4433,21 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { Name: "zz" + model.NewId(), Type: model.TEAM_OPEN, }) - require.Nil(t, err) + require.NoError(t, err) ch1 := &model.Channel{ Name: model.NewId(), Type: model.CHANNEL_OPEN, } cPub1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := &model.Channel{ Name: model.NewId(), Type: model.CHANNEL_OPEN, } cPub2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch3 := &model.Channel{ Name: model.NewId(), @@ -4455,14 +4455,14 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { } cPriv, nErr := ss.Channel().Save(ch3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u1, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: model.NewId(), CreateAt: model.GetMillis(), }) - require.Nil(t, err) + require.NoError(t, err) time.Sleep(time.Millisecond) @@ -4471,24 +4471,24 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { Username: model.NewId(), CreateAt: model.GetMillis(), }) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ UserId: u2.Id, TeamId: t1.Id, }, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ UserId: u2.Id, ChannelId: cPub1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(&model.ChannelMember{ UserId: u2.Id, ChannelId: cPub2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) startTime := u2.CreateAt time.Sleep(time.Millisecond) @@ -4498,31 +4498,31 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { Username: model.NewId(), CreateAt: model.GetMillis(), }) - require.Nil(t, err) + require.NoError(t, err) _, nErr = ss.Team().SaveMember(&model.TeamMember{ UserId: u3.Id, TeamId: t1.Id, DeleteAt: model.GetMillis(), }, 100) - require.Nil(t, nErr) + require.NoError(t, nErr) _, err = ss.Channel().SaveMember(&model.ChannelMember{ UserId: u3.Id, ChannelId: cPub2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Channel().SaveMember(&model.ChannelMember{ UserId: u3.Id, ChannelId: cPriv.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) endTime := u3.CreateAt // First and last user should be outside the range res1List, err := ss.User().GetUsersBatchForIndexing(startTime, endTime, 100) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, res1List, 1) assert.Equal(t, res1List[0].Username, u2.Username) @@ -4532,7 +4532,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { // Update startTime to include first user startTime = u1.CreateAt res2List, err := ss.User().GetUsersBatchForIndexing(startTime, endTime, 100) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, res2List, 2) assert.Equal(t, res2List[0].Username, u1.Username) @@ -4543,7 +4543,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { // Update endTime to include last user endTime = model.GetMillis() res3List, err := ss.User().GetUsersBatchForIndexing(startTime, endTime, 100) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, res3List, 3) assert.Equal(t, res3List[0].Username, u1.Username) @@ -4554,7 +4554,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) { // Testing the limit res4List, err := ss.User().GetUsersBatchForIndexing(startTime, endTime, 2) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, res4List, 2) assert.Equal(t, res4List[0].Username, u1.Username) @@ -4570,7 +4570,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { Email: id + "@test.com", Type: model.TEAM_INVITE, }) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, team) // create users @@ -4585,7 +4585,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { LastName: "l_" + id, Password: "Password1", }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.NotNil(t, user) testUsers = append(testUsers, user) } @@ -4597,7 +4597,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { TeamId: team.Id, UserId: userNoGroup.Id, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) // create groups var testGroups []*model.Group @@ -4611,7 +4611,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: "ri_" + id, }) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, group) testGroups = append(testGroups, group) } @@ -4620,9 +4620,9 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { // add members to groups _, err = ss.Group().UpsertMember(groupA.Id, userGroupA.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(groupB.Id, userGroupB.Id) - require.Nil(t, err) + require.NoError(t, err) // association one group to team _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -4630,13 +4630,13 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { SyncableId: team.Id, Type: model.GroupSyncableTypeTeam, }) - require.Nil(t, err) + require.NoError(t, err) var users []*model.User requireNUsers := func(n int) { users, err = ss.User().GetTeamGroupUsers(team.Id) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, users) require.Len(t, users, n) } @@ -4647,7 +4647,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { // update team to be group-constrained team.GroupConstrained = model.NewBool(true) team, err = ss.Team().Update(team) - require.Nil(t, err) + require.NoError(t, err) // still returns user (being group-constrained has no effect) requireNUsers(1) @@ -4658,7 +4658,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { SyncableId: team.Id, Type: model.GroupSyncableTypeTeam, }) - require.Nil(t, err) + require.NoError(t, err) // should return users from all groups // 2 users now that both groups have been associated to the team @@ -4669,14 +4669,14 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) { TeamId: team.Id, UserId: userGroupA.Id, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) // ensure allowed member still returned by query requireNUsers(2) // delete team membership of allowed user err = ss.Team().RemoveMember(team.Id, userGroupA.Id) - require.Nil(t, err) + require.NoError(t, err) // ensure removed allowed member still returned by query requireNUsers(2) @@ -4690,7 +4690,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { Name: "n-" + id, Type: model.CHANNEL_PRIVATE, }, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) require.NotNil(t, channel) // create users @@ -4705,7 +4705,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { LastName: "l_" + id, Password: "Password1", }) - require.Nil(t, userErr) + require.NoError(t, userErr) require.NotNil(t, user) testUsers = append(testUsers, user) } @@ -4718,7 +4718,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { UserId: userNoGroup.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // create groups var testGroups []*model.Group @@ -4731,7 +4731,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { Source: model.GroupSourceLdap, RemoteId: "ri_" + id, }) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, group) testGroups = append(testGroups, group) } @@ -4740,9 +4740,9 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { // add members to groups _, err = ss.Group().UpsertMember(groupA.Id, userGroupA.Id) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Group().UpsertMember(groupB.Id, userGroupB.Id) - require.Nil(t, err) + require.NoError(t, err) // association one group to channel _, err = ss.Group().CreateGroupSyncable(&model.GroupSyncable{ @@ -4750,13 +4750,13 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { SyncableId: channel.Id, Type: model.GroupSyncableTypeChannel, }) - require.Nil(t, err) + require.NoError(t, err) var users []*model.User requireNUsers := func(n int) { users, err = ss.User().GetChannelGroupUsers(channel.Id) - require.Nil(t, err) + require.NoError(t, err) require.NotNil(t, users) require.Len(t, users, n) } @@ -4767,7 +4767,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { // update team to be group-constrained channel.GroupConstrained = model.NewBool(true) _, nErr = ss.Channel().Update(channel) - require.Nil(t, nErr) + require.NoError(t, nErr) // still returns user (being group-constrained has no effect) requireNUsers(1) @@ -4778,7 +4778,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { SyncableId: channel.Id, Type: model.GroupSyncableTypeChannel, }) - require.Nil(t, err) + require.NoError(t, err) // should return users from all groups // 2 users now that both groups have been associated to the team @@ -4790,14 +4790,14 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) { UserId: userGroupA.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, err) + require.NoError(t, err) // ensure allowed member still returned by query requireNUsers(2) // delete team membership of allowed user err = ss.Channel().RemoveMember(channel.Id, userGroupA.Id) - require.Nil(t, err) + require.NoError(t, err) // ensure removed allowed member still returned by query requireNUsers(2) @@ -4816,12 +4816,12 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4829,24 +4829,24 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user", updatedUser.Roles) require.True(t, user.UpdateAt < updatedUser.UpdateAt) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedTeamMember.SchemeGuest) require.True(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedChannelMember.SchemeGuest) require.True(t, updatedChannelMember.SchemeUser) }) @@ -4862,12 +4862,12 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user system_admin", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4875,23 +4875,23 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user system_admin", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedTeamMember.SchemeGuest) require.True(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedChannelMember.SchemeGuest) require.True(t, updatedChannelMember.SchemeUser) }) @@ -4907,13 +4907,13 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() err = ss.User().PromoteGuestToUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user", updatedUser.Roles) }) @@ -4928,21 +4928,21 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedTeamMember.SchemeGuest) require.True(t, updatedTeamMember.SchemeUser) }) @@ -4958,12 +4958,12 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -4971,23 +4971,23 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedTeamMember.SchemeGuest) require.True(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedChannelMember.SchemeGuest) require.True(t, updatedChannelMember.SchemeUser) }) @@ -5003,12 +5003,12 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest custom_role", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5016,23 +5016,23 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user custom_role", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedTeamMember.SchemeGuest) require.True(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedChannelMember.SchemeGuest) require.True(t, updatedChannelMember.SchemeUser) }) @@ -5048,12 +5048,12 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user1.Id)) }() teamId1 := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId1, @@ -5061,10 +5061,10 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user1.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) id = model.NewId() user2, err := ss.User().Save(&model.User{ @@ -5076,43 +5076,43 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user2.Id)) }() teamId2 := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user2.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().PromoteGuestToUser(user1.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId1, user1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedTeamMember.SchemeGuest) require.True(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, updatedChannelMember.SchemeGuest) require.True(t, updatedChannelMember.SchemeUser) notUpdatedUser, err := ss.User().Get(user2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", notUpdatedUser.Roles) notUpdatedTeamMember, nErr := ss.Team().GetMember(teamId2, user2.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, notUpdatedTeamMember.SchemeGuest) require.False(t, notUpdatedTeamMember.SchemeUser) notUpdatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user2.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, notUpdatedChannelMember.SchemeGuest) require.False(t, notUpdatedChannelMember.SchemeUser) }) @@ -5131,12 +5131,12 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5144,24 +5144,24 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().DemoteUserToGuest(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", updatedUser.Roles) require.True(t, user.UpdateAt < updatedUser.UpdateAt) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedTeamMember.SchemeGuest) require.False(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedChannelMember.SchemeGuest) require.False(t, updatedChannelMember.SchemeUser) }) @@ -5177,12 +5177,12 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user system_admin", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: true, SchemeUser: false}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5190,23 +5190,23 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().DemoteUserToGuest(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedTeamMember.SchemeGuest) require.False(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedChannelMember.SchemeGuest) require.False(t, updatedChannelMember.SchemeUser) }) @@ -5222,13 +5222,13 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() err = ss.User().DemoteUserToGuest(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", updatedUser.Roles) }) @@ -5243,21 +5243,21 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().DemoteUserToGuest(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedTeamMember.SchemeGuest) require.False(t, updatedTeamMember.SchemeUser) }) @@ -5273,12 +5273,12 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5286,23 +5286,23 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().DemoteUserToGuest(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedTeamMember.SchemeGuest) require.False(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedChannelMember.SchemeGuest) require.False(t, updatedChannelMember.SchemeUser) }) @@ -5318,12 +5318,12 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user custom_role", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }() teamId := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: user.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId, @@ -5331,23 +5331,23 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().DemoteUserToGuest(user.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest custom_role", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedTeamMember.SchemeGuest) require.False(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedChannelMember.SchemeGuest) require.False(t, updatedChannelMember.SchemeUser) }) @@ -5363,12 +5363,12 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user1.Id)) }() teamId1 := model.NewId() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId1, UserId: user1.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) channel, nErr := ss.Channel().Save(&model.Channel{ TeamId: teamId1, @@ -5376,10 +5376,10 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Name: "channel-" + model.NewId(), Type: model.CHANNEL_OPEN, }, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user1.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) id = model.NewId() user2, err := ss.User().Save(&model.User{ @@ -5391,43 +5391,43 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(user2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(user2.Id)) }() teamId2 := model.NewId() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId2, UserId: user2.Id, SchemeGuest: false, SchemeUser: true}, 999) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user2.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()}) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().DemoteUserToGuest(user1.Id) - require.Nil(t, err) + require.NoError(t, err) updatedUser, err := ss.User().Get(user1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_guest", updatedUser.Roles) updatedTeamMember, nErr := ss.Team().GetMember(teamId1, user1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedTeamMember.SchemeGuest) require.False(t, updatedTeamMember.SchemeUser) updatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user1.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.True(t, updatedChannelMember.SchemeGuest) require.False(t, updatedChannelMember.SchemeUser) notUpdatedUser, err := ss.User().Get(user2.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, "system_user", notUpdatedUser.Roles) notUpdatedTeamMember, nErr := ss.Team().GetMember(teamId2, user2.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, notUpdatedTeamMember.SchemeGuest) require.True(t, notUpdatedTeamMember.SchemeUser) notUpdatedChannelMember, nErr := ss.Channel().GetMember(channel.Id, user2.Id) - require.Nil(t, nErr) + require.NoError(t, nErr) require.False(t, notUpdatedChannelMember.SchemeGuest) require.True(t, notUpdatedChannelMember.SchemeUser) }) @@ -5446,8 +5446,8 @@ func testDeactivateGuests(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(guest1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(guest1.Id)) }() guest2Random := model.NewId() guest2, err := ss.User().Save(&model.User{ @@ -5459,8 +5459,8 @@ func testDeactivateGuests(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_guest", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(guest2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(guest2.Id)) }() guest3Random := model.NewId() guest3, err := ss.User().Save(&model.User{ @@ -5473,8 +5473,8 @@ func testDeactivateGuests(t *testing.T, ss store.Store) { Roles: "system_guest", DeleteAt: 10, }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(guest3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(guest3.Id)) }() regularUserRandom := model.NewId() regularUser, err := ss.User().Save(&model.User{ @@ -5486,27 +5486,27 @@ func testDeactivateGuests(t *testing.T, ss store.Store) { Password: "Password1", Roles: "system_user", }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(regularUser.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(regularUser.Id)) }() ids, err := ss.User().DeactivateGuests() - require.Nil(t, err) + require.NoError(t, err) assert.ElementsMatch(t, []string{guest1.Id, guest2.Id}, ids) u, err := ss.User().Get(guest1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, u.DeleteAt, int64(0)) u, err = ss.User().Get(guest2.Id) - require.Nil(t, err) + require.NoError(t, err) assert.NotEqual(t, u.DeleteAt, int64(0)) u, err = ss.User().Get(guest3.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u.DeleteAt, int64(10)) u, err = ss.User().Get(regularUser.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, u.DeleteAt, int64(0)) }) } @@ -5515,16 +5515,16 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, ss store.Store) { u1 := &model.User{} u1.Email = MakeEmail() _, err := ss.User().Save(u1) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: model.NewId(), UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) err = ss.User().UpdateLastPictureUpdate(u1.Id) - require.Nil(t, err) + require.NoError(t, err) user, err := ss.User().Get(u1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.NotZero(t, user.LastPictureUpdate) assert.NotZero(t, user.UpdateAt) @@ -5533,12 +5533,12 @@ func testUserStoreResetLastPictureUpdate(t *testing.T, ss store.Store) { time.Sleep(time.Millisecond) err = ss.User().ResetLastPictureUpdate(u1.Id) - require.Nil(t, err) + require.NoError(t, err) ss.User().InvalidateProfileCacheForUser(u1.Id) user2, err := ss.User().Get(u1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.True(t, user2.UpdateAt > user.UpdateAt) assert.Zero(t, user2.LastPictureUpdate) @@ -5551,46 +5551,46 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { Email: MakeEmail(), Username: "u1" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u1.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }() _, nErr := ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u1.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u2, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u2" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u2.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) u3, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u3" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u3.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u3.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u3.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Bot().Save(&model.Bot{ UserId: u3.Id, Username: u3.Username, OwnerId: u1.Id, }) - require.Nil(t, nErr) + require.NoError(t, nErr) u3.IsBot = true - defer func() { require.Nil(t, ss.Bot().PermanentDelete(u3.Id)) }() + defer func() { require.NoError(t, ss.Bot().PermanentDelete(u3.Id)) }() u4, err := ss.User().Save(&model.User{ Email: MakeEmail(), Username: "u4" + model.NewId(), }) - require.Nil(t, err) - defer func() { require.Nil(t, ss.User().PermanentDelete(u4.Id)) }() + require.NoError(t, err) + defer func() { require.NoError(t, ss.User().PermanentDelete(u4.Id)) }() _, nErr = ss.Team().SaveMember(&model.TeamMember{TeamId: teamId, UserId: u4.Id}, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch1 := &model.Channel{ TeamId: teamId, @@ -5599,7 +5599,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { Type: model.CHANNEL_OPEN, } c1, nErr := ss.Channel().Save(ch1, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch2 := &model.Channel{ TeamId: teamId, @@ -5608,7 +5608,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } c2, nErr := ss.Channel().Save(ch2, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) ch3 := &model.Channel{ TeamId: teamId, @@ -5617,59 +5617,59 @@ func testGetKnownUsers(t *testing.T, ss store.Store) { Type: model.CHANNEL_PRIVATE, } c3, nErr := ss.Channel().Save(ch3, -1) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c1.Id, UserId: u2.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u3.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c2.Id, UserId: u1.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) _, nErr = ss.Channel().SaveMember(&model.ChannelMember{ ChannelId: c3.Id, UserId: u4.Id, NotifyProps: model.GetDefaultChannelNotifyProps(), }) - require.Nil(t, nErr) + require.NoError(t, nErr) t.Run("get know users sharing no channels", func(t *testing.T) { userIds, err := ss.User().GetKnownUsers(u4.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Empty(t, userIds) }) t.Run("get know users sharing one channel", func(t *testing.T) { userIds, err := ss.User().GetKnownUsers(u3.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, userIds, 1) assert.Equal(t, userIds[0], u1.Id) }) t.Run("get know users sharing multiple channels", func(t *testing.T) { userIds, err := ss.User().GetKnownUsers(u1.Id) - require.Nil(t, err) + require.NoError(t, err) assert.Len(t, userIds, 2) assert.ElementsMatch(t, userIds, []string{u2.Id, u3.Id}) }) diff --git a/store/storetest/user_terms_of_service.go b/store/storetest/user_terms_of_service.go index fe9d26edc8..51083d3a6b 100644 --- a/store/storetest/user_terms_of_service.go +++ b/store/storetest/user_terms_of_service.go @@ -27,7 +27,7 @@ func testSaveUserTermsOfService(t *testing.T, ss store.Store) { } savedUserTermsOfService, err := ss.UserTermsOfService().Save(userTermsOfService) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, userTermsOfService.UserId, savedUserTermsOfService.UserId) assert.Equal(t, userTermsOfService.TermsOfServiceId, savedUserTermsOfService.TermsOfServiceId) assert.NotEmpty(t, savedUserTermsOfService.CreateAt) @@ -40,10 +40,10 @@ func testGetByUserTermsOfService(t *testing.T, ss store.Store) { } _, err := ss.UserTermsOfService().Save(userTermsOfService) - require.Nil(t, err) + require.NoError(t, err) fetchedUserTermsOfService, err := ss.UserTermsOfService().GetByUser(userTermsOfService.UserId) - require.Nil(t, err) + require.NoError(t, err) assert.Equal(t, userTermsOfService.UserId, fetchedUserTermsOfService.UserId) assert.Equal(t, userTermsOfService.TermsOfServiceId, fetchedUserTermsOfService.TermsOfServiceId) assert.NotEmpty(t, fetchedUserTermsOfService.CreateAt) @@ -56,16 +56,16 @@ func testDeleteUserTermsOfService(t *testing.T, ss store.Store) { } _, err := ss.UserTermsOfService().Save(userTermsOfService) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.UserTermsOfService().GetByUser(userTermsOfService.UserId) - require.Nil(t, err) + require.NoError(t, err) err = ss.UserTermsOfService().Delete(userTermsOfService.UserId, userTermsOfService.TermsOfServiceId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.UserTermsOfService().GetByUser(userTermsOfService.UserId) var nfErr *store.ErrNotFound - assert.NotNil(t, err) + assert.Error(t, err) assert.True(t, errors.As(err, &nfErr)) } diff --git a/store/storetest/webhook_store.go b/store/storetest/webhook_store.go index 9c952034ca..5d5f79932f 100644 --- a/store/storetest/webhook_store.go +++ b/store/storetest/webhook_store.go @@ -46,10 +46,10 @@ func testWebhookStoreSaveIncoming(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() _, err := ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") _, err = ss.Webhook().SaveIncoming(o1) - require.NotNil(t, err, "shouldn't be able to update from save") + require.Error(t, err, "shouldn't be able to update from save") } func testWebhookStoreUpdateIncoming(t *testing.T, ss store.Store) { @@ -58,7 +58,7 @@ func testWebhookStoreUpdateIncoming(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") previousUpdatedAt := o1.UpdateAt @@ -66,7 +66,7 @@ func testWebhookStoreUpdateIncoming(t *testing.T, ss store.Store) { time.Sleep(10 * time.Millisecond) webhook, err := ss.Webhook().UpdateIncoming(o1) - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, webhook.UpdateAt, previousUpdatedAt, "should have updated the UpdatedAt of the hook") @@ -78,24 +78,24 @@ func testWebhookStoreGetIncoming(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") webhook, err := ss.Webhook().GetIncoming(o1.Id, false) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") webhook, err = ss.Webhook().GetIncoming(o1.Id, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") _, err = ss.Webhook().GetIncoming("123", false) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") _, err = ss.Webhook().GetIncoming("123", true) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") _, err = ss.Webhook().GetIncoming("123", true) - require.NotNil(t, err) + require.Error(t, err) var nfErr *store.ErrNotFound require.True(t, errors.As(err, &nfErr), "Should have set the status as not found for missing id") } @@ -108,10 +108,10 @@ func testWebhookStoreGetIncomingList(t *testing.T, ss store.Store) { var err error o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") hooks, err := ss.Webhook().GetIncomingList(0, 1000) - require.Nil(t, err) + require.NoError(t, err) found := false for _, hook := range hooks { @@ -122,7 +122,7 @@ func testWebhookStoreGetIncomingList(t *testing.T, ss store.Store) { require.True(t, found, "missing webhook") hooks, err = ss.Webhook().GetIncomingList(0, 1) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, hooks, 1, "only 1 should be returned") } @@ -132,19 +132,19 @@ func testWebhookStoreGetIncomingListByUser(t *testing.T, ss store.Store) { o1.UserId = model.NewId() o1.TeamId = model.NewId() - o1, appErr := ss.Webhook().SaveIncoming(o1) - require.Nil(t, appErr) + o1, err := ss.Webhook().SaveIncoming(o1) + require.NoError(t, err) t.Run("GetIncomingListByUser, known user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetIncomingListByUser(o1.UserId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetIncomingListByUser(o1.UserId, 0, 100) + require.NoError(t, err) require.Equal(t, 1, len(hooks)) require.Equal(t, o1.CreateAt, hooks[0].CreateAt) }) t.Run("GetIncomingListByUser, unknown user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetIncomingListByUser("123465", 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetIncomingListByUser("123465", 0, 100) + require.NoError(t, err) require.Equal(t, 0, len(hooks)) }) } @@ -154,45 +154,45 @@ func testWebhookStoreGetIncomingByTeam(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err) + require.NoError(t, err) hooks, err := ss.Webhook().GetIncomingByTeam(o1.TeamId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, hooks[0].CreateAt, o1.CreateAt, "invalid returned webhook") hooks, err = ss.Webhook().GetIncomingByTeam("123", 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, hooks, "no webhooks should have returned") } func TestWebhookStoreGetIncomingByTeamByUser(t *testing.T, ss store.Store) { - var appErr error + var err error o1 := buildIncomingWebhook() - o1, appErr = ss.Webhook().SaveIncoming(o1) - require.Nil(t, appErr) + o1, err = ss.Webhook().SaveIncoming(o1) + require.NoError(t, err) o2 := buildIncomingWebhook() o2.TeamId = o1.TeamId //Set both to the same team - o2, appErr = ss.Webhook().SaveIncoming(o2) - require.Nil(t, appErr) + o2, err = ss.Webhook().SaveIncoming(o2) + require.NoError(t, err) t.Run("GetIncomingByTeamByUser, no user filter", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetIncomingByTeam(o1.TeamId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetIncomingByTeam(o1.TeamId, 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 2) }) t.Run("GetIncomingByTeamByUser, known user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetIncomingByTeamByUser(o1.TeamId, o1.UserId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetIncomingByTeamByUser(o1.TeamId, o1.UserId, 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 1) require.Equal(t, hooks[0].CreateAt, o1.CreateAt) }) t.Run("GetIncomingByTeamByUser, unknown user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetIncomingByTeamByUser(o2.TeamId, "123465", 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetIncomingByTeamByUser(o2.TeamId, "123465", 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 0) }) } @@ -201,14 +201,14 @@ func testWebhookStoreGetIncomingByChannel(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err := ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") webhooks, err := ss.Webhook().GetIncomingByChannel(o1.ChannelId) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhooks[0].CreateAt, o1.CreateAt, "invalid returned webhook") webhooks, err = ss.Webhook().GetIncomingByChannel("123") - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, webhooks, "no webhooks should have returned") } @@ -217,17 +217,17 @@ func testWebhookStoreDeleteIncoming(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") webhook, err := ss.Webhook().GetIncoming(o1.Id, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") err = ss.Webhook().DeleteIncoming(o1.Id, model.GetMillis()) - require.Nil(t, err) + require.NoError(t, err) webhook, err = ss.Webhook().GetIncoming(o1.Id, true) - require.NotNil(t, err) + require.Error(t, err) } func testWebhookStoreDeleteIncomingByChannel(t *testing.T, ss store.Store) { @@ -235,17 +235,17 @@ func testWebhookStoreDeleteIncomingByChannel(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") webhook, err := ss.Webhook().GetIncoming(o1.Id, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") err = ss.Webhook().PermanentDeleteIncomingByChannel(o1.ChannelId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Webhook().GetIncoming(o1.Id, true) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testWebhookStoreDeleteIncomingByUser(t *testing.T, ss store.Store) { @@ -253,17 +253,17 @@ func testWebhookStoreDeleteIncomingByUser(t *testing.T, ss store.Store) { o1 := buildIncomingWebhook() o1, err = ss.Webhook().SaveIncoming(o1) - require.Nil(t, err, "unable to save webhook") + require.NoError(t, err, "unable to save webhook") webhook, err := ss.Webhook().GetIncoming(o1.Id, true) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") err = ss.Webhook().PermanentDeleteIncomingByUser(o1.UserId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Webhook().GetIncoming(o1.Id, true) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func buildIncomingWebhook() *model.IncomingWebhook { @@ -285,10 +285,10 @@ func testWebhookStoreSaveOutgoing(t *testing.T, ss store.Store) { o1.IconURL = "http://nowhere.com/icon" _, err := ss.Webhook().SaveOutgoing(&o1) - require.Nil(t, err, "couldn't save item") + require.NoError(t, err, "couldn't save item") _, err = ss.Webhook().SaveOutgoing(&o1) - require.NotNil(t, err, "shouldn't be able to update from save") + require.Error(t, err, "shouldn't be able to update from save") } func testWebhookStoreGetOutgoing(t *testing.T, ss store.Store) { @@ -303,11 +303,11 @@ func testWebhookStoreGetOutgoing(t *testing.T, ss store.Store) { o1, _ = ss.Webhook().SaveOutgoing(o1) webhook, err := ss.Webhook().GetOutgoing(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") _, err = ss.Webhook().GetOutgoing("123") - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testWebhookStoreGetOutgoingListByUser(t *testing.T, ss store.Store) { @@ -317,19 +317,19 @@ func testWebhookStoreGetOutgoingListByUser(t *testing.T, ss store.Store) { o1.TeamId = model.NewId() o1.CallbackURLs = []string{"http://nowhere.com/"} - o1, appErr := ss.Webhook().SaveOutgoing(o1) - require.Nil(t, appErr) + o1, err := ss.Webhook().SaveOutgoing(o1) + require.NoError(t, err) t.Run("GetOutgoingListByUser, known user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingListByUser(o1.CreatorId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingListByUser(o1.CreatorId, 0, 100) + require.NoError(t, err) require.Equal(t, 1, len(hooks)) require.Equal(t, o1.CreateAt, hooks[0].CreateAt) }) t.Run("GetOutgoingListByUser, unknown user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingListByUser("123465", 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingListByUser("123465", 0, 100) + require.NoError(t, err) require.Equal(t, 0, len(hooks)) }) } @@ -352,7 +352,7 @@ func testWebhookStoreGetOutgoingList(t *testing.T, ss store.Store) { o2, _ = ss.Webhook().SaveOutgoing(o2) r1, err := ss.Webhook().GetOutgoingList(0, 1000) - require.Nil(t, err) + require.NoError(t, err) hooks := r1 found1 := false found2 := false @@ -371,7 +371,7 @@ func testWebhookStoreGetOutgoingList(t *testing.T, ss store.Store) { require.True(t, found2, "missing hook2") result, err := ss.Webhook().GetOutgoingList(0, 2) - require.Nil(t, err) + require.NoError(t, err) require.Len(t, result, 2, "wrong number of hooks returned") } @@ -385,11 +385,11 @@ func testWebhookStoreGetOutgoingByChannel(t *testing.T, ss store.Store) { o1, _ = ss.Webhook().SaveOutgoing(o1) r1, err := ss.Webhook().GetOutgoingByChannel(o1.ChannelId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r1[0].CreateAt, o1.CreateAt, "invalid returned webhook") result, err := ss.Webhook().GetOutgoingByChannel("123", -1, -1) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, result, "no webhooks should have returned") } @@ -400,8 +400,8 @@ func testWebhookStoreGetOutgoingByChannelByUser(t *testing.T, ss store.Store) { o1.TeamId = model.NewId() o1.CallbackURLs = []string{"http://nowhere.com/"} - o1, appErr := ss.Webhook().SaveOutgoing(o1) - require.Nil(t, appErr) + o1, err := ss.Webhook().SaveOutgoing(o1) + require.NoError(t, err) o2 := &model.OutgoingWebhook{} o2.ChannelId = o1.ChannelId @@ -409,25 +409,25 @@ func testWebhookStoreGetOutgoingByChannelByUser(t *testing.T, ss store.Store) { o2.TeamId = model.NewId() o2.CallbackURLs = []string{"http://nowhere.com/"} - o2, appErr = ss.Webhook().SaveOutgoing(o2) - require.Nil(t, appErr) + o2, err = ss.Webhook().SaveOutgoing(o2) + require.NoError(t, err) t.Run("GetOutgoingByChannelByUser, no user filter", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingByChannel(o1.ChannelId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingByChannel(o1.ChannelId, 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 2) }) t.Run("GetOutgoingByChannelByUser, known user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingByChannelByUser(o1.ChannelId, o1.CreatorId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingByChannelByUser(o1.ChannelId, o1.CreatorId, 0, 100) + require.NoError(t, err) require.Equal(t, 1, len(hooks)) require.Equal(t, o1.CreateAt, hooks[0].CreateAt) }) t.Run("GetOutgoingByChannelByUser, unknown user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingByChannelByUser(o1.ChannelId, "123465", 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingByChannelByUser(o1.ChannelId, "123465", 0, 100) + require.NoError(t, err) require.Equal(t, 0, len(hooks)) }) } @@ -442,16 +442,16 @@ func testWebhookStoreGetOutgoingByTeam(t *testing.T, ss store.Store) { o1, _ = ss.Webhook().SaveOutgoing(o1) r1, err := ss.Webhook().GetOutgoingByTeam(o1.TeamId, 0, 100) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, r1[0].CreateAt, o1.CreateAt, "invalid returned webhook") result, err := ss.Webhook().GetOutgoingByTeam("123", -1, -1) - require.Nil(t, err) + require.NoError(t, err) require.Empty(t, result, "no webhooks should have returned") } func testWebhookStoreGetOutgoingByTeamByUser(t *testing.T, ss store.Store) { - var appErr error + var err error o1 := &model.OutgoingWebhook{} o1.ChannelId = model.NewId() @@ -459,8 +459,8 @@ func testWebhookStoreGetOutgoingByTeamByUser(t *testing.T, ss store.Store) { o1.TeamId = model.NewId() o1.CallbackURLs = []string{"http://nowhere.com/"} - o1, appErr = ss.Webhook().SaveOutgoing(o1) - require.Nil(t, appErr) + o1, err = ss.Webhook().SaveOutgoing(o1) + require.NoError(t, err) o2 := &model.OutgoingWebhook{} o2.ChannelId = model.NewId() @@ -468,25 +468,25 @@ func testWebhookStoreGetOutgoingByTeamByUser(t *testing.T, ss store.Store) { o2.TeamId = o1.TeamId o2.CallbackURLs = []string{"http://nowhere.com/"} - o2, appErr = ss.Webhook().SaveOutgoing(o2) - require.Nil(t, appErr) + o2, err = ss.Webhook().SaveOutgoing(o2) + require.NoError(t, err) t.Run("GetOutgoingByTeamByUser, no user filter", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingByTeam(o1.TeamId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingByTeam(o1.TeamId, 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 2) }) t.Run("GetOutgoingByTeamByUser, known user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingByTeamByUser(o1.TeamId, o1.CreatorId, 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingByTeamByUser(o1.TeamId, o1.CreatorId, 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 1) require.Equal(t, hooks[0].CreateAt, o1.CreateAt) }) t.Run("GetOutgoingByTeamByUser, unknown user filtered", func(t *testing.T) { - hooks, appErr := ss.Webhook().GetOutgoingByTeamByUser(o2.TeamId, "123465", 0, 100) - require.Nil(t, appErr) + hooks, err := ss.Webhook().GetOutgoingByTeamByUser(o2.TeamId, "123465", 0, 100) + require.NoError(t, err) require.Equal(t, len(hooks), 0) }) } @@ -501,14 +501,14 @@ func testWebhookStoreDeleteOutgoing(t *testing.T, ss store.Store) { o1, _ = ss.Webhook().SaveOutgoing(o1) webhook, err := ss.Webhook().GetOutgoing(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") err = ss.Webhook().DeleteOutgoing(o1.Id, model.GetMillis()) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Webhook().GetOutgoing(o1.Id) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testWebhookStoreDeleteOutgoingByChannel(t *testing.T, ss store.Store) { @@ -521,14 +521,14 @@ func testWebhookStoreDeleteOutgoingByChannel(t *testing.T, ss store.Store) { o1, _ = ss.Webhook().SaveOutgoing(o1) webhook, err := ss.Webhook().GetOutgoing(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") err = ss.Webhook().PermanentDeleteOutgoingByChannel(o1.ChannelId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Webhook().GetOutgoing(o1.Id) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testWebhookStoreDeleteOutgoingByUser(t *testing.T, ss store.Store) { @@ -541,14 +541,14 @@ func testWebhookStoreDeleteOutgoingByUser(t *testing.T, ss store.Store) { o1, _ = ss.Webhook().SaveOutgoing(o1) webhook, err := ss.Webhook().GetOutgoing(o1.Id) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, webhook.CreateAt, o1.CreateAt, "invalid returned webhook") err = ss.Webhook().PermanentDeleteOutgoingByUser(o1.CreatorId) - require.Nil(t, err) + require.NoError(t, err) _, err = ss.Webhook().GetOutgoing(o1.Id) - require.NotNil(t, err, "Missing id should have failed") + require.Error(t, err, "Missing id should have failed") } func testWebhookStoreUpdateOutgoing(t *testing.T, ss store.Store) { @@ -566,7 +566,7 @@ func testWebhookStoreUpdateOutgoing(t *testing.T, ss store.Store) { o1.Username = "another-test-user-name" _, err := ss.Webhook().UpdateOutgoing(o1) - require.Nil(t, err) + require.NoError(t, err) } func testWebhookStoreCountIncoming(t *testing.T, ss store.Store) { @@ -578,7 +578,7 @@ func testWebhookStoreCountIncoming(t *testing.T, ss store.Store) { _, _ = ss.Webhook().SaveIncoming(o1) c, err := ss.Webhook().AnalyticsIncomingCount("") - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, 0, c, "should have at least 1 incoming hook") } @@ -591,9 +591,9 @@ func testWebhookStoreCountOutgoing(t *testing.T, ss store.Store) { o1.CallbackURLs = []string{"http://nowhere.com/"} _, err := ss.Webhook().SaveOutgoing(o1) - require.Nil(t, err) + require.NoError(t, err) r, err := ss.Webhook().AnalyticsOutgoingCount("") - require.Nil(t, err) + require.NoError(t, err) require.NotEqual(t, 0, r, "should have at least 1 outgoing hook") }