mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

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
Этот коммит содержится в:
Nikhil Ranjan
2019-10-28 22:23:55 +01:00
коммит произвёл Joram Wilander
родитель fdcda20fe4
Коммит 7bcb835f37
1 изменённых файлов: 39 добавлений и 55 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

92
store/storetest/preference_store.go
Просмотреть файл

@@ -42,26 +42,22 @@ func testPreferenceSave(t *testing.T, ss store.Store) {
Value: "value1b", Value: "value1b",
}, },
} }
if err := ss.Preference().Save(&preferences); err != nil { err := ss.Preference().Save(&preferences)
t.Fatal("saving preference returned error") require.Nil(t, err, "saving preference returned error")
}
for _, preference := range preferences { for _, preference := range preferences {
if data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name); preference.ToJson() != data.ToJson() { data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name)
t.Fatal("got incorrect preference after first Save") require.Equal(t, data.ToJson(), preference.ToJson(), "got incorrect preference after first Save")
}
} }
preferences[0].Value = "value2a" preferences[0].Value = "value2a"
preferences[1].Value = "value2b" preferences[1].Value = "value2b"
if err := ss.Preference().Save(&preferences); err != nil { err = ss.Preference().Save(&preferences)
t.Fatal("saving preference returned error") require.Nil(t, err, "saving preference returned error")
}
for _, preference := range preferences { for _, preference := range preferences {
if data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name); preference.ToJson() != data.ToJson() { data, _ := ss.Preference().Get(preference.UserId, preference.Category, preference.Name)
t.Fatal("got incorrect preference after second Save") 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) err := ss.Preference().Save(&preferences)
require.Nil(t, err) require.Nil(t, err)
if data, err := ss.Preference().Get(userId, category, name); err != nil { data, err := ss.Preference().Get(userId, category, name)
t.Fatal(err) require.Nil(t, err)
} else if data.ToJson() != preferences[0].ToJson() { require.Equal(t, preferences[0].ToJson(), data.ToJson(), "got incorrect preference")
t.Fatal("got incorrect preference")
}
// make sure getting a missing preference fails // make sure getting a missing preference fails
if _, err := ss.Preference().Get(model.NewId(), model.NewId(), model.NewId()); err == nil { _, err = ss.Preference().Get(model.NewId(), model.NewId(), model.NewId())
t.Fatal("no error on getting a missing preference") require.NotNil(t, err, "no error on getting a missing preference")
}
} }
func testPreferenceGetCategory(t *testing.T, ss store.Store) { 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) err := ss.Preference().Save(&preferences)
require.Nil(t, err) require.Nil(t, err)
if preferencesByCategory, err := ss.Preference().GetCategory(userId, category); err != nil { preferencesByCategory, err := ss.Preference().GetCategory(userId, category)
t.Fatal(err) require.Nil(t, err)
} else if len(preferencesByCategory) != 2 { require.Equal(t, 2, len(preferencesByCategory), "got the wrong number of preferences")
t.Fatal("got the wrong number of preferences") require.True(
} else if !((preferencesByCategory[0] == preferences[0] && preferencesByCategory[1] == preferences[1]) || (preferencesByCategory[0] == preferences[1] && preferencesByCategory[1] == preferences[0])) { t,
t.Fatal("got incorrect preferences") ((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 // make sure getting a missing preference category doesn't fail
if preferencesByCategory, err := ss.Preference().GetCategory(model.NewId(), model.NewId()); err != nil { preferencesByCategory, err = ss.Preference().GetCategory(model.NewId(), model.NewId())
t.Fatal(err) require.Nil(t, err)
} else if len(preferencesByCategory) != 0 { require.Equal(t, 0, len(preferencesByCategory), "shouldn't have got any preferences")
t.Fatal("shouldn't have got any preferences")
}
} }
func testPreferenceGetAll(t *testing.T, ss store.Store) { 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) err := ss.Preference().Save(&preferences)
require.Nil(t, err) require.Nil(t, err)
if result, err := ss.Preference().GetAll(userId); err != nil { result, err := ss.Preference().GetAll(userId)
t.Fatal(err) require.Nil(t, err)
} else if len(result) != 3 { require.Equal(t, 3, len(result), "got the wrong number of preferences")
t.Fatal("got the wrong number of preferences")
} else {
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
if result[0] != preferences[i] && result[1] != preferences[i] && result[2] != preferences[i] { assert.Falsef(t, result[0] != preferences[i] && result[1] != preferences[i] && result[2] != preferences[i], "got incorrect preferences")
t.Fatal("got incorrect preferences")
}
}
} }
} }
func testPreferenceDeleteByUser(t *testing.T, ss store.Store) { 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) err := ss.Preference().Save(&preferences)
require.Nil(t, err) require.Nil(t, err)
if err := ss.Preference().PermanentDeleteByUser(userId); err != nil { err = ss.Preference().PermanentDeleteByUser(userId)
t.Fatal(err) require.Nil(t, err)
}
} }
func testPreferenceDelete(t *testing.T, ss store.Store) { func testPreferenceDelete(t *testing.T, ss store.Store) {
@@ -259,13 +247,11 @@ func testPreferenceDelete(t *testing.T, ss store.Store) {
require.Nil(t, err) require.Nil(t, err)
assert.Len(t, preferences, 1, "should've returned 1 preference") assert.Len(t, preferences, 1, "should've returned 1 preference")
if err = ss.Preference().Delete(preference.UserId, preference.Category, preference.Name); err != nil { err = ss.Preference().Delete(preference.UserId, preference.Category, preference.Name)
t.Fatal(err) require.Nil(t, err)
}
preferences, err = ss.Preference().GetAll(preference.UserId) preferences, err = ss.Preference().GetAll(preference.UserId)
require.Nil(t, err) require.Nil(t, err)
assert.Len(t, preferences, 0, "should've returned no preferences") assert.Len(t, preferences, 0, "should've returned no preferences")
} }
func testPreferenceDeleteCategory(t *testing.T, ss store.Store) { func testPreferenceDeleteCategory(t *testing.T, ss store.Store) {
@@ -293,9 +279,8 @@ func testPreferenceDeleteCategory(t *testing.T, ss store.Store) {
require.Nil(t, err) require.Nil(t, err)
assert.Len(t, preferences, 2, "should've returned 2 preferences") assert.Len(t, preferences, 2, "should've returned 2 preferences")
if err = ss.Preference().DeleteCategory(userId, category); err != nil { err = ss.Preference().DeleteCategory(userId, category)
t.Fatal(err) require.Nil(t, err)
}
preferences, err = ss.Preference().GetAll(userId) preferences, err = ss.Preference().GetAll(userId)
require.Nil(t, err) require.Nil(t, err)
@@ -333,9 +318,8 @@ func testPreferenceDeleteCategoryAndName(t *testing.T, ss store.Store) {
require.Nil(t, err) require.Nil(t, err)
assert.Len(t, preferences, 1, "should've returned 1 preference") assert.Len(t, preferences, 1, "should've returned 1 preference")
if err = ss.Preference().DeleteCategoryAndName(category, name); err != nil { err = ss.Preference().DeleteCategoryAndName(category, name)
t.Fatal(err) require.Nil(t, err)
}
preferences, err = ss.Preference().GetAll(userId) preferences, err = ss.Preference().GetAll(userId)
require.Nil(t, err) require.Nil(t, err)