mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Use require/assert.Empty instead of require/assert.Len(t, X, 0) (#13413)

Просмотр исходного кода
Этот коммит содержится в:
Jesús Espino
2019-12-22 12:35:31 +01:00
коммит произвёл GitHub
родитель fdd1ae974f
Коммит b3e49ec45c
35 изменённых файлов: 203 добавлений и 202 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
api4/channel_test.go
Просмотреть файл

@@ -703,7 +703,7 @@ func TestGetPublicChannelsForTeam(t *testing.T) {
channels, resp = Client.GetPublicChannelsForTeam(team.Id, 10000, 100, "")
CheckNoError(t, resp)
require.Len(t, channels, 0, "should be no channel")
require.Empty(t, channels, "should be no channel")
_, resp = Client.GetPublicChannelsForTeam("junk", 0, 100, "")
CheckBadRequestStatus(t, resp)
@@ -843,7 +843,7 @@ func TestGetAllChannels(t *testing.T) {
channels, resp = th.SystemAdminClient.GetAllChannels(10000, 10000, "")
CheckNoError(t, resp)
require.Len(t, *channels, 0)
require.Empty(t, *channels)
_, resp = Client.GetAllChannels(0, 20, "")
CheckForbiddenStatus(t, resp)
@@ -874,7 +874,7 @@ func TestGetAllChannelsWithCount(t *testing.T) {
channels, _, resp = th.SystemAdminClient.GetAllChannelsWithCount(10000, 10000, "")
CheckNoError(t, resp)
require.Len(t, *channels, 0)
require.Empty(t, *channels)
_, _, resp = Client.GetAllChannelsWithCount(0, 20, "")
CheckForbiddenStatus(t, resp)
@@ -1155,7 +1155,7 @@ func TestSearchGroupChannels(t *testing.T) {
channels, resp = Client.SearchGroupChannels(search)
CheckNoError(t, resp)
assert.Len(t, channels, 0)
assert.Empty(t, channels)
// search unprivileged, forbidden
th.Client.Logout()
@@ -1575,7 +1575,7 @@ func TestGetChannelMembers(t *testing.T) {
members, resp = Client.GetChannelMembers(th.BasicChannel.Id, 1000, 100000, "")
CheckNoError(t, resp)
require.Len(t, *members, 0, "should be 0 users")
require.Empty(t, *members, "should be 0 users")
_, resp = Client.GetChannelMembers("", 0, 60, "")
CheckBadRequestStatus(t, resp)
@@ -1613,7 +1613,7 @@ func TestGetChannelMembersByIds(t *testing.T) {
cm1, resp := Client.GetChannelMembersByIds(th.BasicChannel.Id, []string{"junk"})
CheckNoError(t, resp)
require.Len(t, *cm1, 0, "no users should be returned")
require.Empty(t, *cm1, "no users should be returned")
cm1, resp = Client.GetChannelMembersByIds(th.BasicChannel.Id, []string{"junk", th.BasicUser.Id})
CheckNoError(t, resp)
@@ -1874,7 +1874,7 @@ func TestGetPinnedPosts(t *testing.T) {
posts, resp := Client.GetPinnedPosts(channel.Id, "")
CheckNoError(t, resp)
require.Len(t, posts.Posts, 0, "should not have gotten a pinned post")
require.Empty(t, posts.Posts, "should not have gotten a pinned post")
pinnedPost := th.CreatePinnedPost()
posts, resp = Client.GetPinnedPosts(channel.Id, "")
@@ -2875,7 +2875,7 @@ func TestGetChannelMembersTimezones(t *testing.T) {
timezone, resp = Client.GetChannelMembersTimezones(th.BasicChannel.Id)
CheckNoError(t, resp)
require.Len(t, timezone, 0, "should return 0 timezone")
require.Empty(t, timezone, "should return 0 timezone")
}
func TestChannelMembersMinusGroupMembers(t *testing.T) {

16
api4/plugin_test.go
Просмотреть файл

@@ -387,7 +387,7 @@ func TestDisableOnRemove(t *testing.T) {
// Check initial status
pluginsResp, resp := th.SystemAdminClient.GetPlugins()
CheckNoError(t, resp)
require.Len(t, pluginsResp.Active, 0)
require.Empty(t, pluginsResp.Active)
require.Equal(t, pluginsResp.Inactive, []*model.PluginInfo{{
Manifest: *manifest,
}})
@@ -400,7 +400,7 @@ func TestDisableOnRemove(t *testing.T) {
// Confirm enabled status
pluginsResp, resp = th.SystemAdminClient.GetPlugins()
CheckNoError(t, resp)
require.Len(t, pluginsResp.Inactive, 0)
require.Empty(t, pluginsResp.Inactive)
require.Equal(t, pluginsResp.Active, []*model.PluginInfo{{
Manifest: *manifest,
}})
@@ -414,7 +414,7 @@ func TestDisableOnRemove(t *testing.T) {
// Plugin should remain active
pluginsResp, resp = th.SystemAdminClient.GetPlugins()
CheckNoError(t, resp)
require.Len(t, pluginsResp.Inactive, 0)
require.Empty(t, pluginsResp.Inactive)
require.Equal(t, pluginsResp.Active, []*model.PluginInfo{{
Manifest: *manifest,
}})
@@ -428,8 +428,8 @@ func TestDisableOnRemove(t *testing.T) {
// Plugin should have no status
pluginsResp, resp = th.SystemAdminClient.GetPlugins()
CheckNoError(t, resp)
require.Len(t, pluginsResp.Inactive, 0)
require.Len(t, pluginsResp.Active, 0)
require.Empty(t, pluginsResp.Inactive)
require.Empty(t, pluginsResp.Active)
// Upload same plugin
manifest, resp = th.SystemAdminClient.UploadPlugin(bytes.NewReader(tarData))
@@ -439,7 +439,7 @@ func TestDisableOnRemove(t *testing.T) {
// Plugin should be inactive
pluginsResp, resp = th.SystemAdminClient.GetPlugins()
CheckNoError(t, resp)
require.Len(t, pluginsResp.Active, 0)
require.Empty(t, pluginsResp.Active)
require.Equal(t, pluginsResp.Inactive, []*model.PluginInfo{{
Manifest: *manifest,
}})
@@ -511,7 +511,7 @@ func TestGetMarketplacePlugins(t *testing.T) {
plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
CheckNoError(t, resp)
require.Len(t, plugins, 0)
require.Empty(t, plugins)
})
t.Run("verify server version is passed through", func(t *testing.T) {
@@ -536,7 +536,7 @@ func TestGetMarketplacePlugins(t *testing.T) {
plugins, resp := th.SystemAdminClient.GetMarketplacePlugins(&model.MarketplacePluginFilter{})
CheckNoError(t, resp)
require.Len(t, plugins, 0)
require.Empty(t, plugins)
})
}

78
api4/post_test.go
Просмотреть файл

@@ -36,7 +36,7 @@ func TestCreatePost(t *testing.T) {
require.Equal(t, post.Message, rpost.Message, "message didn't match")
require.Equal(t, "#hashtag", rpost.Hashtags, "hashtag didn't match")
require.Len(t, rpost.FileIds, 0, "shouldn't have files")
require.Empty(t, rpost.FileIds)
require.Equal(t, 0, int(rpost.EditAt), "newly created post shouldn't have EditAt set")
require.Nil(t, rpost.Props[model.PROPS_ADD_CHANNEL_MEMBER], "newly created post shouldn't have Props['add_channel_member'] set")
@@ -932,7 +932,7 @@ func TestGetPostsForChannel(t *testing.T) {
posts, resp = Client.GetPostsForChannel(th.BasicChannel.Id, 10000, 10000, "")
CheckNoError(t, resp)
require.Len(t, posts.Order, 0, "should be no posts")
require.Empty(t, posts.Order, "should be no posts")
post5 := th.CreatePost()
@@ -1035,7 +1035,7 @@ func TestGetPostsForChannel(t *testing.T) {
// similar to '/posts?per_page=3&page=4'
posts, resp = Client.GetPostsForChannel(th.BasicChannel.Id, 4, 3, "")
CheckNoError(t, resp)
require.Len(t, posts.Order, 0, "should return 0 post")
require.Empty(t, posts.Order, "should return 0 post")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
require.Equal(t, "", posts.PrevPostId, "should return an empty PrevPostId")
}
@@ -1079,11 +1079,11 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
rpl, resp = Client.GetFlaggedPostsForUserInChannel(user.Id, channel1.Id, 1, 1)
CheckNoError(t, resp)
require.Len(t, rpl.Posts, 0, "should be empty")
require.Empty(t, rpl.Posts)
rpl, resp = Client.GetFlaggedPostsForUserInChannel(user.Id, GenerateTestId(), 0, 10)
CheckNoError(t, resp)
require.Len(t, rpl.Posts, 0, "should be empty")
require.Empty(t, rpl.Posts)
rpl, resp = Client.GetFlaggedPostsForUserInChannel(user.Id, "junk", 0, 10)
CheckBadRequestStatus(t, resp)
@@ -1107,11 +1107,11 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
rpl, resp = Client.GetFlaggedPostsForUserInTeam(user.Id, team1.Id, 1000, 10)
CheckNoError(t, resp)
require.Len(t, rpl.Posts, 0, "should be empty")
require.Empty(t, rpl.Posts)
rpl, resp = Client.GetFlaggedPostsForUserInTeam(user.Id, GenerateTestId(), 0, 10)
CheckNoError(t, resp)
require.Len(t, rpl.Posts, 0, "should be empty")
require.Empty(t, rpl.Posts)
rpl, resp = Client.GetFlaggedPostsForUserInTeam(user.Id, "junk", 0, 10)
CheckBadRequestStatus(t, resp)
@@ -1141,7 +1141,7 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
rpl, resp = Client.GetFlaggedPostsForUser(user.Id, 1000, 10)
CheckNoError(t, resp)
require.Len(t, rpl.Posts, 0, "should be empty")
require.Empty(t, rpl.Posts)
channel4 := th.CreateChannelWithClient(th.SystemAdminClient, model.CHANNEL_PRIVATE)
post5 := th.CreatePostWithClient(th.SystemAdminClient, channel4)
@@ -1181,7 +1181,7 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
opl2.AddPost(post4)
opl2.AddOrder(post4.Id)
require.Equal(t, 3, len(rpl.Posts), "should have returned 3 posts")
require.Len(t, rpl.Posts, 3, "should have returned 3 posts")
require.Equal(t, opl2.Posts, rpl.Posts, "posts should have matched")
_, resp = Client.GetFlaggedPostsForUser("junk", 0, 10)
@@ -1246,7 +1246,7 @@ func TestGetPostsBefore(t *testing.T) {
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post4.Id, 1, 1, "")
CheckNoError(t, resp)
require.Equal(t, 1, len(posts.Posts), "too many posts returned")
require.Len(t, posts.Posts, 1, "too many posts returned")
require.Equal(t, post2.Id, posts.Order[0], "should match returned post")
require.Equal(t, post3.Id, posts.NextPostId, "should match NextPostId")
require.Equal(t, post1.Id, posts.PrevPostId, "should match PrevPostId")
@@ -1256,7 +1256,7 @@ func TestGetPostsBefore(t *testing.T) {
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post5.Id, 0, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Posts), "should match length of posts returned")
require.Len(t, posts.Posts, 3, "should match length of posts returned")
require.Equal(t, post4.Id, posts.Order[0], "should match returned post")
require.Equal(t, post2.Id, posts.Order[2], "should match returned post")
require.Equal(t, post5.Id, posts.NextPostId, "should match NextPostId")
@@ -1270,7 +1270,7 @@ func TestGetPostsBefore(t *testing.T) {
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post5.Id, 1, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Posts), "should match length of posts returned")
require.Len(t, posts.Posts, 3, "should match length of posts returned")
require.Equal(t, post1.Id, posts.Order[0], "should match returned post")
require.Equal(t, systemPostId2, posts.Order[1], "should match returned post")
require.Equal(t, systemPostId1, posts.Order[2], "should match returned post")
@@ -1288,7 +1288,7 @@ func TestGetPostsBefore(t *testing.T) {
// similar to '/posts?before=post9'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post9.Id, 0, 60, "")
CheckNoError(t, resp)
require.Equal(t, 10, len(posts.Order), "expected 10 posts")
require.Len(t, posts.Order, 10, "expected 10 posts")
require.Equal(t, post8.Id, posts.Order[0], "posts not in order")
require.Equal(t, systemPostId1, posts.Order[9], "posts not in order")
require.Equal(t, post9.Id, posts.NextPostId, "should return post9.Id as NextPostId")
@@ -1297,7 +1297,7 @@ func TestGetPostsBefore(t *testing.T) {
// similar to '/posts?before=post9&per_page=3'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post9.Id, 0, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Order), "expected 3 posts")
require.Len(t, posts.Order, 3, "expected 3 posts")
require.Equal(t, post8.Id, posts.Order[0], "posts not in order")
require.Equal(t, post6.Id, posts.Order[2], "should return 3 posts and match order")
require.Equal(t, post9.Id, posts.NextPostId, "should return post9.Id as NextPostId")
@@ -1306,7 +1306,7 @@ func TestGetPostsBefore(t *testing.T) {
// similar to '/posts?before=post9&per_page=3&page=1'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post9.Id, 1, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Order), "expected 3 posts")
require.Len(t, posts.Order, 3, "expected 3 posts")
require.Equal(t, post5.Id, posts.Order[0], "posts not in order")
require.Equal(t, post3.Id, posts.Order[2], "posts not in order")
require.Equal(t, post6.Id, posts.NextPostId, "should return post6.Id as NextPostId")
@@ -1315,7 +1315,7 @@ func TestGetPostsBefore(t *testing.T) {
// similar to '/posts?before=post9&per_page=3&page=2'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post9.Id, 2, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Order), "expected 3 posts")
require.Len(t, posts.Order, 3, "expected 3 posts")
require.Equal(t, post2.Id, posts.Order[0], "posts not in order")
require.Equal(t, systemPostId2, posts.Order[2], "posts not in order")
require.Equal(t, post3.Id, posts.NextPostId, "should return post3.Id as NextPostId")
@@ -1324,7 +1324,7 @@ func TestGetPostsBefore(t *testing.T) {
// similar to '/posts?before=post1&per_page=3'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, post1.Id, 0, 3, "")
CheckNoError(t, resp)
require.Equal(t, 2, len(posts.Order), "expected 2 posts")
require.Len(t, posts.Order, 2, "expected 2 posts")
require.Equal(t, systemPostId2, posts.Order[0], "posts not in order")
require.Equal(t, systemPostId1, posts.Order[1], "posts not in order")
require.Equal(t, post1.Id, posts.NextPostId, "should return post1.Id as NextPostId")
@@ -1333,14 +1333,14 @@ func TestGetPostsBefore(t *testing.T) {
// similar to '/posts?before=systemPostId1'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, systemPostId1, 0, 60, "")
CheckNoError(t, resp)
require.Equal(t, 0, len(posts.Order), "should return 0 post")
require.Empty(t, posts.Order, "should return 0 post")
require.Equal(t, systemPostId1, posts.NextPostId, "should return systemPostId1 as NextPostId")
require.Equal(t, "", posts.PrevPostId, "should return an empty PrevPostId")
// similar to '/posts?before=systemPostId1&per_page=60&page=1'
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, systemPostId1, 1, 60, "")
CheckNoError(t, resp)
require.Equal(t, 0, len(posts.Order), "should return 0 posts")
require.Empty(t, posts.Order, "should return 0 posts")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
require.Equal(t, "", posts.PrevPostId, "should return an empty PrevPostId")
@@ -1348,7 +1348,7 @@ func TestGetPostsBefore(t *testing.T) {
nonExistentPostId := model.NewId()
posts, resp = Client.GetPostsBefore(th.BasicChannel.Id, nonExistentPostId, 0, 60, "")
CheckNoError(t, resp)
require.Equal(t, 0, len(posts.Order), "should return 0 post")
require.Empty(t, posts.Order, "should return 0 post")
require.Equal(t, nonExistentPostId, posts.NextPostId, "should return nonExistentPostId as NextPostId")
require.Equal(t, "", posts.PrevPostId, "should return an empty PrevPostId")
}
@@ -1386,7 +1386,7 @@ func TestGetPostsAfter(t *testing.T) {
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post2.Id, 1, 1, "")
CheckNoError(t, resp)
require.Equal(t, 1, len(posts.Posts), "too many posts returned")
require.Len(t, posts.Posts, 1, "too many posts returned")
require.Equal(t, post4.Id, posts.Order[0], "should match returned post")
require.Equal(t, post5.Id, posts.NextPostId, "should match NextPostId")
require.Equal(t, post3.Id, posts.PrevPostId, "should match PrevPostId")
@@ -1396,7 +1396,7 @@ func TestGetPostsAfter(t *testing.T) {
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post1.Id, 0, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Posts), "should match length of posts returned")
require.Len(t, posts.Posts, 3, "should match length of posts returned")
require.Equal(t, post4.Id, posts.Order[0], "should match returned post")
require.Equal(t, post2.Id, posts.Order[2], "should match returned post")
require.Equal(t, post5.Id, posts.NextPostId, "should match NextPostId")
@@ -1404,7 +1404,7 @@ func TestGetPostsAfter(t *testing.T) {
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post1.Id, 1, 3, "")
CheckNoError(t, resp)
require.Equal(t, 1, len(posts.Posts), "should match length of posts returned")
require.Len(t, posts.Posts, 1, "should match length of posts returned")
require.Equal(t, post5.Id, posts.Order[0], "should match returned post")
require.Equal(t, "", posts.NextPostId, "should match NextPostId")
require.Equal(t, post4.Id, posts.PrevPostId, "should match PrevPostId")
@@ -1420,7 +1420,7 @@ func TestGetPostsAfter(t *testing.T) {
// similar to '/posts?after=post2'
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post2.Id, 0, 60, "")
CheckNoError(t, resp)
require.Equal(t, 8, len(posts.Order), "expected 8 posts")
require.Len(t, posts.Order, 8, "expected 8 posts")
require.Equal(t, post10.Id, posts.Order[0], "should match order")
require.Equal(t, post3.Id, posts.Order[7], "should match order")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
@@ -1429,7 +1429,7 @@ func TestGetPostsAfter(t *testing.T) {
// similar to '/posts?after=post2&per_page=3'
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post2.Id, 0, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Order), "expected 3 posts")
require.Len(t, posts.Order, 3, "expected 3 posts")
require.Equal(t, post5.Id, posts.Order[0], "should match order")
require.Equal(t, post3.Id, posts.Order[2], "should return 3 posts and match order")
require.Equal(t, post6.Id, posts.NextPostId, "should return post6.Id as NextPostId")
@@ -1438,7 +1438,7 @@ func TestGetPostsAfter(t *testing.T) {
// similar to '/posts?after=post2&per_page=3&page=1'
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post2.Id, 1, 3, "")
CheckNoError(t, resp)
require.Equal(t, 3, len(posts.Order), "expected 3 posts")
require.Len(t, posts.Order, 3, "expected 3 posts")
require.Equal(t, post8.Id, posts.Order[0], "should match order")
require.Equal(t, post6.Id, posts.Order[2], "should match order")
require.Equal(t, post9.Id, posts.NextPostId, "should return post9.Id as NextPostId")
@@ -1447,7 +1447,7 @@ func TestGetPostsAfter(t *testing.T) {
// similar to '/posts?after=post2&per_page=3&page=2'
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post2.Id, 2, 3, "")
CheckNoError(t, resp)
require.Equal(t, 2, len(posts.Order), "expected 2 posts")
require.Len(t, posts.Order, 2, "expected 2 posts")
require.Equal(t, post10.Id, posts.Order[0], "should match order")
require.Equal(t, post9.Id, posts.Order[1], "should match order")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
@@ -1456,14 +1456,14 @@ func TestGetPostsAfter(t *testing.T) {
// similar to '/posts?after=post10'
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post10.Id, 0, 60, "")
CheckNoError(t, resp)
require.Equal(t, 0, len(posts.Order), "should return 0 post")
require.Empty(t, posts.Order, "should return 0 post")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
require.Equal(t, post10.Id, posts.PrevPostId, "should return post10.Id as PrevPostId")
// similar to '/posts?after=post10&page=1'
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, post10.Id, 1, 60, "")
CheckNoError(t, resp)
require.Equal(t, 0, len(posts.Order), "should return 0 post")
require.Empty(t, posts.Order, "should return 0 post")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
require.Equal(t, "", posts.PrevPostId, "should return an empty PrevPostId")
@@ -1471,7 +1471,7 @@ func TestGetPostsAfter(t *testing.T) {
nonExistentPostId := model.NewId()
posts, resp = Client.GetPostsAfter(th.BasicChannel.Id, nonExistentPostId, 0, 60, "")
CheckNoError(t, resp)
require.Equal(t, 0, len(posts.Order), "should return 0 post")
require.Empty(t, posts.Order, "should return 0 post")
require.Equal(t, "", posts.NextPostId, "should return an empty NextPostId")
require.Equal(t, nonExistentPostId, posts.PrevPostId, "should return nonExistentPostId as PrevPostId")
}
@@ -1931,7 +1931,7 @@ func TestSearchPosts(t *testing.T) {
posts2, resp = Client.SearchPostsWithParams(th.BasicTeam.Id, &searchParams)
CheckNoError(t, resp)
// We don't support paging for DB search yet, modify this when we do.
require.Len(t, posts2.Order, 0, "Wrong number of posts")
require.Empty(t, posts2.Order, "Wrong number of posts")
posts, resp = Client.SearchPosts(th.BasicTeam.Id, "search", false)
CheckNoError(t, resp)
@@ -1968,7 +1968,7 @@ func TestSearchPosts(t *testing.T) {
require.Len(t, posts.Order, 1, "wrong search")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "*", false)
require.Len(t, posts.Order, 0, "searching for just * shouldn't return any results")
require.Empty(t, posts.Order, "searching for just * shouldn't return any results")
posts, resp = Client.SearchPosts(th.BasicTeam.Id, "post1 post2", true)
CheckNoError(t, resp)
@@ -2033,10 +2033,10 @@ func TestSearchPostsInChannel(t *testing.T) {
_ = th.CreateMessagePostWithClient(Client, channel, message)
posts, _ := Client.SearchPosts(th.BasicTeam.Id, "channel:", false)
require.Len(t, posts.Order, 0, "wrong number of posts for search 'channel:'")
require.Empty(t, posts.Order, "wrong number of posts for search 'channel:'")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "in:", false)
require.Len(t, posts.Order, 0, "wrong number of posts for search 'in:'")
require.Empty(t, posts.Order, "wrong number of posts for search 'in:'")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "channel:"+th.BasicChannel.Name, false)
require.Lenf(t, posts.Order, 2, "wrong number of posts returned for search 'channel:%v'", th.BasicChannel.Name)
@@ -2144,13 +2144,13 @@ func TestSearchPostsWithDateFlags(t *testing.T) {
require.Len(t, posts.Order, 3, "wrong number of posts")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "on:", false)
require.Len(t, posts.Order, 0, "wrong number of posts")
require.Empty(t, posts.Order, "wrong number of posts")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "after:", false)
require.Len(t, posts.Order, 0, "wrong number of posts")
require.Empty(t, posts.Order, "wrong number of posts")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "before:", false)
require.Len(t, posts.Order, 0, "wrong number of posts")
require.Empty(t, posts.Order, "wrong number of posts")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "on:2018-08-01", false)
require.Len(t, posts.Order, 1, "wrong number of posts")
@@ -2168,7 +2168,7 @@ func TestSearchPostsWithDateFlags(t *testing.T) {
require.Len(t, posts.Order, 1, "wrong number of posts")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "before:2018-08-03 after:2018-08-02", false)
require.Len(t, posts.Order, 0, "wrong number of posts")
require.Empty(t, posts.Order, "wrong number of posts")
posts, _ = Client.SearchPosts(th.BasicTeam.Id, "before:2018-08-03 after:2018-08-01", false)
require.Len(t, posts.Order, 1, "wrong number of posts")
@@ -2210,7 +2210,7 @@ func TestGetFileInfosForPost(t *testing.T) {
infos, resp = Client.GetFileInfosForPost(th.BasicPost.Id, "")
CheckNoError(t, resp)
require.Len(t, infos, 0, "should have no file infos")
require.Empty(t, infos, "should have no file infos")
_, resp = Client.GetFileInfosForPost("junk", "")
CheckBadRequestStatus(t, resp)

10
api4/team_test.go
Просмотреть файл

@@ -890,12 +890,12 @@ func TestSearchAllTeams(t *testing.T) {
rteams, resp = Client.SearchTeams(&model.TeamSearch{Term: pTeam.Name})
CheckNoError(t, resp)
require.Len(t, rteams, 0, "should have not returned team")
require.Empty(t, rteams, "should have not returned team")
rteams, resp = Client.SearchTeams(&model.TeamSearch{Term: pTeam.DisplayName})
CheckNoError(t, resp)
require.Len(t, rteams, 0, "should have not returned team")
require.Empty(t, rteams, "should have not returned team")
rteams, resp = th.SystemAdminClient.SearchTeams(&model.TeamSearch{Term: oTeam.Name})
CheckNoError(t, resp)
@@ -910,7 +910,7 @@ func TestSearchAllTeams(t *testing.T) {
rteams, resp = Client.SearchTeams(&model.TeamSearch{Term: "junk"})
CheckNoError(t, resp)
require.Len(t, rteams, 0, "should have not returned team")
require.Empty(t, rteams, "should have not returned team")
Client.Logout()
@@ -1252,7 +1252,7 @@ func TestGetTeamMembers(t *testing.T) {
rmembers, resp = Client.GetTeamMembers(team.Id, 10000, 100, "")
CheckNoError(t, resp)
require.Len(t, rmembers, 0, "should be no member")
require.Empty(t, rmembers, "should be no member")
rmembers, resp = Client.GetTeamMembers(team.Id, 0, 2, "")
CheckNoError(t, resp)
@@ -2050,7 +2050,7 @@ func TestGetMyTeamsUnread(t *testing.T) {
teams, resp = Client.GetTeamsUnreadForUser(user.Id, th.BasicTeam.Id)
CheckNoError(t, resp)
require.Len(t, teams, 0, "should not have results")
require.Empty(t, teams, "should not have results")
_, resp = Client.GetTeamsUnreadForUser("fail", "")
CheckBadRequestStatus(t, resp)

12
api4/user_test.go
Просмотреть файл

@@ -1074,7 +1074,7 @@ func TestAutocompleteUsersInChannel(t *testing.T) {
rusers, resp = th.Client.AutocompleteUsersInChannel(teamId, channelId, "", model.USER_SEARCH_DEFAULT_LIMIT, "")
CheckNoError(t, resp)
assert.Len(t, rusers.OutOfChannel, 0)
assert.Empty(t, rusers.OutOfChannel)
th.App.GetOrCreateDirectChannel(permissionsUser.Id, otherUser.Id)
@@ -2025,11 +2025,11 @@ func TestGetUsersNotInTeam(t *testing.T) {
rusers, resp = th.Client.GetUsersNotInTeam(teamId, 1, 1, "")
CheckNoError(t, resp)
require.Len(t, rusers, 0, "should be no users")
require.Empty(t, rusers, "should be no users")
rusers, resp = th.Client.GetUsersNotInTeam(teamId, 10000, 100, "")
CheckNoError(t, resp)
require.Len(t, rusers, 0, "should be no users")
require.Empty(t, rusers, "should be no users")
th.Client.Logout()
_, resp = th.Client.GetUsersNotInTeam(teamId, 0, 60, "")
@@ -2065,7 +2065,7 @@ func TestGetUsersInChannel(t *testing.T) {
rusers, resp = th.Client.GetUsersInChannel(channelId, 10000, 100, "")
CheckNoError(t, resp)
require.Len(t, rusers, 0, "should be no users")
require.Empty(t, rusers, "should be no users")
th.Client.Logout()
_, resp = th.Client.GetUsersInChannel(channelId, 0, 60, "")
@@ -2101,7 +2101,7 @@ func TestGetUsersNotInChannel(t *testing.T) {
rusers, resp = th.Client.GetUsersNotInChannel(teamId, channelId, 10000, 100, "")
CheckNoError(t, resp)
require.Len(t, rusers, 0, "should be no users")
require.Empty(t, rusers, "should be no users")
th.Client.Logout()
_, resp = th.Client.GetUsersNotInChannel(teamId, channelId, 0, 60, "")
@@ -3648,7 +3648,7 @@ func TestSearchUserAccessToken(t *testing.T) {
rtokens, resp = th.SystemAdminClient.SearchUserAccessTokens(&model.UserAccessTokenSearch{Term: "not found"})
CheckNoError(t, resp)
require.Len(t, rtokens, 0, "should have 1 tokens")
require.Empty(t, rtokens, "should have 1 tokens")
}
func TestRevokeUserAccessToken(t *testing.T) {

4
api4/webhook_test.go
Просмотреть файл

@@ -150,7 +150,7 @@ func TestGetIncomingWebhooks(t *testing.T) {
hooks, resp = th.SystemAdminClient.GetIncomingWebhooksForTeam(model.NewId(), 0, 1000, "")
CheckNoError(t, resp)
require.Len(t, hooks, 0, "no hooks should be returned")
require.Empty(t, hooks, "no hooks should be returned")
_, resp = Client.GetIncomingWebhooks(0, 1000, "")
CheckForbiddenStatus(t, resp)
@@ -437,7 +437,7 @@ func TestGetOutgoingWebhooks(t *testing.T) {
hooks, resp = th.SystemAdminClient.GetOutgoingWebhooksForTeam(model.NewId(), 0, 1000, "")
CheckNoError(t, resp)
require.Len(t, hooks, 0, "no hooks should be returned")
require.Empty(t, hooks, "no hooks should be returned")
hooks, resp = th.SystemAdminClient.GetOutgoingWebhooksForChannel(th.BasicChannel.Id, 0, 1000, "")
CheckNoError(t, resp)