zishuo/storm
1
0
Fork 0
mirror of https://github.com/asdine/storm.git synced 2025-11-03 11:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replacing testify/assert by testify/require

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

287
query_test.go
View File

@@ -6,7 +6,6 @@ import (
"github.com/asdine/storm/codec/json"
"github.com/asdine/storm/q"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -22,7 +21,7 @@ func prepareScoreDB(t *testing.T) (*DB, func()) {
err := db.Save(&Score{
Value: i,
})
assert.NoError(t, err)
require.NoError(t, err)
}
return db, cleanup
@@ -36,14 +35,14 @@ func TestSelectFind(t *testing.T) {
var scoresPtr []*Score
err := db.Select(q.Eq("Value", 5)).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 1)
assert.Equal(t, 5, scores[0].Value)
require.NoError(t, err)
require.Len(t, scores, 1)
require.Equal(t, 5, scores[0].Value)
err = db.Select(q.Eq("Value", 5)).Find(&scoresPtr)
assert.NoError(t, err)
assert.Len(t, scoresPtr, 1)
assert.Equal(t, 5, scoresPtr[0].Value)
require.NoError(t, err)
require.Len(t, scoresPtr, 1)
require.Equal(t, 5, scoresPtr[0].Value)
err = db.Select(
q.Or(
@@ -51,10 +50,10 @@ func TestSelectFind(t *testing.T) {
q.Eq("Value", 6),
),
).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 2)
assert.Equal(t, 5, scores[0].Value)
assert.Equal(t, 6, scores[1].Value)
require.NoError(t, err)
require.Len(t, scores, 2)
require.Equal(t, 5, scores[0].Value)
require.Equal(t, 6, scores[1].Value)
err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -63,14 +62,14 @@ func TestSelectFind(t *testing.T) {
q.Gte("Value", 18),
),
)).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 6)
assert.Equal(t, 0, scores[0].Value)
assert.Equal(t, 1, scores[1].Value)
assert.Equal(t, 2, scores[2].Value)
assert.Equal(t, 5, scores[3].Value)
assert.Equal(t, 18, scores[4].Value)
assert.Equal(t, 19, scores[5].Value)
require.NoError(t, err)
require.Len(t, scores, 6)
require.Equal(t, 0, scores[0].Value)
require.Equal(t, 1, scores[1].Value)
require.Equal(t, 2, scores[2].Value)
require.Equal(t, 5, scores[3].Value)
require.Equal(t, 18, scores[4].Value)
require.Equal(t, 19, scores[5].Value)
err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -79,14 +78,14 @@ func TestSelectFind(t *testing.T) {
q.Gte("Value", 18),
),
)).Reverse().Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 6)
assert.Equal(t, 19, scores[0].Value)
assert.Equal(t, 18, scores[1].Value)
assert.Equal(t, 5, scores[2].Value)
assert.Equal(t, 2, scores[3].Value)
assert.Equal(t, 1, scores[4].Value)
assert.Equal(t, 0, scores[5].Value)
require.NoError(t, err)
require.Len(t, scores, 6)
require.Equal(t, 19, scores[0].Value)
require.Equal(t, 18, scores[1].Value)
require.Equal(t, 5, scores[2].Value)
require.Equal(t, 2, scores[3].Value)
require.Equal(t, 1, scores[4].Value)
require.Equal(t, 0, scores[5].Value)
}
func TestSelectFindSkip(t *testing.T) {
@@ -102,10 +101,10 @@ func TestSelectFindSkip(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(4).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 2)
assert.Equal(t, 18, scores[0].Value)
assert.Equal(t, 19, scores[1].Value)
require.NoError(t, err)
require.Len(t, scores, 2)
require.Equal(t, 18, scores[0].Value)
require.Equal(t, 19, scores[1].Value)
err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -114,9 +113,9 @@ func TestSelectFindSkip(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(-10).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 6)
assert.Equal(t, 0, scores[0].Value)
require.NoError(t, err)
require.Len(t, scores, 6)
require.Equal(t, 0, scores[0].Value)
scores = nil
err = db.Select(q.Or(
@@ -126,9 +125,9 @@ func TestSelectFindSkip(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(1000).Find(&scores)
assert.Error(t, err)
assert.True(t, ErrNotFound == err)
assert.Len(t, scores, 0)
require.Error(t, err)
require.True(t, ErrNotFound == err)
require.Len(t, scores, 0)
}
func TestSelectFindLimit(t *testing.T) {
@@ -143,10 +142,10 @@ func TestSelectFindLimit(t *testing.T) {
q.Gte("Value", 18),
),
)).Limit(2).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 2)
assert.Equal(t, 0, scores[0].Value)
assert.Equal(t, 1, scores[1].Value)
require.NoError(t, err)
require.Len(t, scores, 2)
require.Equal(t, 0, scores[0].Value)
require.Equal(t, 1, scores[1].Value)
err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -155,9 +154,9 @@ func TestSelectFindLimit(t *testing.T) {
q.Gte("Value", 18),
),
)).Limit(-10).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 6)
assert.Equal(t, 0, scores[0].Value)
require.NoError(t, err)
require.Len(t, scores, 6)
require.Equal(t, 0, scores[0].Value)
scores = nil
err = db.Select(q.Or(
@@ -167,9 +166,9 @@ func TestSelectFindLimit(t *testing.T) {
q.Gte("Value", 18),
),
)).Limit(0).Find(&scores)
assert.Error(t, err)
assert.True(t, ErrNotFound == err)
assert.Len(t, scores, 0)
require.Error(t, err)
require.True(t, ErrNotFound == err)
require.Len(t, scores, 0)
}
func TestSelectFindLimitSkip(t *testing.T) {
@@ -185,10 +184,10 @@ func TestSelectFindLimitSkip(t *testing.T) {
q.Gte("Value", 18),
),
)).Limit(2).Skip(2).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 2)
assert.Equal(t, 2, scores[0].Value)
assert.Equal(t, 5, scores[1].Value)
require.NoError(t, err)
require.Len(t, scores, 2)
require.Equal(t, 2, scores[0].Value)
require.Equal(t, 5, scores[1].Value)
err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -197,9 +196,9 @@ func TestSelectFindLimitSkip(t *testing.T) {
q.Gte("Value", 18),
),
)).Limit(2).Skip(5).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 1)
assert.Equal(t, 19, scores[0].Value)
require.NoError(t, err)
require.Len(t, scores, 1)
require.Equal(t, 19, scores[0].Value)
}
func TestSelectFindOrderBy(t *testing.T) {
@@ -225,105 +224,105 @@ func TestSelectFindOrderBy(t *testing.T) {
}
err := db.Save(&record)
assert.NoError(t, err)
require.NoError(t, err)
}
var list []T
err := db.Select().OrderBy("ID").Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 6)
require.NoError(t, err)
require.Len(t, list, 6)
for i, j := 0, 0; i < 6; i, j = i+1, j+1 {
if i == 2 {
j--
}
assert.Equal(t, i+1, list[i].ID)
require.Equal(t, i+1, list[i].ID)
}
list = nil
err = db.Select().OrderBy("Str").Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 6)
require.NoError(t, err)
require.Len(t, list, 6)
for i, j := 0, 0; i < 6; i, j = i+1, j+1 {
if i == 4 {
j--
}
assert.Equal(t, string([]byte{'a' + byte(j)}), list[i].Str)
require.Equal(t, string([]byte{'a' + byte(j)}), list[i].Str)
}
list = nil
err = db.Select().OrderBy("Int").Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 6)
require.NoError(t, err)
require.Len(t, list, 6)
for i, j := 0, 0; i < 6; i, j = i+1, j+1 {
if i == 2 {
j--
}
assert.Equal(t, j+1, list[i].Int)
require.Equal(t, j+1, list[i].Int)
}
list = nil
err = db.Select().OrderBy("Rnd").Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 6)
assert.Equal(t, 1, list[0].ID)
assert.Equal(t, 2, list[1].ID)
assert.Equal(t, 3, list[2].ID)
assert.Equal(t, 5, list[3].ID)
assert.Equal(t, 6, list[4].ID)
assert.Equal(t, 4, list[5].ID)
require.NoError(t, err)
require.Len(t, list, 6)
require.Equal(t, 1, list[0].ID)
require.Equal(t, 2, list[1].ID)
require.Equal(t, 3, list[2].ID)
require.Equal(t, 5, list[3].ID)
require.Equal(t, 6, list[4].ID)
require.Equal(t, 4, list[5].ID)
list = nil
err = db.Select().OrderBy("Int").Reverse().Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 6)
require.NoError(t, err)
require.Len(t, list, 6)
for i, j := 0, 0; i < 6; i, j = i+1, j+1 {
if i == 4 {
j--
}
assert.Equal(t, 5-j, list[i].Int)
require.Equal(t, 5-j, list[i].Int)
}
list = nil
err = db.Select().OrderBy("Int").Reverse().Limit(2).Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 2)
require.NoError(t, err)
require.Len(t, list, 2)
for i := 0; i < 2; i++ {
assert.Equal(t, 5-i, list[i].Int)
require.Equal(t, 5-i, list[i].Int)
}
list = nil
err = db.Select().OrderBy("Int").Reverse().Skip(2).Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 4)
require.NoError(t, err)
require.Len(t, list, 4)
for i, j := 0, 0; i < 3; i, j = i+1, j+1 {
if i == 2 {
j--
}
assert.Equal(t, 3-j, list[i].Int)
require.Equal(t, 3-j, list[i].Int)
}
list = nil
err = db.Select().OrderBy("Int").Reverse().Skip(5).Limit(2).Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 1)
assert.Equal(t, 1, list[0].Int)
require.NoError(t, err)
require.Len(t, list, 1)
require.Equal(t, 1, list[0].Int)
list = nil
err = db.Select().OrderBy("Str", "Int").Find(&list)
assert.NoError(t, err)
assert.Len(t, list, 6)
assert.Equal(t, "a", list[0].Str)
assert.Equal(t, 4, list[0].Int)
assert.Equal(t, "b", list[1].Str)
assert.Equal(t, 3, list[1].Int)
assert.Equal(t, "c", list[2].Str)
assert.Equal(t, 2, list[2].Int)
assert.Equal(t, "d", list[3].Str)
assert.Equal(t, 1, list[3].Int)
assert.Equal(t, "d", list[4].Str)
assert.Equal(t, 5, list[4].Int)
assert.Equal(t, "e", list[5].Str)
assert.Equal(t, 2, list[5].Int)
require.NoError(t, err)
require.Len(t, list, 6)
require.Equal(t, "a", list[0].Str)
require.Equal(t, 4, list[0].Int)
require.Equal(t, "b", list[1].Str)
require.Equal(t, 3, list[1].Int)
require.Equal(t, "c", list[2].Str)
require.Equal(t, 2, list[2].Int)
require.Equal(t, "d", list[3].Str)
require.Equal(t, 1, list[3].Int)
require.Equal(t, "d", list[4].Str)
require.Equal(t, 5, list[4].Int)
require.Equal(t, "e", list[5].Str)
require.Equal(t, 2, list[5].Int)
}
func TestSelectFirst(t *testing.T) {
@@ -339,8 +338,8 @@ func TestSelectFirst(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(2).First(&score)
assert.NoError(t, err)
assert.Equal(t, 2, score.Value)
require.NoError(t, err)
require.Equal(t, 2, score.Value)
err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -349,8 +348,8 @@ func TestSelectFirst(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(1).Reverse().First(&score)
assert.NoError(t, err)
assert.Equal(t, 18, score.Value)
require.NoError(t, err)
require.Equal(t, 18, score.Value)
}
func TestSelectFirstOrderBy(t *testing.T) {
@@ -370,37 +369,37 @@ func TestSelectFirstOrderBy(t *testing.T) {
Str: strs[i],
Int: ints[i],
})
assert.NoError(t, err)
require.NoError(t, err)
}
var record T
err := db.Select().OrderBy("ID").First(&record)
assert.NoError(t, err)
assert.Equal(t, 1, record.ID)
require.NoError(t, err)
require.Equal(t, 1, record.ID)
err = db.Select().OrderBy("Str").First(&record)
assert.NoError(t, err)
assert.Equal(t, "a", record.Str)
require.NoError(t, err)
require.Equal(t, "a", record.Str)
err = db.Select().OrderBy("Int").First(&record)
assert.NoError(t, err)
assert.Equal(t, 1, record.Int)
require.NoError(t, err)
require.Equal(t, 1, record.Int)
err = db.Select().OrderBy("Int").Reverse().First(&record)
assert.NoError(t, err)
assert.Equal(t, 5, record.Int)
require.NoError(t, err)
require.Equal(t, 5, record.Int)
err = db.Select().OrderBy("Int").Reverse().Limit(2).First(&record)
assert.NoError(t, err)
assert.Equal(t, 5, record.Int)
require.NoError(t, err)
require.Equal(t, 5, record.Int)
err = db.Select().OrderBy("Int").Reverse().Skip(2).First(&record)
assert.NoError(t, err)
assert.Equal(t, 3, record.Int)
require.NoError(t, err)
require.Equal(t, 3, record.Int)
err = db.Select().OrderBy("Int").Reverse().Skip(4).Limit(2).First(&record)
assert.NoError(t, err)
assert.Equal(t, 1, record.Int)
require.NoError(t, err)
require.Equal(t, 1, record.Int)
}
func TestSelectDelete(t *testing.T) {
@@ -414,7 +413,7 @@ func TestSelectDelete(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(2).Delete(&Score{})
assert.NoError(t, err)
require.NoError(t, err)
var scores []Score
err = db.Select(q.Or(
@@ -424,27 +423,27 @@ func TestSelectDelete(t *testing.T) {
q.Gte("Value", 18),
),
)).Find(&scores)
assert.NoError(t, err)
assert.Len(t, scores, 2)
assert.Equal(t, 0, scores[0].Value)
assert.Equal(t, 1, scores[1].Value)
require.NoError(t, err)
require.Len(t, scores, 2)
require.Equal(t, 0, scores[0].Value)
require.Equal(t, 1, scores[1].Value)
for i := 0; i < 10; i++ {
w := User{ID: i + 1, Name: fmt.Sprintf("John%d", i+1)}
err = db.Save(&w)
assert.NoError(t, err)
require.NoError(t, err)
}
err = db.Select(q.Gte("ID", 5)).Delete(&User{})
assert.NoError(t, err)
require.NoError(t, err)
var user User
err = db.One("Name", "John6", &user)
assert.Error(t, err)
assert.Equal(t, ErrNotFound, err)
require.Error(t, err)
require.Equal(t, ErrNotFound, err)
err = db.One("Name", "John4", &user)
assert.NoError(t, err)
require.NoError(t, err)
}
func TestSelectCount(t *testing.T) {
@@ -458,8 +457,8 @@ func TestSelectCount(t *testing.T) {
q.Gte("Value", 18),
),
)).Count(&Score{})
assert.NoError(t, err)
assert.Equal(t, 6, total)
require.NoError(t, err)
require.Equal(t, 6, total)
total, err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -468,8 +467,8 @@ func TestSelectCount(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(2).Count(&Score{})
assert.NoError(t, err)
assert.Equal(t, 4, total)
require.NoError(t, err)
require.Equal(t, 4, total)
total, err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -478,8 +477,8 @@ func TestSelectCount(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(2).Limit(2).Count(&Score{})
assert.NoError(t, err)
assert.Equal(t, 2, total)
require.NoError(t, err)
require.Equal(t, 2, total)
total, err = db.Select(q.Or(
q.Eq("Value", 5),
@@ -488,8 +487,8 @@ func TestSelectCount(t *testing.T) {
q.Gte("Value", 18),
),
)).Skip(5).Limit(2).Count(&Score{})
assert.NoError(t, err)
assert.Equal(t, 1, total)
require.NoError(t, err)
require.Equal(t, 1, total)
}
func TestSelectRaw(t *testing.T) {
@@ -500,24 +499,24 @@ func TestSelectRaw(t *testing.T) {
err := db.Save(&Score{
Value: i,
})
assert.NoError(t, err)
require.NoError(t, err)
}
list, err := db.Select().Bucket("Score").Raw()
assert.NoError(t, err)
assert.Len(t, list, 20)
require.NoError(t, err)
require.Len(t, list, 20)
list, err = db.Select().Bucket("Score").Skip(18).Limit(5).Raw()
assert.NoError(t, err)
assert.Len(t, list, 2)
require.NoError(t, err)
require.Len(t, list, 2)
i := 0
err = db.Select().Bucket("Score").Skip(18).Limit(5).RawEach(func(k []byte, v []byte) error {
i++
return nil
})
assert.NoError(t, err)
assert.Equal(t, i, 2)
require.NoError(t, err)
require.Equal(t, i, 2)
}
func TestSelectEach(t *testing.T) {
@@ -528,7 +527,7 @@ func TestSelectEach(t *testing.T) {
err := db.Save(&Score{
Value: i,
})
assert.NoError(t, err)
require.NoError(t, err)
}
i := 0