From 3687a0b6c1d4e69b9a58bb0daeab6fe59bc5966e Mon Sep 17 00:00:00 2001 From: Nikhil Ranjan Date: Fri, 1 Nov 2019 12:52:18 +0100 Subject: [PATCH] =?UTF-8?q?Migrate=20tests=20from=20store/storetest/status?= =?UTF-8?q?=5Fstore.go=20to=20use=20test=E2=80=A6=20(#12873)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- store/storetest/status_store.go | 43 ++++++++++++--------------------- 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/store/storetest/status_store.go b/store/storetest/status_store.go index e93489f166..a4073a1942 100644 --- a/store/storetest/status_store.go +++ b/store/storetest/status_store.go @@ -23,9 +23,8 @@ func testStatusStore(t *testing.T, ss store.Store) { status.LastActivityAt = 10 - if _, err := ss.Status().Get(status.UserId); err != nil { - t.Fatal(err) - } + _, err := ss.Status().Get(status.UserId) + require.Nil(t, err) status2 := &model.Status{UserId: model.NewId(), Status: model.STATUS_AWAY, Manual: false, LastActivityAt: 0, ActiveChannel: ""} require.Nil(t, ss.Status().SaveOrUpdate(status2)) @@ -33,40 +32,28 @@ func testStatusStore(t *testing.T, ss store.Store) { status3 := &model.Status{UserId: model.NewId(), Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""} require.Nil(t, ss.Status().SaveOrUpdate(status3)) - if statuses, err := ss.Status().GetByIds([]string{status.UserId, "junk"}); err != nil { - t.Fatal(err) - } else { - if len(statuses) != 1 { - t.Fatal("should only have 1 status") - } - } + statuses, err := ss.Status().GetByIds([]string{status.UserId, "junk"}) + require.Nil(t, err) + require.Len(t, statuses, 1, "should only have 1 status") - if err := ss.Status().ResetAll(); err != nil { - t.Fatal(err) - } + err = ss.Status().ResetAll() + require.Nil(t, err) - if statusParameter, err := ss.Status().Get(status.UserId); err != nil { - t.Fatal(err) - } else { - if statusParameter.Status != model.STATUS_OFFLINE { - t.Fatal("should be offline") - } - } + statusParameter, err := ss.Status().Get(status.UserId) + require.Nil(t, err) + require.Equal(t, statusParameter.Status, model.STATUS_OFFLINE, "should be offline") - if err := ss.Status().UpdateLastActivityAt(status.UserId, 10); err != nil { - t.Fatal(err) - } + err = ss.Status().UpdateLastActivityAt(status.UserId, 10) + require.Nil(t, err) } func testActiveUserCount(t *testing.T, ss store.Store) { status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""} require.Nil(t, ss.Status().SaveOrUpdate(status)) - if count, err := ss.Status().GetTotalActiveUsersCount(); err != nil { - t.Fatal(err) - } else { - require.True(t, count > 0, "expected count > 0, got %d", count) - } + count, err := ss.Status().GetTotalActiveUsersCount() + require.Nil(t, err) + require.True(t, count > 0, "expected count > 0, got %d", count) } type ByUserId []*model.Status