From 9e571827055dedb46b78c5db3d17d6913f14870b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 10 Aug 2019 21:05:17 +0200 Subject: tests: Convert from testify to quicktest --- hugolib/language_content_dir_test.go | 79 ++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 40 deletions(-) (limited to 'hugolib/language_content_dir_test.go') diff --git a/hugolib/language_content_dir_test.go b/hugolib/language_content_dir_test.go index b0f443fca..5406422dd 100644 --- a/hugolib/language_content_dir_test.go +++ b/hugolib/language_content_dir_test.go @@ -19,9 +19,11 @@ import ( "path/filepath" "testing" + "github.com/spf13/cast" + "github.com/gohugoio/hugo/resources/page" - "github.com/stretchr/testify/require" + qt "github.com/frankban/quicktest" ) /* @@ -42,7 +44,7 @@ import ( func TestLanguageContentRoot(t *testing.T) { t.Parallel() - assert := require.New(t) + c := qt.New(t) config := ` baseURL = "https://example.org/" @@ -215,9 +217,9 @@ Content. //dumpPages(b.H.Sites[1].RegularPages()...) - assert.NoError(err) + c.Assert(err, qt.IsNil) - assert.Equal(3, len(b.H.Sites)) + c.Assert(len(b.H.Sites), qt.Equals, 3) enSite := b.H.Sites[0] nnSite := b.H.Sites[1] @@ -228,25 +230,26 @@ Content. //dumpPages(nnSite.RegularPages()...) - assert.Equal(12, len(nnSite.RegularPages())) - assert.Equal(13, len(enSite.RegularPages())) + c.Assert(len(nnSite.RegularPages()), qt.Equals, 12) + c.Assert(len(enSite.RegularPages()), qt.Equals, 13) - assert.Equal(10, len(svSite.RegularPages())) + c.Assert(len(svSite.RegularPages()), qt.Equals, 10) svP2, err := svSite.getPageNew(nil, "/sect/page2.md") - assert.NoError(err) + c.Assert(err, qt.IsNil) nnP2, err := nnSite.getPageNew(nil, "/sect/page2.md") - assert.NoError(err) + c.Assert(err, qt.IsNil) enP2, err := enSite.getPageNew(nil, "/sect/page2.md") - assert.NoError(err) - assert.Equal("en", enP2.Language().Lang) - assert.Equal("sv", svP2.Language().Lang) - assert.Equal("nn", nnP2.Language().Lang) + c.Assert(err, qt.IsNil) + c.Assert(enP2.Language().Lang, qt.Equals, "en") + c.Assert(svP2.Language().Lang, qt.Equals, "sv") + c.Assert(nnP2.Language().Lang, qt.Equals, "nn") content, _ := nnP2.Content() - assert.Contains(content, "SVP3-REF: https://example.org/sv/sect/p-sv-3/") - assert.Contains(content, "SVP3-RELREF: /sv/sect/p-sv-3/") + contentStr := cast.ToString(content) + c.Assert(contentStr, qt.Contains, "SVP3-REF: https://example.org/sv/sect/p-sv-3/") + c.Assert(contentStr, qt.Contains, "SVP3-RELREF: /sv/sect/p-sv-3/") // Test RelRef with and without language indicator. nn3RefArgs := map[string]interface{}{ @@ -256,38 +259,34 @@ Content. nnP3RelRef, err := svP2.RelRef( nn3RefArgs, ) - assert.NoError(err) - assert.Equal("/nn/sect/p-nn-3/", nnP3RelRef) + c.Assert(err, qt.IsNil) + c.Assert(nnP3RelRef, qt.Equals, "/nn/sect/p-nn-3/") nnP3Ref, err := svP2.Ref( nn3RefArgs, ) - assert.NoError(err) - assert.Equal("https://example.org/nn/sect/p-nn-3/", nnP3Ref) + c.Assert(err, qt.IsNil) + c.Assert(nnP3Ref, qt.Equals, "https://example.org/nn/sect/p-nn-3/") for i, p := range enSite.RegularPages() { j := i + 1 - msg := fmt.Sprintf("Test %d", j) - assert.Equal("en", p.Language().Lang, msg) - assert.Equal("sect", p.Section()) + c.Assert(p.Language().Lang, qt.Equals, "en") + c.Assert(p.Section(), qt.Equals, "sect") if j < 9 { if j%4 == 0 { - assert.Contains(p.Title(), fmt.Sprintf("p-sv-%d.en", i+1), msg) } else { - assert.Contains(p.Title(), "p-en", msg) + c.Assert(p.Title(), qt.Contains, "p-en") } } } - for i, p := range nnSite.RegularPages() { - msg := fmt.Sprintf("Test %d", i+1) - assert.Equal("nn", p.Language().Lang, msg) - assert.Contains(p.Title(), "nn", msg) + for _, p := range nnSite.RegularPages() { + c.Assert(p.Language().Lang, qt.Equals, "nn") + c.Assert(p.Title(), qt.Contains, "nn") } - for i, p := range svSite.RegularPages() { - msg := fmt.Sprintf("Test %d", i+1) - assert.Equal("sv", p.Language().Lang, msg) - assert.Contains(p.Title(), "sv", msg) + for _, p := range svSite.RegularPages() { + c.Assert(p.Language().Lang, qt.Equals, "sv") + c.Assert(p.Title(), qt.Contains, "sv") } // Check bundles @@ -295,12 +294,12 @@ Content. bundleNn := nnSite.RegularPages()[len(nnSite.RegularPages())-1] bundleSv := svSite.RegularPages()[len(svSite.RegularPages())-1] - assert.Equal("/en/sect/mybundle/", bundleEn.RelPermalink()) - assert.Equal("/sv/sect/mybundle/", bundleSv.RelPermalink()) + c.Assert(bundleEn.RelPermalink(), qt.Equals, "/en/sect/mybundle/") + c.Assert(bundleSv.RelPermalink(), qt.Equals, "/sv/sect/mybundle/") - assert.Equal(4, len(bundleNn.Resources())) - assert.Equal(4, len(bundleSv.Resources())) - assert.Equal(4, len(bundleEn.Resources())) + c.Assert(len(bundleNn.Resources()), qt.Equals, 4) + c.Assert(len(bundleSv.Resources()), qt.Equals, 4) + c.Assert(len(bundleEn.Resources()), qt.Equals, 4) b.AssertFileContent("/my/project/public/en/sect/mybundle/index.html", "image/png: /en/sect/mybundle/logo.png") b.AssertFileContent("/my/project/public/nn/sect/mybundle/index.html", "image/png: /nn/sect/mybundle/logo.png") @@ -314,9 +313,9 @@ Content. b.AssertFileContent("/my/project/public/nn/sect/mybundle/logo.png", "PNG Data") nnSect := nnSite.getPage(page.KindSection, "sect") - assert.NotNil(nnSect) - assert.Equal(12, len(nnSect.Pages())) + c.Assert(nnSect, qt.Not(qt.IsNil)) + c.Assert(len(nnSect.Pages()), qt.Equals, 12) nnHome, _ := nnSite.Info.Home() - assert.Equal("/nn/", nnHome.RelPermalink()) + c.Assert(nnHome.RelPermalink(), qt.Equals, "/nn/") } -- cgit v1.2.3