From fffcef0b00898a24b8dd3f8da6580d75f37eaf7b Mon Sep 17 00:00:00 2001 From: Peeyush Gupta Date: Thu, 17 Oct 2019 18:52:55 +0530 Subject: [PATCH] MM-19234 Migrate tests from model/team_member_test.go to use testify (#12642) --- model/team_member_test.go | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/model/team_member_test.go b/model/team_member_test.go index 3661fff4b7..9adee8e9a7 100644 --- a/model/team_member_test.go +++ b/model/team_member_test.go @@ -6,6 +6,8 @@ package model import ( "strings" "testing" + + "github.com/stretchr/testify/require" ) func TestTeamMemberJson(t *testing.T) { @@ -13,22 +15,17 @@ func TestTeamMemberJson(t *testing.T) { json := o.ToJson() ro := TeamMemberFromJson(strings.NewReader(json)) - if o.TeamId != ro.TeamId { - t.Fatal("Ids do not match") - } + require.Equal(t, o.TeamId, ro.TeamId, "Ids do not match") } func TestTeamMemberIsValid(t *testing.T) { o := TeamMember{} - if err := o.IsValid(); err == nil { - t.Fatal("should be invalid") - } + require.Error(t, o.IsValid(), "should be invalid") o.TeamId = NewId() - if err := o.IsValid(); err == nil { - t.Fatal("should be invalid") - } + + require.Error(t, o.IsValid(), "should be invalid") /*o.UserId = NewId() o.Roles = "blahblah" @@ -47,11 +44,8 @@ func TestUnreadMemberJson(t *testing.T) { json := o.ToJson() r := TeamUnreadFromJson(strings.NewReader(json)) - if o.TeamId != r.TeamId { - t.Fatal("Ids do not match") - } - if o.MsgCount != r.MsgCount { - t.Fatal("MsgCount do not match") - } + require.Equal(t, o.TeamId, r.TeamId, "Ids do not match") + + require.Equal(t, o.MsgCount, r.MsgCount, "MsgCount do not match") }