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 файл Показать все файлы Свернуть все файлы

86
store/sqlstore/integrity_test.go
Просмотреть файл

@@ -353,7 +353,7 @@ func TestCheckIntegrity(t *testing.T) {
require.Nil(t, result.Err)
switch data := result.Data.(type) {
case store.RelationalIntegrityCheckData:
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
}
}
})
@@ -386,7 +386,7 @@ func TestCheckChannelsCommandWebhooksIntegrity(t *testing.T) {
result := checkChannelsCommandWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -414,7 +414,7 @@ func TestCheckChannelsChannelMemberHistoryIntegrity(t *testing.T) {
result := checkChannelsChannelMemberHistoryIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -444,7 +444,7 @@ func TestCheckChannelsChannelMembersIntegrity(t *testing.T) {
result := checkChannelsChannelMembersIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -472,7 +472,7 @@ func TestCheckChannelsIncomingWebhooksIntegrity(t *testing.T) {
result := checkChannelsIncomingWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -500,7 +500,7 @@ func TestCheckChannelsOutgoingWebhooksIntegrity(t *testing.T) {
result := checkChannelsOutgoingWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -530,7 +530,7 @@ func TestCheckChannelsPostsIntegrity(t *testing.T) {
result := checkChannelsPostsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -557,7 +557,7 @@ func TestCheckCommandsCommandWebhooksIntegrity(t *testing.T) {
result := checkCommandsCommandWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -585,7 +585,7 @@ func TestCheckPostsFileInfoIntegrity(t *testing.T) {
result := checkPostsFileInfoIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -613,7 +613,7 @@ func TestCheckPostsPostsParentIdIntegrity(t *testing.T) {
result := checkPostsPostsParentIdIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with no records", func(t *testing.T) {
@@ -623,7 +623,7 @@ func TestCheckPostsPostsParentIdIntegrity(t *testing.T) {
result := checkPostsPostsParentIdIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
dbmap.Delete(parent)
dbmap.Delete(root)
dbmap.Delete(post)
@@ -658,7 +658,7 @@ func TestCheckPostsPostsRootIdIntegrity(t *testing.T) {
result := checkPostsPostsRootIdIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -688,7 +688,7 @@ func TestCheckPostsReactionsIntegrity(t *testing.T) {
result := checkPostsReactionsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -715,7 +715,7 @@ func TestCheckSchemesChannelsIntegrity(t *testing.T) {
result := checkSchemesChannelsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -746,7 +746,7 @@ func TestCheckSchemesTeamsIntegrity(t *testing.T) {
result := checkSchemesTeamsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -777,7 +777,7 @@ func TestCheckSessionsAuditsIntegrity(t *testing.T) {
result := checkSessionsAuditsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -808,7 +808,7 @@ func TestCheckTeamsChannelsIntegrity(t *testing.T) {
result := checkTeamsChannelsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -835,7 +835,7 @@ func TestCheckTeamsCommandsIntegrity(t *testing.T) {
result := checkTeamsCommandsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -863,7 +863,7 @@ func TestCheckTeamsIncomingWebhooksIntegrity(t *testing.T) {
result := checkTeamsIncomingWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -891,7 +891,7 @@ func TestCheckTeamsOutgoingWebhooksIntegrity(t *testing.T) {
result := checkTeamsOutgoingWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -919,7 +919,7 @@ func TestCheckTeamsTeamMembersIntegrity(t *testing.T) {
result := checkTeamsTeamMembersIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -947,7 +947,7 @@ func TestCheckUsersAuditsIntegrity(t *testing.T) {
result := checkUsersAuditsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -977,7 +977,7 @@ func TestCheckUsersCommandWebhooksIntegrity(t *testing.T) {
result := checkUsersCommandWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1005,7 +1005,7 @@ func TestCheckUsersChannelsIntegrity(t *testing.T) {
result := checkUsersChannelsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1032,7 +1032,7 @@ func TestCheckUsersChannelMemberHistoryIntegrity(t *testing.T) {
result := checkUsersChannelMemberHistoryIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1062,7 +1062,7 @@ func TestCheckUsersChannelMembersIntegrity(t *testing.T) {
result := checkUsersChannelMembersIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1092,7 +1092,7 @@ func TestCheckUsersCommandsIntegrity(t *testing.T) {
result := checkUsersCommandsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1120,7 +1120,7 @@ func TestCheckUsersCompliancesIntegrity(t *testing.T) {
result := checkUsersCompliancesIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1150,7 +1150,7 @@ func TestCheckUsersEmojiIntegrity(t *testing.T) {
result := checkUsersEmojiIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1180,7 +1180,7 @@ func TestCheckUsersFileInfoIntegrity(t *testing.T) {
result := checkUsersFileInfoIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1210,7 +1210,7 @@ func TestCheckUsersIncomingWebhooksIntegrity(t *testing.T) {
result := checkUsersIncomingWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1238,7 +1238,7 @@ func TestCheckUsersOAuthAccessDataIntegrity(t *testing.T) {
result := checkUsersOAuthAccessDataIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1268,7 +1268,7 @@ func TestCheckUsersOAuthAppsIntegrity(t *testing.T) {
result := checkUsersOAuthAppsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1298,7 +1298,7 @@ func TestCheckUsersOAuthAuthDataIntegrity(t *testing.T) {
result := checkUsersOAuthAuthDataIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1328,7 +1328,7 @@ func TestCheckUsersOutgoingWebhooksIntegrity(t *testing.T) {
result := checkUsersOutgoingWebhooksIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1356,7 +1356,7 @@ func TestCheckUsersPostsIntegrity(t *testing.T) {
result := checkUsersPostsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1383,7 +1383,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) {
result := checkUsersPreferencesIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with no records", func(t *testing.T) {
@@ -1395,7 +1395,7 @@ func TestCheckUsersPreferencesIntegrity(t *testing.T) {
result := checkUsersPreferencesIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
dbmap.Exec(`DELETE FROM Preferences`)
dbmap.Delete(user)
})
@@ -1429,7 +1429,7 @@ func TestCheckUsersReactionsIntegrity(t *testing.T) {
result := checkUsersReactionsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1458,7 +1458,7 @@ func TestCheckUsersSessionsIntegrity(t *testing.T) {
result := checkUsersSessionsIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1486,7 +1486,7 @@ func TestCheckUsersStatusIntegrity(t *testing.T) {
result := checkUsersStatusIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1515,7 +1515,7 @@ func TestCheckUsersTeamMembersIntegrity(t *testing.T) {
result := checkUsersTeamMembersIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {
@@ -1545,7 +1545,7 @@ func TestCheckUsersUserAccessTokensIntegrity(t *testing.T) {
result := checkUsersUserAccessTokensIntegrity(supplier)
require.Nil(t, result.Err)
data := result.Data.(store.RelationalIntegrityCheckData)
require.Len(t, data.Records, 0)
require.Empty(t, data.Records)
})
t.Run("should generate a report with one record", func(t *testing.T) {

2
store/sqlstore/supplier_test.go
Просмотреть файл

@@ -230,7 +230,7 @@ func TestGetAllConns(t *testing.T) {
}
supplier := sqlstore.NewSqlSupplier(settings, nil)
assert.Equal(t, testCase.ExpectedNumConnections, len(supplier.GetAllConns()))
assert.Len(t, supplier.GetAllConns(), testCase.ExpectedNumConnections)
})
}
}

2
store/storetest/audit_store.go
Просмотреть файл

@@ -40,7 +40,7 @@ func testAuditStore(t *testing.T, ss store.Store) {
audits, err = ss.Audit().Get("missing", 0, 100)
require.Nil(t, err)
assert.Len(t, audits, 0)
assert.Empty(t, audits)
audits, err = ss.Audit().Get("", 0, 100)
require.Nil(t, err)

4
store/storetest/channel_member_history_store.go
Просмотреть файл

@@ -117,7 +117,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) {
// 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)
assert.Len(t, channelMembers, 0)
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)
@@ -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)
assert.Len(t, channelMembers, 0)
assert.Empty(t, channelMembers)
}
func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) {

8
store/storetest/channel_store.go
Просмотреть файл

@@ -679,7 +679,7 @@ func testChannelStoreGetByNames(t *testing.T, ss store.Store) {
channels, err := ss.Channel().GetByNames(o1.TeamId, []string{o1.Name}, false)
require.Nil(t, err)
assert.Len(t, channels, 0)
assert.Empty(t, channels)
}
func testChannelStoreGetDeletedByName(t *testing.T, ss store.Store) {
@@ -3335,7 +3335,7 @@ func testChannelStoreGetPinnedPosts(t *testing.T, ss store.Store) {
pl, errGet = ss.Channel().GetPinnedPosts(o2.Id)
require.Nil(t, errGet, errGet)
require.Len(t, pl.Posts, 0, "wasn't supposed to return posts")
require.Empty(t, pl.Posts, "wasn't supposed to return posts")
}
func testChannelStoreGetPinnedPostCount(t *testing.T, ss store.Store) {
@@ -3471,12 +3471,12 @@ func testChannelStoreGetChannelsByScheme(t *testing.T, ss store.Store) {
// 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.Len(t, d2, 0)
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.Len(t, d3, 0)
assert.Empty(t, d3)
}
func testChannelStoreMigrateChannelMembers(t *testing.T, ss store.Store) {

2
store/storetest/cluster_discovery_store.go
Просмотреть файл

@@ -152,5 +152,5 @@ func testClusterDiscoveryGetStore(t *testing.T, ss store.Store) {
list, err = ss.ClusterDiscovery().GetAll(model.NewId(), "cluster_name")
require.Nil(t, err)
assert.Len(t, list, 0)
assert.Empty(t, list)
}

2
store/storetest/emoji_store.go
Просмотреть файл

@@ -168,7 +168,7 @@ func testEmojiGetMultipleByName(t *testing.T, ss store.Store) {
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.Len(t, received, 0, "got incorrect emoji")
require.Empty(t, received, "got incorrect emoji")
})
t.Run("multiple emojis with nonexistent names", func(t *testing.T) {

2
store/storetest/file_info_store.go
Просмотреть файл

@@ -395,7 +395,7 @@ func testFileInfoDeleteForPost(t *testing.T, ss store.Store) {
infos, err = ss.FileInfo().GetForPost(postId, true, false, false)
require.Nil(t, err)
assert.Len(t, infos, 0)
assert.Empty(t, infos)
}
func testFileInfoPermanentDelete(t *testing.T, ss store.Store) {

34
store/storetest/group_store.go
Просмотреть файл

@@ -1107,7 +1107,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
// Time after syncable was created
teamMembers, err = ss.Group().TeamMembersToAdd(syncable.CreateAt + 1)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// Delete and restore GroupMember should return result
_, err = ss.Group().DeleteMember(group.Id, user.Id)
@@ -1133,7 +1133,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
// Time after syncable was updated
teamMembers, err = ss.Group().TeamMembersToAdd(syncable.UpdateAt + 1)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// Only includes if auto-add
syncable.AutoAdd = false
@@ -1141,7 +1141,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
teamMembers, err = ss.Group().TeamMembersToAdd(0)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// reset state of syncable and verify
_, err = ss.Group().UpdateGroupSyncable(&pristineSyncable)
@@ -1155,7 +1155,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
teamMembers, err = ss.Group().TeamMembersToAdd(0)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// reset state of group and verify
group.DeleteAt = 0
@@ -1171,7 +1171,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
teamMembers, err = ss.Group().TeamMembersToAdd(0)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// reset state of team and verify
team.DeleteAt = 0
@@ -1186,7 +1186,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
teamMembers, err = ss.Group().TeamMembersToAdd(0)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// reset GroupTeam and verify
_, err = ss.Group().UpdateGroupSyncable(&pristineSyncable)
@@ -1200,7 +1200,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
teamMembers, err = ss.Group().TeamMembersToAdd(0)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
// restore group member and verify
_, err = ss.Group().UpsertMember(group.Id, user.Id)
@@ -1217,7 +1217,7 @@ func testPendingAutoAddTeamMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
teamMembers, err = ss.Group().TeamMembersToAdd(0)
require.Nil(t, err)
require.Len(t, teamMembers, 0)
require.Empty(t, teamMembers)
}
func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
@@ -1266,7 +1266,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
// Time after syncable was created
channelMembers, err = ss.Group().ChannelMembersToAdd(syncable.CreateAt + 1)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// Delete and restore GroupMember should return result
_, err = ss.Group().DeleteMember(group.Id, user.Id)
@@ -1292,7 +1292,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
// Time after syncable was updated
channelMembers, err = ss.Group().ChannelMembersToAdd(syncable.UpdateAt + 1)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// Only includes if auto-add
syncable.AutoAdd = false
@@ -1300,7 +1300,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// reset state of syncable and verify
_, err = ss.Group().UpdateGroupSyncable(&pristineSyncable)
@@ -1314,7 +1314,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// reset state of group and verify
group.DeleteAt = 0
@@ -1329,7 +1329,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// reset state of channel and verify
channel.DeleteAt = 0
@@ -1344,7 +1344,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// reset GroupChannel and verify
_, err = ss.Group().UpdateGroupSyncable(&pristineSyncable)
@@ -1358,7 +1358,7 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// restore group member and verify
_, err = ss.Group().UpsertMember(group.Id, user.Id)
@@ -1372,14 +1372,14 @@ func testPendingAutoAddChannelMembers(t *testing.T, ss store.Store) {
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// Leaving Channel (ChannelMemberHistory) should still not return result
err = ss.ChannelMemberHistory().LogLeaveEvent(user.Id, channel.Id, model.GetMillis())
require.Nil(t, err)
channelMembers, err = ss.Group().ChannelMembersToAdd(0)
require.Nil(t, err)
require.Len(t, channelMembers, 0)
require.Empty(t, channelMembers)
// Purging ChannelMemberHistory re-returns the result
_, err = ss.ChannelMemberHistory().PermanentDeleteBatch(model.GetMillis()+1, 100)

4
store/storetest/oauth_store.go
Просмотреть файл

@@ -71,7 +71,7 @@ func testOAuthStoreGetApp(t *testing.T, ss store.Store) {
// 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)
assert.Len(t, apps, 0, "Should have failed. Fake user hasn't created any apps")
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)
@@ -294,7 +294,7 @@ func testOAuthGetAuthorizedApps(t *testing.T, ss store.Store) {
// 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)
assert.Len(t, apps, 0, "Should have failed. Fake user hasn't authorized the app")
assert.Empty(t, apps, "Should have failed. Fake user hasn't authorized the app")
// allow the app
p := model.Preference{}

2
store/storetest/post_store.go
Просмотреть файл

@@ -1118,7 +1118,7 @@ func testPostStoreGetPostsSince(t *testing.T, ss store.Store) {
assert.Nil(t, err)
assert.Equal(t, []string{}, postList.Order)
assert.Len(t, postList.Posts, 0)
assert.Empty(t, postList.Posts)
})
t.Run("should not cache a timestamp of 0 when nothing has changed", func(t *testing.T) {

8
store/storetest/preference_store.go
Просмотреть файл

@@ -251,7 +251,7 @@ func testPreferenceDelete(t *testing.T, ss store.Store) {
require.Nil(t, err)
preferences, err = ss.Preference().GetAll(preference.UserId)
require.Nil(t, err)
assert.Len(t, preferences, 0, "should've returned no preferences")
assert.Empty(t, preferences, "should've returned no preferences")
}
func testPreferenceDeleteCategory(t *testing.T, ss store.Store) {
@@ -284,7 +284,7 @@ func testPreferenceDeleteCategory(t *testing.T, ss store.Store) {
preferences, err = ss.Preference().GetAll(userId)
require.Nil(t, err)
assert.Len(t, preferences, 0, "should've returned no preferences")
assert.Empty(t, preferences, "should've returned no preferences")
}
func testPreferenceDeleteCategoryAndName(t *testing.T, ss store.Store) {
@@ -323,11 +323,11 @@ func testPreferenceDeleteCategoryAndName(t *testing.T, ss store.Store) {
preferences, err = ss.Preference().GetAll(userId)
require.Nil(t, err)
assert.Len(t, preferences, 0, "should've returned no preference")
assert.Empty(t, preferences, "should've returned no preference")
preferences, err = ss.Preference().GetAll(userId2)
require.Nil(t, err)
assert.Len(t, preferences, 0, "should've returned no preference")
assert.Empty(t, preferences, "should've returned no preference")
}
func testPreferenceCleanupFlagsBatch(t *testing.T, ss store.Store) {

4
store/storetest/reaction_store.go
Просмотреть файл

@@ -125,7 +125,7 @@ func testReactionDelete(t *testing.T, ss store.Store) {
reactions, rErr := ss.Reaction().GetForPost(post.Id, false)
require.Nil(t, rErr)
assert.Len(t, reactions, 0, "should've deleted reaction")
assert.Empty(t, reactions, "should've deleted reaction")
postList, err := ss.Post().Get(post.Id, false)
require.Nil(t, err)
@@ -285,7 +285,7 @@ func testReactionDeleteAllWithEmojiName(t *testing.T, ss store.Store) {
returned, err = ss.Reaction().GetForPost(post3.Id, false)
require.Nil(t, err)
assert.Len(t, returned, 0, "should've only removed reactions with emoji name")
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)

4
store/storetest/role_store.go
Просмотреть файл

@@ -263,7 +263,7 @@ func testRoleStoreGetByNames(t *testing.T, ss store.Store) {
n5 := []string{model.NewId(), model.NewId()}
roles5, err := ss.Role().GetByNames(n5)
assert.Nil(t, err)
assert.Len(t, roles5, 0)
assert.Empty(t, roles5)
// Get one valid one and one invalid one.
n6 := []string{r1.Name, model.NewId()}
@@ -354,5 +354,5 @@ func testRoleStorePermanentDeleteAll(t *testing.T, ss store.Store) {
roles, err = ss.Role().GetByNames([]string{r1.Name, r2.Name})
assert.Nil(t, err)
assert.Len(t, roles, 0)
assert.Empty(t, roles)
}

2
store/storetest/scheme_store.go
Просмотреть файл

@@ -484,5 +484,5 @@ func testSchemeStorePermanentDeleteAll(t *testing.T, ss store.Store) {
schemes, err := ss.Scheme().GetAllPage("", 0, 100000)
assert.Nil(t, err)
assert.Len(t, schemes, 0)
assert.Empty(t, schemes)
}

2
store/storetest/session_store.go
Просмотреть файл

@@ -169,7 +169,7 @@ func testSessionRemoveToken(t *testing.T, ss store.Store) {
data, err := ss.Session().GetSessions(s1.UserId)
require.Nil(t, err)
require.Len(t, data, 0, "should match len")
require.Empty(t, data, "should match len")
}
func testSessionUpdateDeviceId(t *testing.T, ss store.Store) {

10
store/storetest/team_store.go
Просмотреть файл

@@ -848,7 +848,7 @@ func testTeamMembers(t *testing.T, ss store.Store) {
ms, err = ss.Team().GetMembers(teamId1, 0, 100, nil)
require.Nil(t, err)
require.Len(t, ms, 0)
require.Empty(t, ms)
uid := model.NewId()
m4 := &model.TeamMember{TeamId: teamId1, UserId: uid}
@@ -867,7 +867,7 @@ func testTeamMembers(t *testing.T, ss store.Store) {
ms, err = ss.Team().GetTeamsForUser(m1.UserId)
require.Nil(t, err)
require.Len(t, ms, 0)
require.Empty(t, ms)
}
func testTeamMembersWithPagination(t *testing.T, ss store.Store) {
@@ -924,7 +924,7 @@ func testTeamMembersWithPagination(t *testing.T, ss store.Store) {
result, err = ss.Team().GetTeamsForUserWithPagination(uid, 1, 1)
require.Nil(t, err)
require.Len(t, result, 0)
require.Empty(t, result)
}
func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
@@ -1340,12 +1340,12 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
// 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.Len(t, d, 0)
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.Len(t, d, 0)
assert.Empty(t, d)
}
func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) {

8
store/storetest/webhook_store.go
Просмотреть файл

@@ -159,7 +159,7 @@ func testWebhookStoreGetIncomingByTeam(t *testing.T, ss store.Store) {
hooks, err = ss.Webhook().GetIncomingByTeam("123", 0, 100)
require.Nil(t, err)
require.Len(t, hooks, 0, "no webhooks should have returned")
require.Empty(t, hooks, "no webhooks should have returned")
}
func TestWebhookStoreGetIncomingByTeamByUser(t *testing.T, ss store.Store) {
@@ -206,7 +206,7 @@ func TestWebhookStoreGetIncomingByChannel(t *testing.T, ss store.Store) {
webhooks, err = ss.Webhook().GetIncomingByChannel("123")
require.Nil(t, err)
require.Len(t, webhooks, 0, "no webhooks should have returned")
require.Empty(t, webhooks, "no webhooks should have returned")
}
func testWebhookStoreDeleteIncoming(t *testing.T, ss store.Store) {
@@ -387,7 +387,7 @@ func testWebhookStoreGetOutgoingByChannel(t *testing.T, ss store.Store) {
result, err := ss.Webhook().GetOutgoingByChannel("123", -1, -1)
require.Nil(t, err)
require.Len(t, result, 0, "no webhooks should have returned")
require.Empty(t, result, "no webhooks should have returned")
}
func testWebhookStoreGetOutgoingByChannelByUser(t *testing.T, ss store.Store) {
@@ -444,7 +444,7 @@ func testWebhookStoreGetOutgoingByTeam(t *testing.T, ss store.Store) {
result, err := ss.Webhook().GetOutgoingByTeam("123", -1, -1)
require.Nil(t, err)
require.Len(t, result, 0, "no webhooks should have returned")
require.Empty(t, result, "no webhooks should have returned")
}
func testWebhookStoreGetOutgoingByTeamByUser(t *testing.T, ss store.Store) {