mirror of
https://github.com/foomo/contentserver.git
synced 2025-10-16 12:25:44 +00:00
Remove dependency on testify/assert
This commit is contained in:
parent
f00b1f1eb3
commit
f40af92357
@ -7,7 +7,6 @@ import (
|
||||
"os"
|
||||
"testing"
|
||||
"time"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func testHistory() *history {
|
||||
@ -53,12 +52,13 @@ func TestHistoryOrder(t *testing.T) {
|
||||
|
||||
files, err := h.getHistory()
|
||||
|
||||
assert.NoError(t, err)
|
||||
assert.Len(t, files, 4)
|
||||
assert.Equal(t, "testdata/order/contentserver-repo-current.json", files[0])
|
||||
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-23.json", files[1])
|
||||
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-22.json", files[2])
|
||||
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-21.json", files[3])
|
||||
if err != nil {
|
||||
t.Fatal("error not expected")
|
||||
}
|
||||
assertStringEqual(t, "testdata/order/contentserver-repo-current.json", files[0])
|
||||
assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-23.json", files[1])
|
||||
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) {
|
||||
@ -66,9 +66,16 @@ func TestGetFilesForCleanup(t *testing.T) {
|
||||
h.varDir = "testdata/order"
|
||||
|
||||
files, err := h.getFilesForCleanup(2)
|
||||
|
||||
assert.NoError(t,err)
|
||||
assert.Len(t, files, 2)
|
||||
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-22.json", files[0])
|
||||
assert.Equal(t, "testdata/order/contentserver-repo-2017-10-21.json", files[1])
|
||||
if err != nil {
|
||||
t.Fatal("error not expected")
|
||||
}
|
||||
assertStringEqual(t, "testdata/order/contentserver-repo-2017-10-22.json", files[0])
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user