From d1e46cd2167dca6bac272ce33ce3f39c242a779f Mon Sep 17 00:00:00 2001 From: Shodiq Muhammad <47969743+iDevoid@users.noreply.github.com> Date: Thu, 10 Oct 2019 00:11:40 +0700 Subject: [PATCH] change t.Fatal to assert.Equal in model/status_test.go (#12680) --- model/status_test.go | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/model/status_test.go b/model/status_test.go index d2e519006e..cc15e1c0ae 100644 --- a/model/status_test.go +++ b/model/status_test.go @@ -16,22 +16,10 @@ func TestStatus(t *testing.T) { json := status.ToJson() status2 := StatusFromJson(strings.NewReader(json)) - if status.UserId != status2.UserId { - t.Fatal("UserId should have matched") - } - - if status.Status != status2.Status { - t.Fatal("Status should have matched") - } - - if status.LastActivityAt != status2.LastActivityAt { - t.Fatal("LastActivityAt should have matched") - } - - if status.Manual != status2.Manual { - t.Fatal("Manual should have matched") - } - + assert.Equal(t, status.UserId, status2.UserId, "UserId should have matched") + assert.Equal(t, status.Status, status2.Status, "Status should have matched") + assert.Equal(t, status.LastActivityAt, status2.LastActivityAt, "LastActivityAt should have matched") + assert.Equal(t, status.Manual, status2.Manual, "Manual should have matched") assert.Equal(t, "", status2.ActiveChannel) json = status.ToClusterJson() @@ -70,10 +58,6 @@ func TestStatusListFromJson(t *testing.T) { toDec := strings.NewReader(jsonStream) statusesFromJson := StatusListFromJson(toDec) - if statusesFromJson[0].UserId != dat[0]["user_id"] { - t.Fatal("UserId should be equal") - } - if statusesFromJson[1].UserId != dat[1]["user_id"] { - t.Fatal("UserId should be equal") - } + assert.Equal(t, statusesFromJson[0].UserId, dat[0]["user_id"], "UserId should be equal") + assert.Equal(t, statusesFromJson[1].UserId, dat[1]["user_id"], "UserId should be equal") }