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

store/storetest: migrate command_store.go to use testify (#12797)

Просмотр исходного кода 
* Modify the calls to t.Fatal to using require package

* Fixes according to suggestions
Этот коммит содержится в:
Joshua Bezaleel Abednego
2019-10-18 00:45:40 +07:00
коммит произвёл Christopher Speller
родитель 4a6cf29d4e
Коммит db97b49e7a
1 изменённых файлов: 66 добавлений и 132 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -6,6 +6,8 @@ package storetest
import ( import (
"testing" "testing"
"github.com/stretchr/testify/require"
"github.com/mattermost/mattermost-server/model" "github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/store" "github.com/mattermost/mattermost-server/store"
) )
@@ -30,13 +32,11 @@ func testCommandStoreSave(t *testing.T, ss store.Store) {
o1.URL = "http://nowhere.com/" o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger" o1.Trigger = "trigger"
if _, err := ss.Command().Save(&o1); err != nil { _, err := ss.Command().Save(&o1)
t.Fatal("couldn't save item", err) require.Nil(t, err, "couldn't save item")
}
if _, err := ss.Command().Save(&o1); err == nil { _, err = ss.Command().Save(&o1)
t.Fatal("shouldn't be able to update from save") require.NotNil(t, err, "shouldn't be able to update from save")
}
} }
func testCommandStoreGet(t *testing.T, ss store.Store) { func testCommandStoreGet(t *testing.T, ss store.Store) {
@@ -48,21 +48,14 @@ func testCommandStoreGet(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if r1, err := ss.Command().Get(o1.Id); err != nil { r1, err := ss.Command().Get(o1.Id)
t.Fatal(err) require.Nil(t, err)
} else { require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
if r1.CreateAt != o1.CreateAt {
t.Fatal("invalid returned command")
}
}
if _, err := ss.Command().Get("123"); err == nil { _, err = ss.Command().Get("123")
t.Fatal("Missing id should have failed") require.NotNil(t, err, "Mising id should have failed")
}
} }
func testCommandStoreGetByTeam(t *testing.T, ss store.Store) { func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
@@ -74,25 +67,16 @@ func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if r1, err := ss.Command().GetByTeam(o1.TeamId); err != nil { r1, err := ss.Command().GetByTeam(o1.TeamId)
t.Fatal(err) require.Nil(t, err)
} else { require.NotEmpty(t, r1, "no command returned")
if r1[0].CreateAt != o1.CreateAt { require.Equal(t, r1[0].CreateAt, o1.CreateAt, "invalid returned command")
t.Fatal("invalid returned command")
}
}
if result, err := ss.Command().GetByTeam("123"); err != nil { result, err := ss.Command().GetByTeam("123")
t.Fatal(err) require.Nil(t, err)
} else { require.Empty(t, result, "no commands should have returned")
if len(result) != 0 {
t.Fatal("no commands should have returned")
}
}
} }
func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) { func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
@@ -111,30 +95,21 @@ func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
o2.Trigger = "trigger1" o2.Trigger = "trigger1"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
_, err = ss.Command().Save(o2) _, err = ss.Command().Save(o2)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
var r1 *model.Command var r1 *model.Command
if r1, err = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger); err != nil { r1, err = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger)
t.Fatal(err) require.Nil(t, err)
} else { require.Equal(t, r1.Id, o1.Id, "invalid returned command")
if r1.Id != o1.Id {
t.Fatal("invalid returned command")
}
}
err = ss.Command().Delete(o1.Id, model.GetMillis()) err = ss.Command().Delete(o1.Id, model.GetMillis())
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if _, err := ss.Command().GetByTrigger(o1.TeamId, o1.Trigger); err == nil { _, err = ss.Command().GetByTrigger(o1.TeamId, o1.Trigger)
t.Fatal("no commands should have returned") require.NotNil(t, err, "no commands should have returned")
}
} }
func testCommandStoreDelete(t *testing.T, ss store.Store) { func testCommandStoreDelete(t *testing.T, ss store.Store) {
@@ -146,26 +121,17 @@ func testCommandStoreDelete(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if r1, err := ss.Command().Get(o1.Id); err != nil { r1, err := ss.Command().Get(o1.Id)
t.Fatal(err) require.Nil(t, err)
} else { require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
if r1.CreateAt != o1.CreateAt {
t.Fatal("invalid returned command")
}
}
if err := ss.Command().Delete(o1.Id, model.GetMillis()); err != nil { err = ss.Command().Delete(o1.Id, model.GetMillis())
t.Fatal(err) require.Nil(t, err)
}
if r3, err := ss.Command().Get(o1.Id); err == nil { _, err = ss.Command().Get(o1.Id)
t.Log(r3) require.NotNil(t, err, "Missing id should have failed")
t.Fatal("Missing id should have failed")
}
} }
func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) { func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
@@ -177,26 +143,17 @@ func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if r1, err := ss.Command().Get(o1.Id); err != nil { r1, err := ss.Command().Get(o1.Id)
t.Fatal(err) require.Nil(t, err)
} else { require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
if r1.CreateAt != o1.CreateAt {
t.Fatal("invalid returned command")
}
}
if err := ss.Command().PermanentDeleteByTeam(o1.TeamId); err != nil { err = ss.Command().PermanentDeleteByTeam(o1.TeamId)
t.Fatal(err) require.Nil(t, err)
}
if r3, err := ss.Command().Get(o1.Id); err == nil { _, err = ss.Command().Get(o1.Id)
t.Log(r3) require.NotNil(t, err, "Missing id should have failed")
t.Fatal("Missing id should have failed")
}
} }
func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) { func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
@@ -208,26 +165,17 @@ func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if r1, err := ss.Command().Get(o1.Id); err != nil { r1, err := ss.Command().Get(o1.Id)
t.Fatal(err) require.Nil(t, err)
} else { require.Equal(t, r1.CreateAt, o1.CreateAt, "invalid returned command")
if r1.CreateAt != o1.CreateAt {
t.Fatal("invalid returned command")
}
}
if err := ss.Command().PermanentDeleteByUser(o1.CreatorId); err != nil { err = ss.Command().PermanentDeleteByUser(o1.CreatorId)
t.Fatal(err) require.Nil(t, err)
}
if r3, err := ss.Command().Get(o1.Id); err == nil { _, err = ss.Command().Get(o1.Id)
t.Log(r3) require.NotNil(t, err, "Missing id should have failed")
t.Fatal("Missing id should have failed")
}
} }
func testCommandStoreUpdate(t *testing.T, ss store.Store) { func testCommandStoreUpdate(t *testing.T, ss store.Store) {
@@ -239,21 +187,17 @@ func testCommandStoreUpdate(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
o1.Token = model.NewId() o1.Token = model.NewId()
if _, err := ss.Command().Update(o1); err != nil { _, err = ss.Command().Update(o1)
t.Fatal(err) require.Nil(t, err)
}
o1.URL = "junk" o1.URL = "junk"
if _, err := ss.Command().Update(o1); err == nil { _, err = ss.Command().Update(o1)
t.Fatal("should have failed - bad URL") require.NotNil(t, err, "should have failed - bad URL")
}
} }
func testCommandCount(t *testing.T, ss store.Store) { func testCommandCount(t *testing.T, ss store.Store) {
@@ -265,23 +209,13 @@ func testCommandCount(t *testing.T, ss store.Store) {
o1.Trigger = "trigger" o1.Trigger = "trigger"
o1, err := ss.Command().Save(o1) o1, err := ss.Command().Save(o1)
if err != nil { require.Nil(t, err)
t.Fatal(err)
}
if r1, err := ss.Command().AnalyticsCommandCount(""); err != nil { r1, err := ss.Command().AnalyticsCommandCount("")
t.Fatal(err) require.Nil(t, err)
} else { require.NotZero(t, r1, "should be at least 1 command")
if r1 == 0 {
t.Fatal("should be at least 1 command")
}
}
if r2, err := ss.Command().AnalyticsCommandCount(o1.TeamId); err != nil { r2, err := ss.Command().AnalyticsCommandCount(o1.TeamId)
t.Fatal(err) require.Nil(t, err)
} else { require.Equal(t, r2, int64(1), "should be 1 command")
if r2 != 1 {
t.Fatal("should be 1 command")
}
}
} }