Convert app/helper_test.go t.Fatal calls into assert/require calls (#12223)

* Convert app/helper_test.go t.Fatal calls into assert/require calls

* using Equalf
Этот коммит содержится в:
Nikhil Ranjan
2019-09-17 00:11:17 +02:00
коммит произвёл Gabe Jackson
родитель 29c738dc9d
Коммит 04653ec924

Просмотреть файл

@@ -16,6 +16,7 @@ import (
"github.com/mattermost/mattermost-server/mlog" "github.com/mattermost/mattermost-server/mlog"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/utils" "github.com/mattermost/mattermost-server/utils"
"github.com/stretchr/testify/require"
) )
type TestHelper struct { type TestHelper struct {
@@ -499,22 +500,14 @@ func (me *TestHelper) ResetEmojisMigration() {
func (me *TestHelper) CheckTeamCount(t *testing.T, expected int64) { func (me *TestHelper) CheckTeamCount(t *testing.T, expected int64) {
teamCount, err := me.App.Srv.Store.Team().AnalyticsTeamCount() teamCount, err := me.App.Srv.Store.Team().AnalyticsTeamCount()
if err != nil { require.Nil(t, err, "Failed to get team count.")
t.Fatalf("Failed to get team count.") require.Equalf(t, teamCount, expected, "Unexpected number of teams. Expected: %v, found: %v", expected, teamCount)
}
if teamCount != expected {
t.Fatalf("Unexpected number of teams. Expected: %v, found: %v", expected, teamCount)
}
} }
func (me *TestHelper) CheckChannelsCount(t *testing.T, expected int64) { func (me *TestHelper) CheckChannelsCount(t *testing.T, expected int64) {
if count, err := me.App.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN); err == nil { count, err := me.App.Srv.Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN)
if count != expected { require.Nilf(t, err, "Failed to get channel count.")
t.Fatalf("Unexpected number of channels. Expected: %v, found: %v", expected, count) require.Equalf(t, count, expected, "Unexpected number of channels. Expected: %v, found: %v", expected, count)
}
} else {
t.Fatalf("Failed to get channel count.")
}
} }
func (me *TestHelper) SetupTeamScheme() *model.Scheme { func (me *TestHelper) SetupTeamScheme() *model.Scheme {