foomo/contentserver
1
0
Fork 0
mirror of https://github.com/foomo/contentserver.git synced 2025-10-16 12:25:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dependency on testify/assert

Browse Source
This commit is contained in:
Stefan Martinov 2017-11-01 13:38:36 +01:00
parent f00b1f1eb3
commit f40af92357
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
repo/history_test.go
View File

@ -7,7 +7,6 @@ import (
"os" "os"
"testing" "testing"
"time" "time"
"github.com/stretchr/testify/assert"
) )
func testHistory() *history { func testHistory() *history {
@ -53,12 +52,13 @@ func TestHistoryOrder(t *testing.T) {
files, err := h.getHistory() files, err := h.getHistory()
assert.NoError(t, err) if err != nil {
assert.Len(t, files, 4) t.Fatal("error not expected")
assert.Equal(t, "testdata/order/contentserver-repo-current.json", files[0]) }
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-23.json", files[1]) assertStringEqual(t, "testdata/order/contentserver-repo-current.json", files[0])
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-22.json", files[2]) assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-23.json", files[1])
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-21.json", files[3]) assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-22.json", files[2])
assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-21.json", files[3])
} }
func TestGetFilesForCleanup(t *testing.T) { func TestGetFilesForCleanup(t *testing.T) {
@ -66,9 +66,16 @@ func TestGetFilesForCleanup(t *testing.T) {
h.varDir = "testdata/order" h.varDir = "testdata/order"
files, err := h.getFilesForCleanup(2) files, err := h.getFilesForCleanup(2)
if err != nil {
assert.NoError(t,err) t.Fatal("error not expected")
assert.Len(t, files, 2) }
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-22.json", files[0]) assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-22.json", files[0])
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-21.json", files[1]) assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-21.json", files[1])
}
func assertStringEqual(t *testing.T, expected, actual string) {
if expected != actual {
t.Errorf("expected string %s differs from the actual %s", expected, actual)
}
} }