From 7bcb835f374b3a9dd949abfe6adbf05d67270a1b Mon Sep 17 00:00:00 2001 From: Nikhil Ranjan Date: Mon, 28 Oct 2019 22:23:55 +0100 Subject: [PATCH] Convert store/storetest/preference_store.go t.Fatal calls into assert/require calls (#12800) * Convert store/storetest/preference_store.go t.Fatal calls into assert/require calls * fix test --- store/storetest/preference_store.go | 94 ++++++++++++----------------- 1 file changed, 39 insertions(+), 55 deletions(-) diff --git a/store/storetest/preference_store.go b/store/storetest/preference_store.go index 3456ce2f33..247f84cfb9 100644 --- a/store/storetest/preference_store.go +++ b/store/storetest/preference_store.go @@ -42,26 +42,22 @@ func testPreferenceSave(t *testing.T, ss store.Store) { Value: "value1b", }, } - if err := ss.Preference().Save(&preferences); err != nil { - t.Fatal("saving preference returned error") - } + err := ss.Preference().Save(&preferences) + require.Nil(t, err, "saving preference returned error") for _, preference := range preferences { - if data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name); preference.ToJson() != data.ToJson() { - t.Fatal("got incorrect preference after first Save") - } + data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name) + require.Equal(t, data.ToJson(), preference.ToJson(), "got incorrect preference after first Save") } preferences[0].Value = "value2a" preferences[1].Value = "value2b" - if err := ss.Preference().Save(&preferences); err != nil { - t.Fatal("saving preference returned error") - } + err = ss.Preference().Save(&preferences) + require.Nil(t, err, "saving preference returned error") for _, preference := range preferences { - if data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name); preference.ToJson() != data.ToJson() { - t.Fatal("got incorrect preference after second Save") - } + data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name) + require.Equal(t, data.ToJson(), preference.ToJson(), "got incorrect preference after second Save") } } @@ -96,16 +92,13 @@ func testPreferenceGet(t *testing.T, ss store.Store) { err := ss.Preference().Save(&preferences) require.Nil(t, err) - if data, err := ss.Preference().Get(userId, category, name); err != nil { - t.Fatal(err) - } else if data.ToJson() != preferences[0].ToJson() { - t.Fatal("got incorrect preference") - } + data, err := ss.Preference().Get(userId, category, name) + require.Nil(t, err) + require.Equal(t, preferences[0].ToJson(), data.ToJson(), "got incorrect preference") // make sure getting a missing preference fails - if _, err := ss.Preference().Get(model.NewId(), model.NewId(), model.NewId()); err == nil { - t.Fatal("no error on getting a missing preference") - } + _, err = ss.Preference().Get(model.NewId(), model.NewId(), model.NewId()) + require.NotNil(t, err, "no error on getting a missing preference") } func testPreferenceGetCategory(t *testing.T, ss store.Store) { @@ -142,20 +135,19 @@ func testPreferenceGetCategory(t *testing.T, ss store.Store) { err := ss.Preference().Save(&preferences) require.Nil(t, err) - if preferencesByCategory, err := ss.Preference().GetCategory(userId, category); err != nil { - t.Fatal(err) - } else if len(preferencesByCategory) != 2 { - t.Fatal("got the wrong number of preferences") - } else if !((preferencesByCategory[0] == preferences[0] && preferencesByCategory[1] == preferences[1]) || (preferencesByCategory[0] == preferences[1] && preferencesByCategory[1] == preferences[0])) { - t.Fatal("got incorrect preferences") - } + preferencesByCategory, err := ss.Preference().GetCategory(userId, category) + require.Nil(t, err) + require.Equal(t, 2, len(preferencesByCategory), "got the wrong number of preferences") + require.True( + t, + ((preferencesByCategory[0] == preferences[0] && preferencesByCategory[1] == preferences[1]) || (preferencesByCategory[0] == preferences[1] && preferencesByCategory[1] == preferences[0])), + "got incorrect preferences", + ) // make sure getting a missing preference category doesn't fail - if preferencesByCategory, err := ss.Preference().GetCategory(model.NewId(), model.NewId()); err != nil { - t.Fatal(err) - } else if len(preferencesByCategory) != 0 { - t.Fatal("shouldn't have got any preferences") - } + preferencesByCategory, err = ss.Preference().GetCategory(model.NewId(), model.NewId()) + require.Nil(t, err) + require.Equal(t, 0, len(preferencesByCategory), "shouldn't have got any preferences") } func testPreferenceGetAll(t *testing.T, ss store.Store) { @@ -192,17 +184,14 @@ func testPreferenceGetAll(t *testing.T, ss store.Store) { err := ss.Preference().Save(&preferences) require.Nil(t, err) - if result, err := ss.Preference().GetAll(userId); err != nil { - t.Fatal(err) - } else if len(result) != 3 { - t.Fatal("got the wrong number of preferences") - } else { - for i := 0; i < 3; i++ { - if result[0] != preferences[i] && result[1] != preferences[i] && result[2] != preferences[i] { - t.Fatal("got incorrect preferences") - } - } + result, err := ss.Preference().GetAll(userId) + require.Nil(t, err) + require.Equal(t, 3, len(result), "got the wrong number of preferences") + + for i := 0; i < 3; i++ { + assert.Falsef(t, result[0] != preferences[i] && result[1] != preferences[i] && result[2] != preferences[i], "got incorrect preferences") } + } func testPreferenceDeleteByUser(t *testing.T, ss store.Store) { @@ -239,9 +228,8 @@ func testPreferenceDeleteByUser(t *testing.T, ss store.Store) { err := ss.Preference().Save(&preferences) require.Nil(t, err) - if err := ss.Preference().PermanentDeleteByUser(userId); err != nil { - t.Fatal(err) - } + err = ss.Preference().PermanentDeleteByUser(userId) + require.Nil(t, err) } func testPreferenceDelete(t *testing.T, ss store.Store) { @@ -259,13 +247,11 @@ func testPreferenceDelete(t *testing.T, ss store.Store) { require.Nil(t, err) assert.Len(t, preferences, 1, "should've returned 1 preference") - if err = ss.Preference().Delete(preference.UserId, preference.Category, preference.Name); err != nil { - t.Fatal(err) - } + err = ss.Preference().Delete(preference.UserId, preference.Category, preference.Name) + 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") - } func testPreferenceDeleteCategory(t *testing.T, ss store.Store) { @@ -293,9 +279,8 @@ func testPreferenceDeleteCategory(t *testing.T, ss store.Store) { require.Nil(t, err) assert.Len(t, preferences, 2, "should've returned 2 preferences") - if err = ss.Preference().DeleteCategory(userId, category); err != nil { - t.Fatal(err) - } + err = ss.Preference().DeleteCategory(userId, category) + require.Nil(t, err) preferences, err = ss.Preference().GetAll(userId) require.Nil(t, err) @@ -333,9 +318,8 @@ func testPreferenceDeleteCategoryAndName(t *testing.T, ss store.Store) { require.Nil(t, err) assert.Len(t, preferences, 1, "should've returned 1 preference") - if err = ss.Preference().DeleteCategoryAndName(category, name); err != nil { - t.Fatal(err) - } + err = ss.Preference().DeleteCategoryAndName(category, name) + require.Nil(t, err) preferences, err = ss.Preference().GetAll(userId) require.Nil(t, err)