Replacing testify/assert by testify/require

This commit is contained in:
Asdine El Hrychy
2017-09-09 11:29:50 +02:00
parent a49d0b2cdc
commit a6718ade82
15 changed files with 997 additions and 1003 deletions

View File

@@ -6,7 +6,7 @@ import (
"github.com/asdine/storm/codec/gob"
"github.com/asdine/storm/codec/json"
"github.com/boltdb/bolt"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestNode(t *testing.T) {
@@ -15,15 +15,15 @@ func TestNode(t *testing.T) {
n1 := db.From("b", "c")
node1, ok := n1.(*node)
assert.True(t, ok)
assert.Equal(t, db, node1.s)
assert.NotEqual(t, db.root, n1)
assert.Equal(t, []string{"a"}, db.root.rootBucket)
assert.Equal(t, []string{"b", "c"}, node1.rootBucket)
require.True(t, ok)
require.Equal(t, db, node1.s)
require.NotEqual(t, db.root, n1)
require.Equal(t, []string{"a"}, db.root.rootBucket)
require.Equal(t, []string{"b", "c"}, node1.rootBucket)
n2 := n1.From("d", "e")
node2, ok := n2.(*node)
assert.True(t, ok)
assert.Equal(t, []string{"b", "c", "d", "e"}, node2.rootBucket)
require.True(t, ok)
require.Equal(t, []string{"b", "c", "d", "e"}, node2.rootBucket)
}
func TestNodeWithTransaction(t *testing.T) {
@@ -34,15 +34,15 @@ func TestNodeWithTransaction(t *testing.T) {
db.Bolt.Update(func(tx *bolt.Tx) error {
dbx := db.WithTransaction(tx)
err := dbx.Save(&User{ID: 10, Name: "John"})
assert.NoError(t, err)
require.NoError(t, err)
err = dbx.One("ID", 10, &user)
assert.NoError(t, err)
assert.Equal(t, "John", user.Name)
require.NoError(t, err)
require.Equal(t, "John", user.Name)
return nil
})
err := db.One("ID", 10, &user)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestNodeWithCodec(t *testing.T) {
@@ -50,13 +50,13 @@ func TestNodeWithCodec(t *testing.T) {
defer cleanup()
n := db.From("a").(*node)
assert.Equal(t, json.Codec, n.codec)
require.Equal(t, json.Codec, n.codec)
n = n.From("b", "c", "d").(*node)
assert.Equal(t, json.Codec, n.codec)
require.Equal(t, json.Codec, n.codec)
n = db.WithCodec(gob.Codec).(*node)
n = n.From("e").(*node)
assert.Equal(t, gob.Codec, n.codec)
require.Equal(t, gob.Codec, n.codec)
o := n.From("f").WithCodec(json.Codec).(*node)
assert.Equal(t, gob.Codec, n.codec)
assert.Equal(t, json.Codec, o.codec)
require.Equal(t, gob.Codec, n.codec)
require.Equal(t, json.Codec, o.codec)
}