summaryrefslogtreecommitdiffstats
path: root/common/collections
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-08-10 21:05:17 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-08-12 13:26:32 +0200
commit9e571827055dedb46b78c5db3d17d6913f14870b (patch)
treef5f0108afe0c9385ff6dc27664943d9f719f57ad /common/collections
parent6027ee11082d0b9d72de1d4d1980a702be294ad2 (diff)
tests: Convert from testify to quicktest
Diffstat (limited to 'common/collections')
-rw-r--r--common/collections/append_test.go19
-rw-r--r--common/collections/slice_test.go19
2 files changed, 16 insertions, 22 deletions
diff --git a/common/collections/append_test.go b/common/collections/append_test.go
index c08a69c0d..8c9a6e73f 100644
--- a/common/collections/append_test.go
+++ b/common/collections/append_test.go
@@ -14,17 +14,16 @@
package collections
import (
- "fmt"
- "reflect"
"testing"
- "github.com/stretchr/testify/require"
+ qt "github.com/frankban/quicktest"
)
func TestAppend(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
- for i, test := range []struct {
+ for _, test := range []struct {
start interface{}
addend []interface{}
expected interface{}
@@ -59,20 +58,16 @@ func TestAppend(t *testing.T) {
false},
} {
- errMsg := fmt.Sprintf("[%d]", i)
-
result, err := Append(test.start, test.addend...)
if b, ok := test.expected.(bool); ok && !b {
- require.Error(t, err, errMsg)
+
+ c.Assert(err, qt.Not(qt.IsNil))
continue
}
- require.NoError(t, err, errMsg)
-
- if !reflect.DeepEqual(test.expected, result) {
- t.Fatalf("%s got\n%T: %v\nexpected\n%T: %v", errMsg, result, result, test.expected, test.expected)
- }
+ c.Assert(err, qt.IsNil)
+ c.Assert(result, qt.DeepEquals, test.expected)
}
}
diff --git a/common/collections/slice_test.go b/common/collections/slice_test.go
index fd8eb24f1..3ebfe6d11 100644
--- a/common/collections/slice_test.go
+++ b/common/collections/slice_test.go
@@ -15,10 +15,9 @@ package collections
import (
"errors"
- "fmt"
"testing"
- "github.com/alecthomas/assert"
+ qt "github.com/frankban/quicktest"
)
var _ Slicer = (*tstSlicer)(nil)
@@ -34,15 +33,15 @@ type testSlicerInterface interface {
type testSlicerInterfaces []testSlicerInterface
type tstSlicerIn1 struct {
- name string
+ TheName string
}
type tstSlicerIn2 struct {
- name string
+ TheName string
}
type tstSlicer struct {
- name string
+ TheName string
}
func (p *tstSlicerIn1) Slice(in interface{}) (interface{}, error) {
@@ -75,11 +74,11 @@ func (p *tstSlicerIn2) Slice(in interface{}) (interface{}, error) {
}
func (p *tstSlicerIn1) Name() string {
- return p.name
+ return p.TheName
}
func (p *tstSlicerIn2) Name() string {
- return p.name
+ return p.TheName
}
func (p *tstSlicer) Slice(in interface{}) (interface{}, error) {
@@ -100,6 +99,7 @@ type tstSlicers []*tstSlicer
func TestSlice(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
for i, test := range []struct {
args []interface{}
@@ -114,12 +114,11 @@ func TestSlice(t *testing.T) {
{[]interface{}{&tstSlicerIn1{"a"}, &tstSlicerIn2{"b"}}, testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn2{"b"}}},
{[]interface{}{&tstSlicerIn1{"a"}, &tstSlicer{"b"}}, []interface{}{&tstSlicerIn1{"a"}, &tstSlicer{"b"}}},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test.args)
+ errMsg := qt.Commentf("[%d] %v", i, test.args)
result := Slice(test.args...)
- assert.Equal(t, test.expected, result, errMsg)
+ c.Assert(test.expected, qt.DeepEquals, result, errMsg)
}
- assert.Len(t, Slice(), 0)
}