diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-10 21:05:17 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2019-08-12 13:26:32 +0200 |
commit | 9e571827055dedb46b78c5db3d17d6913f14870b (patch) | |
tree | f5f0108afe0c9385ff6dc27664943d9f719f57ad /tpl/encoding | |
parent | 6027ee11082d0b9d72de1d4d1980a702be294ad2 (diff) |
tests: Convert from testify to quicktest
Diffstat (limited to 'tpl/encoding')
-rw-r--r-- | tpl/encoding/encoding_test.go | 35 | ||||
-rw-r--r-- | tpl/encoding/init_test.go | 8 |
2 files changed, 21 insertions, 22 deletions
diff --git a/tpl/encoding/encoding_test.go b/tpl/encoding/encoding_test.go index 8242561b6..2c1804dad 100644 --- a/tpl/encoding/encoding_test.go +++ b/tpl/encoding/encoding_test.go @@ -14,23 +14,22 @@ package encoding import ( - "fmt" "html/template" "math" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + qt "github.com/frankban/quicktest" ) type tstNoStringer struct{} func TestBase64Decode(t *testing.T) { t.Parallel() + c := qt.New(t) ns := New() - for i, test := range []struct { + for _, test := range []struct { v interface{} expect interface{} }{ @@ -38,26 +37,26 @@ func TestBase64Decode(t *testing.T) { // errors {t, false}, } { - errMsg := fmt.Sprintf("[%d] %v", i, test.v) result, err := ns.Base64Decode(test.v) if b, ok := test.expect.(bool); ok && !b { - require.Error(t, err, errMsg) + c.Assert(err, qt.Not(qt.IsNil)) continue } - require.NoError(t, err, errMsg) - assert.Equal(t, test.expect, result, errMsg) + c.Assert(err, qt.IsNil) + c.Assert(result, qt.Equals, test.expect) } } func TestBase64Encode(t *testing.T) { t.Parallel() + c := qt.New(t) ns := New() - for i, test := range []struct { + for _, test := range []struct { v interface{} expect interface{} }{ @@ -65,26 +64,25 @@ func TestBase64Encode(t *testing.T) { // errors {t, false}, } { - errMsg := fmt.Sprintf("[%d] %v", i, test.v) result, err := ns.Base64Encode(test.v) if b, ok := test.expect.(bool); ok && !b { - require.Error(t, err, errMsg) + c.Assert(err, qt.Not(qt.IsNil)) continue } - require.NoError(t, err, errMsg) - assert.Equal(t, test.expect, result, errMsg) + c.Assert(err, qt.IsNil) + c.Assert(result, qt.Equals, test.expect) } } func TestJsonify(t *testing.T) { t.Parallel() - + c := qt.New(t) ns := New() - for i, test := range []struct { + for _, test := range []struct { v interface{} expect interface{} }{ @@ -94,16 +92,15 @@ func TestJsonify(t *testing.T) { // errors {math.NaN(), false}, } { - errMsg := fmt.Sprintf("[%d] %v", i, test.v) result, err := ns.Jsonify(test.v) if b, ok := test.expect.(bool); ok && !b { - require.Error(t, err, errMsg) + c.Assert(err, qt.Not(qt.IsNil)) continue } - require.NoError(t, err, errMsg) - assert.Equal(t, test.expect, result, errMsg) + c.Assert(err, qt.IsNil) + c.Assert(result, qt.Equals, test.expect) } } diff --git a/tpl/encoding/init_test.go b/tpl/encoding/init_test.go index 6bbee99fa..5fd71eb32 100644 --- a/tpl/encoding/init_test.go +++ b/tpl/encoding/init_test.go @@ -16,12 +16,14 @@ package encoding import ( "testing" + qt "github.com/frankban/quicktest" "github.com/gohugoio/hugo/deps" + "github.com/gohugoio/hugo/htesting/hqt" "github.com/gohugoio/hugo/tpl/internal" - "github.com/stretchr/testify/require" ) func TestInit(t *testing.T) { + c := qt.New(t) var found bool var ns *internal.TemplateFuncsNamespace @@ -33,6 +35,6 @@ func TestInit(t *testing.T) { } } - require.True(t, found) - require.IsType(t, &Namespace{}, ns.Context()) + c.Assert(found, qt.Equals, true) + c.Assert(ns.Context(), hqt.IsSameType, &Namespace{}) } |