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

MM-25476: Migrate AppError from command_store.go (#14643)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Joshua Bezaleel Abednego
2020-07-16 20:26:07 +07:00
коммит произвёл GitHub
родитель 5ddf8d4099
Коммит 48f0b7fd76
13 изменённых файлов: 353 добавлений и 257 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -4,6 +4,7 @@
package storetest
import (
"errors"
"testing"
"github.com/stretchr/testify/require"
@@ -32,10 +33,10 @@ func testCommandStoreSave(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
_, err := ss.Command().Save(&o1)
require.Nil(t, err, "couldn't save item")
_, nErr := ss.Command().Save(&o1)
require.Nil(t, nErr)
_, err = ss.Command().Save(&o1)
_, err := ss.Command().Save(&o1)
require.NotNil(t, err, "shouldn't be able to update from save")
}
@@ -47,15 +48,17 @@ func testCommandStoreGet(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
r1, err := ss.Command().Get(o1.Id)
require.Nil(t, err)
r1, nErr := ss.Command().Get(o1.Id)
require.Nil(t, nErr)
require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
_, err = ss.Command().Get("123")
require.NotNil(t, err, "Mising id should have failed")
_, err := ss.Command().Get("123")
require.NotNil(t, err)
var nfErr *store.ErrNotFound
require.True(t, errors.As(err, &nfErr))
}
func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
@@ -66,16 +69,16 @@ func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
r1, err := ss.Command().GetByTeam(o1.TeamId)
require.Nil(t, err)
r1, nErr := ss.Command().GetByTeam(o1.TeamId)
require.Nil(t, nErr)
require.NotEmpty(t, r1, "no command returned")
require.Equal(t, r1[0].CreateAt, o1.CreateAt, "invalid returned command")
result, err := ss.Command().GetByTeam("123")
require.Nil(t, err)
result, nErr := ss.Command().GetByTeam("123")
require.Nil(t, nErr)
require.Empty(t, result, "no commands should have returned")
}
@@ -94,22 +97,24 @@ func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
o2.URL = "http://nowhere.com/"
o2.Trigger = "trigger1"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
_, err = ss.Command().Save(o2)
require.Nil(t, err)
_, nErr = ss.Command().Save(o2)
require.Nil(t, nErr)
var r1 *model.Command
r1, err = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger)
require.Nil(t, err)
r1, nErr = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger)
require.Nil(t, nErr)
require.Equal(t, r1.Id, o1.Id, "invalid returned command")
err = ss.Command().Delete(o1.Id, model.GetMillis())
require.Nil(t, err)
nErr = ss.Command().Delete(o1.Id, model.GetMillis())
require.Nil(t, nErr)
_, err = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger)
require.NotNil(t, err, "no commands should have returned")
_, err := ss.Command().GetByTrigger(o1.TeamId, o1.Trigger)
require.NotNil(t, err)
var nfErr *store.ErrNotFound
require.True(t, errors.As(err, &nfErr))
}
func testCommandStoreDelete(t *testing.T, ss store.Store) {
@@ -120,18 +125,20 @@ func testCommandStoreDelete(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
r1, err := ss.Command().Get(o1.Id)
require.Nil(t, err)
r1, nErr := ss.Command().Get(o1.Id)
require.Nil(t, nErr)
require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
err = ss.Command().Delete(o1.Id, model.GetMillis())
require.Nil(t, err)
nErr = ss.Command().Delete(o1.Id, model.GetMillis())
require.Nil(t, nErr)
_, err = ss.Command().Get(o1.Id)
require.NotNil(t, err, "Missing id should have failed")
_, err := ss.Command().Get(o1.Id)
require.NotNil(t, err)
var nfErr *store.ErrNotFound
require.True(t, errors.As(err, &nfErr))
}
func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
@@ -142,18 +149,20 @@ func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
r1, err := ss.Command().Get(o1.Id)
require.Nil(t, err)
r1, nErr := ss.Command().Get(o1.Id)
require.Nil(t, nErr)
require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
err = ss.Command().PermanentDeleteByTeam(o1.TeamId)
require.Nil(t, err)
nErr = ss.Command().PermanentDeleteByTeam(o1.TeamId)
require.Nil(t, nErr)
_, err = ss.Command().Get(o1.Id)
require.NotNil(t, err, "Missing id should have failed")
_, err := ss.Command().Get(o1.Id)
require.NotNil(t, err)
var nfErr *store.ErrNotFound
require.True(t, errors.As(err, &nfErr))
}
func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
@@ -164,18 +173,20 @@ func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
r1, err := ss.Command().Get(o1.Id)
require.Nil(t, err)
r1, nErr := ss.Command().Get(o1.Id)
require.Nil(t, nErr)
require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
err = ss.Command().PermanentDeleteByUser(o1.CreatorId)
require.Nil(t, err)
nErr = ss.Command().PermanentDeleteByUser(o1.CreatorId)
require.Nil(t, nErr)
_, err = ss.Command().Get(o1.Id)
require.NotNil(t, err, "Missing id should have failed")
_, err := ss.Command().Get(o1.Id)
require.NotNil(t, err)
var nfErr *store.ErrNotFound
require.True(t, errors.As(err, &nfErr))
}
func testCommandStoreUpdate(t *testing.T, ss store.Store) {
@@ -186,18 +197,18 @@ func testCommandStoreUpdate(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
o1.Token = model.NewId()
_, err = ss.Command().Update(o1)
require.Nil(t, err)
_, nErr = ss.Command().Update(o1)
require.Nil(t, nErr)
o1.URL = "junk"
_, err = ss.Command().Update(o1)
require.NotNil(t, err, "should have failed - bad URL")
_, err := ss.Command().Update(o1)
require.NotNil(t, err)
}
func testCommandCount(t *testing.T, ss store.Store) {
@@ -208,14 +219,14 @@ func testCommandCount(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1)
require.Nil(t, err)
o1, nErr := ss.Command().Save(o1)
require.Nil(t, nErr)
r1, err := ss.Command().AnalyticsCommandCount("")
require.Nil(t, err)
r1, nErr := ss.Command().AnalyticsCommandCount("")
require.Nil(t, nErr)
require.NotZero(t, r1, "should be at least 1 command")
r2, err := ss.Command().AnalyticsCommandCount(o1.TeamId)
require.Nil(t, err)
r2, nErr := ss.Command().AnalyticsCommandCount(o1.TeamId)
require.Nil(t, nErr)
require.Equal(t, r2, int64(1), "should be 1 command")
}

90
store/storetest/mocks/CommandStore.go
Просмотреть файл

@@ -15,7 +15,7 @@ type CommandStore struct {
}
// AnalyticsCommandCount provides a mock function with given fields: teamId
func (_m *CommandStore) AnalyticsCommandCount(teamId string) (int64, *model.AppError) {
func (_m *CommandStore) AnalyticsCommandCount(teamId string) (int64, error) {
ret := _m.Called(teamId)
var r0 int64
@@ -25,36 +25,32 @@ func (_m *CommandStore) AnalyticsCommandCount(teamId string) (int64, *model.AppE
r0 = ret.Get(0).(int64)
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(teamId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Delete provides a mock function with given fields: commandId, time
func (_m *CommandStore) Delete(commandId string, time int64) *model.AppError {
func (_m *CommandStore) Delete(commandId string, time int64) error {
ret := _m.Called(commandId, time)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string, int64) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string, int64) error); ok {
r0 = rf(commandId, time)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Get provides a mock function with given fields: id
func (_m *CommandStore) Get(id string) (*model.Command, *model.AppError) {
func (_m *CommandStore) Get(id string) (*model.Command, error) {
ret := _m.Called(id)
var r0 *model.Command
@@ -66,20 +62,18 @@ func (_m *CommandStore) Get(id string) (*model.Command, *model.AppError) {
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(id)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByTeam provides a mock function with given fields: teamId
func (_m *CommandStore) GetByTeam(teamId string) ([]*model.Command, *model.AppError) {
func (_m *CommandStore) GetByTeam(teamId string) ([]*model.Command, error) {
ret := _m.Called(teamId)
var r0 []*model.Command
@@ -91,20 +85,18 @@ func (_m *CommandStore) GetByTeam(teamId string) ([]*model.Command, *model.AppEr
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string) error); ok {
r1 = rf(teamId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// GetByTrigger provides a mock function with given fields: teamId, trigger
func (_m *CommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, *model.AppError) {
func (_m *CommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) {
ret := _m.Called(teamId, trigger)
var r0 *model.Command
@@ -116,52 +108,46 @@ func (_m *CommandStore) GetByTrigger(teamId string, trigger string) (*model.Comm
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, string) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(string, string) error); ok {
r1 = rf(teamId, trigger)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// PermanentDeleteByTeam provides a mock function with given fields: teamId
func (_m *CommandStore) PermanentDeleteByTeam(teamId string) *model.AppError {
func (_m *CommandStore) PermanentDeleteByTeam(teamId string) error {
ret := _m.Called(teamId)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(teamId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// PermanentDeleteByUser provides a mock function with given fields: userId
func (_m *CommandStore) PermanentDeleteByUser(userId string) *model.AppError {
func (_m *CommandStore) PermanentDeleteByUser(userId string) error {
ret := _m.Called(userId)
var r0 *model.AppError
if rf, ok := ret.Get(0).(func(string) *model.AppError); ok {
var r0 error
if rf, ok := ret.Get(0).(func(string) error); ok {
r0 = rf(userId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).(*model.AppError)
}
r0 = ret.Error(0)
}
return r0
}
// Save provides a mock function with given fields: webhook
func (_m *CommandStore) Save(webhook *model.Command) (*model.Command, *model.AppError) {
func (_m *CommandStore) Save(webhook *model.Command) (*model.Command, error) {
ret := _m.Called(webhook)
var r0 *model.Command
@@ -173,20 +159,18 @@ func (_m *CommandStore) Save(webhook *model.Command) (*model.Command, *model.App
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Command) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Command) error); ok {
r1 = rf(webhook)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1
}
// Update provides a mock function with given fields: hook
func (_m *CommandStore) Update(hook *model.Command) (*model.Command, *model.AppError) {
func (_m *CommandStore) Update(hook *model.Command) (*model.Command, error) {
ret := _m.Called(hook)
var r0 *model.Command
@@ -198,13 +182,11 @@ func (_m *CommandStore) Update(hook *model.Command) (*model.Command, *model.AppE
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(*model.Command) *model.AppError); ok {
var r1 error
if rf, ok := ret.Get(1).(func(*model.Command) error); ok {
r1 = rf(hook)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
r1 = ret.Error(1)
}
return r0, r1