summaryrefslogtreecommitdiffstats
path: root/tpl
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 /tpl
parent6027ee11082d0b9d72de1d4d1980a702be294ad2 (diff)
tests: Convert from testify to quicktest
Diffstat (limited to 'tpl')
-rw-r--r--tpl/cast/cast_test.go33
-rw-r--r--tpl/cast/init_test.go10
-rw-r--r--tpl/collections/append_test.go10
-rw-r--r--tpl/collections/apply_test.go13
-rw-r--r--tpl/collections/collections_test.go146
-rw-r--r--tpl/collections/complement_test.go15
-rw-r--r--tpl/collections/index_test.go14
-rw-r--r--tpl/collections/init_test.go9
-rw-r--r--tpl/collections/merge_test.go55
-rw-r--r--tpl/collections/symdiff_test.go15
-rw-r--r--tpl/compare/compare_test.go28
-rw-r--r--tpl/compare/init_test.go8
-rw-r--r--tpl/compare/truth_test.go12
-rw-r--r--tpl/crypto/crypto_test.go33
-rw-r--r--tpl/crypto/init_test.go8
-rw-r--r--tpl/data/data_test.go48
-rw-r--r--tpl/data/init_test.go8
-rw-r--r--tpl/data/resources_test.go32
-rw-r--r--tpl/encoding/encoding_test.go35
-rw-r--r--tpl/encoding/init_test.go8
-rw-r--r--tpl/fmt/init_test.go9
-rw-r--r--tpl/hugo/init_test.go9
-rw-r--r--tpl/images/images_test.go18
-rw-r--r--tpl/images/init_test.go8
-rw-r--r--tpl/inflect/inflect_test.go14
-rw-r--r--tpl/inflect/init_test.go9
-rw-r--r--tpl/internal/templatefuncRegistry_test.go7
-rw-r--r--tpl/lang/init_test.go9
-rw-r--r--tpl/lang/lang_test.go23
-rw-r--r--tpl/math/init_test.go8
-rw-r--r--tpl/math/math_test.go75
-rw-r--r--tpl/os/init_test.go8
-rw-r--r--tpl/os/os_test.go35
-rw-r--r--tpl/partials/init_test.go8
-rw-r--r--tpl/path/init_test.go9
-rw-r--r--tpl/path/path_test.go54
-rw-r--r--tpl/reflect/init_test.go8
-rw-r--r--tpl/reflect/reflect_test.go15
-rw-r--r--tpl/safe/init_test.go9
-rw-r--r--tpl/safe/safe_test.go75
-rw-r--r--tpl/site/init_test.go12
-rw-r--r--tpl/strings/init_test.go9
-rw-r--r--tpl/strings/regexp_test.go25
-rw-r--r--tpl/strings/strings_test.go230
-rw-r--r--tpl/template_test.go12
-rw-r--r--tpl/templates/init_test.go8
-rw-r--r--tpl/time/init_test.go9
-rw-r--r--tpl/tplimpl/shortcodes_test.go51
-rw-r--r--tpl/tplimpl/template_ast_transformers_test.go195
-rw-r--r--tpl/tplimpl/template_funcs_test.go30
-rw-r--r--tpl/tplimpl/template_info_test.go21
-rw-r--r--tpl/transform/init_test.go8
-rw-r--r--tpl/transform/remarshal_test.go21
-rw-r--r--tpl/transform/transform_test.go75
-rw-r--r--tpl/transform/unmarshal_test.go37
-rw-r--r--tpl/urls/init_test.go8
-rw-r--r--tpl/urls/urls_test.go17
57 files changed, 876 insertions, 842 deletions
diff --git a/tpl/cast/cast_test.go b/tpl/cast/cast_test.go
index fc20934f8..c6219728b 100644
--- a/tpl/cast/cast_test.go
+++ b/tpl/cast/cast_test.go
@@ -14,16 +14,15 @@
package cast
import (
- "fmt"
"html/template"
"testing"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
+ qt "github.com/frankban/quicktest"
)
func TestToInt(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New()
@@ -40,23 +39,23 @@ func TestToInt(t *testing.T) {
{"a", false},
{t, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test.v)
+ errMsg := qt.Commentf("[%d] %v", i, test.v)
result, err := ns.ToInt(test.v)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
func TestToString(t *testing.T) {
t.Parallel()
-
+ c := qt.New(t)
ns := New()
for i, test := range []struct {
@@ -68,23 +67,23 @@ func TestToString(t *testing.T) {
{"a", "a"},
{t, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test.v)
+ errMsg := qt.Commentf("[%d] %v", i, test.v)
result, err := ns.ToString(test.v)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
func TestToFloat(t *testing.T) {
t.Parallel()
-
+ c := qt.New(t)
ns := New()
for i, test := range []struct {
@@ -105,16 +104,16 @@ func TestToFloat(t *testing.T) {
{2, 2.0},
{t, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test.v)
+ errMsg := qt.Commentf("[%d] %v", i, test.v)
result, err := ns.ToFloat(test.v)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
diff --git a/tpl/cast/init_test.go b/tpl/cast/init_test.go
index 47cbd3d0b..73d9d5adc 100644
--- a/tpl/cast/init_test.go
+++ b/tpl/cast/init_test.go
@@ -16,12 +16,15 @@ package cast
import (
"testing"
+ "github.com/gohugoio/hugo/htesting/hqt"
+
+ qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/deps"
"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 +36,7 @@ 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{})
+
}
diff --git a/tpl/collections/append_test.go b/tpl/collections/append_test.go
index f886aca22..a254601b4 100644
--- a/tpl/collections/append_test.go
+++ b/tpl/collections/append_test.go
@@ -14,17 +14,17 @@
package collections
import (
- "fmt"
"reflect"
"testing"
+ qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/deps"
- "github.com/stretchr/testify/require"
)
// Also see tests in common/collection.
func TestAppend(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -45,18 +45,18 @@ func TestAppend(t *testing.T) {
false},
} {
- errMsg := fmt.Sprintf("[%d]", i)
+ errMsg := qt.Commentf("[%d]", i)
args := append(test.addend, test.start)
result, err := ns.Append(args...)
if b, ok := test.expected.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
+ c.Assert(err, qt.IsNil, 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)
diff --git a/tpl/collections/apply_test.go b/tpl/collections/apply_test.go
index edec3da18..96dd8896b 100644
--- a/tpl/collections/apply_test.go
+++ b/tpl/collections/apply_test.go
@@ -18,9 +18,9 @@ import (
"fmt"
+ qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/deps"
"github.com/gohugoio/hugo/tpl"
- "github.com/stretchr/testify/require"
)
type templateFinder int
@@ -41,24 +41,25 @@ func (templateFinder) GetFuncs() map[string]interface{} {
func TestApply(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{Tmpl: new(templateFinder)})
strings := []interface{}{"a\n", "b\n"}
result, err := ns.Apply(strings, "print", "a", "b", "c")
- require.NoError(t, err)
- require.Equal(t, []interface{}{"abc", "abc"}, result, "testing variadic")
+ c.Assert(err, qt.IsNil)
+ c.Assert(result, qt.DeepEquals, []interface{}{"abc", "abc"})
_, err = ns.Apply(strings, "apply", ".")
- require.Error(t, err)
+ c.Assert(err, qt.Not(qt.IsNil))
var nilErr *error
_, err = ns.Apply(nilErr, "chomp", ".")
- require.Error(t, err)
+ c.Assert(err, qt.Not(qt.IsNil))
_, err = ns.Apply(strings, "dobedobedo", ".")
- require.Error(t, err)
+ c.Assert(err, qt.Not(qt.IsNil))
_, err = ns.Apply(strings, "foo.Chomp", "c\n")
if err == nil {
diff --git a/tpl/collections/collections_test.go b/tpl/collections/collections_test.go
index 662536a24..8ea973f0b 100644
--- a/tpl/collections/collections_test.go
+++ b/tpl/collections/collections_test.go
@@ -22,6 +22,7 @@ import (
"testing"
"time"
+ qt "github.com/frankban/quicktest"
"github.com/gohugoio/hugo/common/loggers"
"github.com/gohugoio/hugo/config"
"github.com/gohugoio/hugo/deps"
@@ -29,14 +30,13 @@ import (
"github.com/gohugoio/hugo/hugofs"
"github.com/gohugoio/hugo/langs"
"github.com/spf13/viper"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
)
type tstNoStringer struct{}
func TestAfter(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -58,17 +58,17 @@ func TestAfter(t *testing.T) {
{1, t, false},
{1, (*string)(nil), false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.After(test.index, test.seq)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- require.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.DeepEquals, test.expect, errMsg)
}
}
@@ -92,7 +92,7 @@ func (g *tstGrouper2) Group(key interface{}, items interface{}) (interface{}, er
func TestGroup(t *testing.T) {
t.Parallel()
-
+ c := qt.New(t)
ns := New(&deps.Deps{})
for i, test := range []struct {
@@ -111,22 +111,23 @@ func TestGroup(t *testing.T) {
{"a", nil, false},
{nil, []*tstGrouper{{}, {}}, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.Group(test.key, test.items)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- require.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
func TestDelimit(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -161,7 +162,7 @@ func TestDelimit(t *testing.T) {
{map[int]string{3: "10", 2: "20", 1: "30", 4: "40", 5: "50"}, "--", "--and--", "30--20--10--40--and--50"},
{map[float64]string{3.5: "10", 2.5: "20", 1.5: "30", 4.5: "40", 5.5: "50"}, "--", "--and--", "30--20--10--40--and--50"},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
var result template.HTML
var err error
@@ -172,13 +173,14 @@ func TestDelimit(t *testing.T) {
result, err = ns.Delimit(test.seq, test.delimiter, test.last)
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
func TestDictionary(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -192,22 +194,23 @@ func TestDictionary(t *testing.T) {
{[]interface{}{5, "b"}, false},
{[]interface{}{"a", "b", "c"}, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test.values)
+ errMsg := qt.Commentf("[%d] %v", i, test.values)
result, err := ns.Dictionary(test.values...)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.DeepEquals, test.expect, errMsg)
}
}
func TestEchoParam(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -229,16 +232,17 @@ func TestEchoParam(t *testing.T) {
{map[string]interface{}{"foo": nil}, "foo", ""},
{(*[]string)(nil), "bar", ""},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result := ns.EchoParam(test.a, test.key)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
func TestFirst(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -260,23 +264,23 @@ func TestFirst(t *testing.T) {
{1, t, false},
{1, (*string)(nil), false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.First(test.limit, test.seq)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil)
+ c.Assert(result, qt.DeepEquals, test.expect, errMsg)
}
}
func TestIn(t *testing.T) {
t.Parallel()
- assert := require.New(t)
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -311,16 +315,16 @@ func TestIn(t *testing.T) {
{pagesVals{p3v, p2v, p3v, p2v}, p4v, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.In(test.l1, test.l2)
- assert.NoError(err)
- assert.Equal(test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
// Slices are not comparable
_, err := ns.In([]string{"a", "b"}, []string{"a", "b"})
- assert.Error(err)
+ c.Assert(err, qt.Not(qt.IsNil))
}
type testPage struct {
@@ -348,6 +352,7 @@ var (
func TestIntersect(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -420,16 +425,16 @@ func TestIntersect(t *testing.T) {
{[]int{1, 1}, [][]int{{1, 2}, {1, 2}, {1, 3}}, false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.Intersect(test.l1, test.l2)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- assert.NoError(t, err, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
if !reflect.DeepEqual(result, test.expect) {
t.Fatalf("[%d] Got\n%v expected\n%v", i, result, test.expect)
}
@@ -438,7 +443,7 @@ func TestIntersect(t *testing.T) {
func TestIsSet(t *testing.T) {
t.Parallel()
-
+ c := qt.New(t)
ns := newTestNs()
for i, test := range []struct {
@@ -460,20 +465,21 @@ func TestIsSet(t *testing.T) {
{nil, "nil", false, false},
{[]interface{}{1, 2, 3, 5}, TstX{}, false, true},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.IsSet(test.a, test.key)
if test.isErr {
continue
}
- assert.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.IsNil, errMsg)
+ c.Assert(result, qt.Equals, test.expect, errMsg)
}
}
func TestLast(t *testing.T) {
t.Parallel()
+ c := qt.New(t)
ns := New(&deps.Deps{})
@@ -495,23 +501,23 @@ func TestLast(t *testing.T) {
{1, t, false},
{1, (*string)(nil), false},
} {
- errMsg := fmt.Sprintf("[%d] %v", i, test)
+ errMsg := qt.Commentf("[%d] %v", i, test)
result, err := ns.Last(test.limit, test.seq)
if b, ok := test.expect.(bool); ok && !b {
- require.Error(t, err, errMsg)
+ c.Assert(err, qt.Not(qt.IsNil), errMsg)
continue
}
- require.NoError(t, err, errMsg)
- assert.Equal(t, test.expect, result, errMsg)
+ c.Assert(err, qt.I