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

Replacing {require,assert}.{Nil,NotNil} with {require,assert}.{NoError,Error} in the store tests (when comparing errors) (#16886)

Просмотр исходного кода 
* Replacing require.Nil with require.NoError

* More replacements

* More Nil/NotNill to NoError/Error

* Other detected errors

* renaming apperr to err

* Removed not needed line

* Rename old appErr variables that are no longer model.AppError values

* Fixing tiny typo

* Reverting changes outside the store (accidentally added)

* Apply suggestions from code review

Co-authored-by: Doug Lauder <wiggin77@warpmail.net>

Co-authored-by: Doug Lauder <wiggin77@warpmail.net>
Этот коммит содержится в:
Jesús Espino
2021-02-10 11:34:41 +01:00
коммит произвёл GitHub
родитель 5f043b0a08
Коммит 0e9ad9f7f8
56 изменённых файлов: 5061 добавлений и 5106 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -39,7 +39,7 @@ func setupKVs(t *testing.T, ss store.Store) (string, func()) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(otherKV)
require.Nil(t, err)
require.NoError(t, err)
// otherPluginKV is a key value for another plugin, and used to verify other plugins' keys
// aren't modified unintentionally.
@@ -50,15 +50,15 @@ func setupKVs(t *testing.T, ss store.Store) (string, func()) {
ExpireAt: 0,
}
_, err = ss.Plugin().SaveOrUpdate(otherPluginKV)
require.Nil(t, err)
require.NoError(t, err)
return pluginId, func() {
actualOtherKV, err := ss.Plugin().Get(otherKV.PluginId, otherKV.Key)
require.Nil(t, err, "failed to find other key value for same plugin")
require.NoError(t, err, "failed to find other key value for same plugin")
assert.Equal(t, otherKV, actualOtherKV)
actualOtherPluginKV, err := ss.Plugin().Get(otherPluginKV.PluginId, otherPluginKV.Key)
require.Nil(t, err, "failed to find other key value from different plugin")
require.NoError(t, err, "failed to find other key value from different plugin")
assert.Equal(t, otherPluginKV, actualOtherPluginKV)
}
}
@@ -76,7 +76,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
}
kv, err := doer(kv)
require.NotNil(t, err)
require.Error(t, err)
appErr, ok := err.(*model.AppError)
require.True(t, ok)
require.Equal(t, "model.plugin_key_value.is_valid.plugin_id.app_error", appErr.Id)
@@ -99,7 +99,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
}
retKV, err := doer(kv)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kv, retKV)
// SaveOrUpdate returns the kv passed in, so test each field individually for
// completeness. It should probably be changed to not bother doing that.
@@ -109,7 +109,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
assert.Equal(t, expireAt, kv.ExpireAt)
actualKV, nErr := ss.Plugin().Get(pluginId, key)
require.Nil(t, nErr)
require.NoError(t, nErr)
assert.Equal(t, kv, actualKV)
})
@@ -129,7 +129,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
}
retKV, err := doer(kv)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kv, retKV)
// SaveOrUpdate returns the kv passed in, so test each field individually for
// completeness. It should probably be changed to not bother doing that.
@@ -140,7 +140,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
actualKV, nErr := ss.Plugin().Get(pluginId, key)
_, ok := nErr.(*store.ErrNotFound)
require.NotNil(t, nErr)
require.Error(t, nErr)
assert.True(t, ok)
assert.Nil(t, actualKV)
})
@@ -161,13 +161,13 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
}
_, err := doer(kv)
require.Nil(t, err)
require.NoError(t, err)
newValue := model.NewId()
kv.Value = []byte(newValue)
retKV, err := doer(kv)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kv, retKV)
// SaveOrUpdate returns the kv passed in, so test each field individually for
// completeness. It should probably be changed to not bother doing that.
@@ -177,7 +177,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
assert.Equal(t, expireAt, kv.ExpireAt)
actualKV, nErr := ss.Plugin().Get(pluginId, key)
require.Nil(t, nErr)
require.NoError(t, nErr)
assert.Equal(t, kv, actualKV)
})
@@ -197,12 +197,12 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
}
_, err := doer(kv)
require.Nil(t, err)
require.NoError(t, err)
kv.Value = nil
retKV, err := doer(kv)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kv, retKV)
// SaveOrUpdate returns the kv passed in, so test each field individually for
// completeness. It should probably be changed to not bother doing that.
@@ -213,7 +213,7 @@ func doTestPluginSaveOrUpdate(t *testing.T, ss store.Store, doer func(kv *model.
actualKV, nErr := ss.Plugin().Get(pluginId, key)
_, ok := nErr.(*store.ErrNotFound)
require.NotNil(t, nErr)
require.Error(t, nErr)
assert.True(t, ok)
assert.Nil(t, actualKV)
})
@@ -240,7 +240,7 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func(
}
ok, err := compareAndSet(kv, nil)
require.NotNil(t, err)
require.Error(t, err)
assert.False(t, ok)
appErr, ok := err.(*model.AppError)
require.True(t, ok)
@@ -252,11 +252,11 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func(
t.Helper()
ok, err := compareAndSet(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
require.True(t, ok, "should have succeeded to CompareAndSet")
actualKV, nErr := ss.Plugin().Get(kv.PluginId, kv.Key)
require.Nil(t, nErr)
require.NoError(t, nErr)
// When tested with KVSetWithOptions, a strict comparison can fail because that
// function accepts a relative time and makes its own call to model.GetMillis(),
@@ -277,17 +277,17 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func(
t.Helper()
ok, err := compareAndSet(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
require.False(t, ok, "should have failed to CompareAndSet")
actualKV, nErr := ss.Plugin().Get(kv.PluginId, kv.Key)
if existingKV == nil {
require.NotNil(t, nErr)
require.Error(t, nErr)
_, ok := nErr.(*store.ErrNotFound)
assert.True(t, ok)
assert.Nil(t, actualKV)
} else {
require.Nil(t, nErr)
require.NoError(t, nErr)
assert.Equal(t, existingKV, actualKV)
}
}
@@ -297,12 +297,12 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func(
t.Helper()
ok, err := compareAndSet(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
require.True(t, ok, "should have succeeded to CompareAndSet")
actualKV, nErr := ss.Plugin().Get(kv.PluginId, kv.Key)
_, ok = nErr.(*store.ErrNotFound)
require.NotNil(t, nErr)
require.Error(t, nErr)
assert.True(t, ok)
assert.Nil(t, actualKV)
}
@@ -331,7 +331,7 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func(
ExpireAt: 1,
}
_, err := ss.Plugin().SaveOrUpdate(expiredKV)
require.Nil(t, err)
require.NoError(t, err)
return expiredKV, tearDown
},
@@ -407,7 +407,7 @@ func doTestPluginCompareAndSet(t *testing.T, ss store.Store, compareAndSet func(
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(existingKV)
require.Nil(t, err)
require.NoError(t, err)
return existingKV, tearDown
}
@@ -543,7 +543,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) {
}
ok, err := ss.Plugin().CompareAndDelete(kv, nil)
require.NotNil(t, err)
require.Error(t, err)
assert.False(t, ok)
appErr, ok := err.(*model.AppError)
require.True(t, ok)
@@ -573,7 +573,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) {
for description, oldValue := range testCases {
t.Run(description, func(t *testing.T) {
ok, err := ss.Plugin().CompareAndDelete(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
assert.False(t, ok)
})
}
@@ -594,7 +594,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) {
ExpireAt: expireAt,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
testCases := map[string][]byte{
"given nil old value": nil,
@@ -605,7 +605,7 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) {
for description, oldValue := range testCases {
t.Run(description, func(t *testing.T) {
ok, err := ss.Plugin().CompareAndDelete(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
assert.False(t, ok)
})
}
@@ -626,12 +626,12 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) {
ExpireAt: expireAt,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
oldValue := []byte(model.NewId())
ok, err := ss.Plugin().CompareAndDelete(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
assert.False(t, ok)
})
@@ -650,12 +650,12 @@ func testPluginCompareAndDelete(t *testing.T, ss store.Store) {
ExpireAt: expireAt,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
oldValue := []byte(value)
ok, err := ss.Plugin().CompareAndDelete(kv, oldValue)
require.Nil(t, err)
require.NoError(t, err)
assert.True(t, ok)
})
}
@@ -674,7 +674,7 @@ func testPluginSetWithOptions(t *testing.T, ss store.Store) {
}
ok, err := ss.Plugin().SetWithOptions(pluginId, key, []byte(value), options)
require.NotNil(t, err)
require.Error(t, err)
assert.False(t, ok)
appErr, ok := err.(*model.AppError)
require.True(t, ok)
@@ -691,7 +691,7 @@ func testPluginSetWithOptions(t *testing.T, ss store.Store) {
options := model.PluginKVSetOptions{}
ok, err := ss.Plugin().SetWithOptions(pluginId, key, []byte(value), options)
require.NotNil(t, err)
require.Error(t, err)
assert.False(t, ok)
appErr, ok := err.(*model.AppError)
require.True(t, ok)
@@ -741,7 +741,7 @@ func testPluginGet(t *testing.T, ss store.Store) {
kv, nErr := ss.Plugin().Get(pluginId, key)
_, ok := nErr.(*store.ErrNotFound)
require.NotNil(t, nErr)
require.Error(t, nErr)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -760,11 +760,11 @@ func testPluginGet(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
kv, err = ss.Plugin().Get(model.NewId(), key)
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -783,11 +783,11 @@ func testPluginGet(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
kv, err = ss.Plugin().Get(pluginId, model.NewId())
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -806,11 +806,11 @@ func testPluginGet(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
kv, err = ss.Plugin().Get(pluginId, model.NewId())
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -829,11 +829,11 @@ func testPluginGet(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
kv, err = ss.Plugin().Get(pluginId, model.NewId())
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -852,10 +852,10 @@ func testPluginGet(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
actualKV, err := ss.Plugin().Get(pluginId, key)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, kv, actualKV)
})
@@ -873,10 +873,10 @@ func testPluginGet(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
actualKV, err := ss.Plugin().Get(pluginId, key)
require.Nil(t, err)
require.NoError(t, err)
require.Equal(t, kv, actualKV)
})
}
@@ -889,11 +889,11 @@ func testPluginDelete(t *testing.T, ss store.Store) {
key := model.NewId()
err := ss.Plugin().Delete(pluginId, key)
require.Nil(t, err)
require.NoError(t, err)
kv, err := ss.Plugin().Get(pluginId, key)
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -933,14 +933,14 @@ func testPluginDelete(t *testing.T, ss store.Store) {
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
err = ss.Plugin().Delete(pluginId, key)
require.Nil(t, err)
require.NoError(t, err)
kv, err = ss.Plugin().Get(pluginId, key)
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, kv)
})
@@ -961,11 +961,11 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(otherPluginKV)
require.Nil(t, err)
require.NoError(t, err)
return pluginId, func() {
actualOtherPluginKV, err := ss.Plugin().Get(otherPluginKV.PluginId, otherPluginKV.Key)
require.Nil(t, err, "failed to find other key value from different plugin")
require.NoError(t, err, "failed to find other key value from different plugin")
assert.Equal(t, otherPluginKV, actualOtherPluginKV)
}
}
@@ -975,7 +975,7 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) {
defer tearDown()
err := ss.Plugin().DeleteAllForPlugin(pluginId)
require.Nil(t, err)
require.NoError(t, err)
})
t.Run("multiple keys to delete", func(t *testing.T) {
@@ -989,7 +989,7 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
kv2 := &model.PluginKeyValue{
PluginId: pluginId,
@@ -998,19 +998,19 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err = ss.Plugin().SaveOrUpdate(kv2)
require.Nil(t, err)
require.NoError(t, err)
err = ss.Plugin().DeleteAllForPlugin(pluginId)
require.Nil(t, err)
require.NoError(t, err)
_, err = ss.Plugin().Get(kv.PluginId, kv.Key)
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
_, err = ss.Plugin().Get(kv.PluginId, kv2.Key)
_, ok = err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
})
}
@@ -1018,7 +1018,7 @@ func testPluginDeleteAllForPlugin(t *testing.T, ss store.Store) {
func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
t.Run("no keys", func(t *testing.T) {
err := ss.Plugin().DeleteAllExpired()
require.Nil(t, err)
require.NoError(t, err)
})
t.Run("no expiring keys to delete", func(t *testing.T) {
@@ -1032,7 +1032,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(kvA1)
require.Nil(t, err)
require.NoError(t, err)
kvA2 := &model.PluginKeyValue{
PluginId: pluginIdA,
@@ -1041,7 +1041,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err = ss.Plugin().SaveOrUpdate(kvA2)
require.Nil(t, err)
require.NoError(t, err)
kvB1 := &model.PluginKeyValue{
PluginId: pluginIdB,
@@ -1050,7 +1050,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err = ss.Plugin().SaveOrUpdate(kvB1)
require.Nil(t, err)
require.NoError(t, err)
kvB2 := &model.PluginKeyValue{
PluginId: pluginIdB,
@@ -1059,25 +1059,25 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err = ss.Plugin().SaveOrUpdate(kvB2)
require.Nil(t, err)
require.NoError(t, err)
err = ss.Plugin().DeleteAllExpired()
require.Nil(t, err)
require.NoError(t, err)
actualKVA1, err := ss.Plugin().Get(pluginIdA, kvA1.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvA1, actualKVA1)
actualKVA2, err := ss.Plugin().Get(pluginIdA, kvA2.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvA2, actualKVA2)
actualKVB1, err := ss.Plugin().Get(pluginIdB, kvB1.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvB1, actualKVB1)
actualKVB2, err := ss.Plugin().Get(pluginIdB, kvB2.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvB2, actualKVB2)
})
@@ -1092,7 +1092,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() + 15*1000,
}
_, err := ss.Plugin().SaveOrUpdate(kvA1)
require.Nil(t, err)
require.NoError(t, err)
kvA2 := &model.PluginKeyValue{
PluginId: pluginIdA,
@@ -1101,7 +1101,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() + 15*1000,
}
_, err = ss.Plugin().SaveOrUpdate(kvA2)
require.Nil(t, err)
require.NoError(t, err)
kvB1 := &model.PluginKeyValue{
PluginId: pluginIdB,
@@ -1110,7 +1110,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() + 15*1000,
}
_, err = ss.Plugin().SaveOrUpdate(kvB1)
require.Nil(t, err)
require.NoError(t, err)
kvB2 := &model.PluginKeyValue{
PluginId: pluginIdB,
@@ -1119,25 +1119,25 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() + 15*1000,
}
_, err = ss.Plugin().SaveOrUpdate(kvB2)
require.Nil(t, err)
require.NoError(t, err)
err = ss.Plugin().DeleteAllExpired()
require.Nil(t, err)
require.NoError(t, err)
actualKVA1, err := ss.Plugin().Get(pluginIdA, kvA1.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvA1, actualKVA1)
actualKVA2, err := ss.Plugin().Get(pluginIdA, kvA2.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvA2, actualKVA2)
actualKVB1, err := ss.Plugin().Get(pluginIdB, kvB1.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvB1, actualKVB1)
actualKVB2, err := ss.Plugin().Get(pluginIdB, kvB2.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvB2, actualKVB2)
})
@@ -1152,7 +1152,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() + 15*1000,
}
_, err := ss.Plugin().SaveOrUpdate(kvA1)
require.Nil(t, err)
require.NoError(t, err)
expiredKVA2 := &model.PluginKeyValue{
PluginId: pluginIdA,
@@ -1161,7 +1161,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() - 15*1000,
}
_, err = ss.Plugin().SaveOrUpdate(expiredKVA2)
require.Nil(t, err)
require.NoError(t, err)
kvB1 := &model.PluginKeyValue{
PluginId: pluginIdB,
@@ -1170,7 +1170,7 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() + 15*1000,
}
_, err = ss.Plugin().SaveOrUpdate(kvB1)
require.Nil(t, err)
require.NoError(t, err)
expiredKVB2 := &model.PluginKeyValue{
PluginId: pluginIdB,
@@ -1179,28 +1179,28 @@ func testPluginDeleteAllExpired(t *testing.T, ss store.Store) {
ExpireAt: model.GetMillis() - 15*1000,
}
_, err = ss.Plugin().SaveOrUpdate(expiredKVB2)
require.Nil(t, err)
require.NoError(t, err)
err = ss.Plugin().DeleteAllExpired()
require.Nil(t, err)
require.NoError(t, err)
actualKVA1, err := ss.Plugin().Get(pluginIdA, kvA1.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvA1, actualKVA1)
actualKVA2, err := ss.Plugin().Get(pluginIdA, expiredKVA2.Key)
_, ok := err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, actualKVA2)
actualKVB1, err := ss.Plugin().Get(pluginIdB, kvB1.Key)
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, kvB1, actualKVB1)
actualKVB2, err := ss.Plugin().Get(pluginIdB, expiredKVB2.Key)
_, ok = err.(*store.ErrNotFound)
require.NotNil(t, err)
require.Error(t, err)
assert.True(t, ok)
assert.Nil(t, actualKVB2)
})
@@ -1214,7 +1214,7 @@ func testPluginList(t *testing.T, ss store.Store) {
// Ignore the pluginId setup by setupKVs
pluginId := model.NewId()
keys, err := ss.Plugin().List(pluginId, 0, 100)
require.Nil(t, err)
require.NoError(t, err)
assert.Empty(t, keys)
})
@@ -1232,10 +1232,10 @@ func testPluginList(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
keys, err := ss.Plugin().List(pluginId, 0, 100)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys, 1)
assert.Equal(t, kv.Key, keys[0])
})
@@ -1257,18 +1257,18 @@ func testPluginList(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
keys = append(keys, key)
}
sort.Strings(keys)
keys1, err := ss.Plugin().List(pluginId, 0, 100)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys1, 100)
keys2, err := ss.Plugin().List(pluginId, 100, 100)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys2, 50)
actualKeys := append(keys1, keys2...)
@@ -1307,7 +1307,7 @@ func testPluginList(t *testing.T, ss store.Store) {
ExpireAt: expireAt,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
if expireAt == 0 || expireAt > now {
keys = append(keys, key)
@@ -1318,11 +1318,11 @@ func testPluginList(t *testing.T, ss store.Store) {
sort.Strings(keys)
keys1, err := ss.Plugin().List(pluginId, 0, 100)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys1, 100)
keys2, err := ss.Plugin().List(pluginId, 100, 100)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys2, 35)
actualKeys := append(keys1, keys2...)
@@ -1348,7 +1348,7 @@ func testPluginList(t *testing.T, ss store.Store) {
ExpireAt: 0,
}
_, err := ss.Plugin().SaveOrUpdate(kv)
require.Nil(t, err)
require.NoError(t, err)
keys = append(keys, key)
}
@@ -1356,19 +1356,19 @@ func testPluginList(t *testing.T, ss store.Store) {
t.Run("default limit", func(t *testing.T) {
keys1, err := ss.Plugin().List(pluginId, 0, 0)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys1, 10)
})
t.Run("offset 0, limit 1", func(t *testing.T) {
keys2, err := ss.Plugin().List(pluginId, 0, 1)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys2, 1)
})
t.Run("offset 1, limit 1", func(t *testing.T) {
keys2, err := ss.Plugin().List(pluginId, 1, 1)
require.Nil(t, err)
require.NoError(t, err)
require.Len(t, keys2, 1)
})
})