hugolib: Simplify some test loops - hugo - [fork] hugo port for 9front
HTML git clone git@git.drkhsh.at/hugo.git
DIR Log
DIR Files
DIR Refs
DIR Submodules
DIR README
DIR LICENSE
---
DIR commit 1f55cb767db5839ce8fd1de64cda0959d6bfac58
DIR parent 8aaec644a90d09bd7f079d35d382f76bb4ed35db
HTML Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date: Tue, 6 Jun 2017 08:43:33 +0200
hugolib: Simplify some test loops
Diffstat:
M hugolib/page_paths_test.go | 10 ++++------
M hugolib/pagination_test.go | 85 +++++++++++++++----------------
M hugolib/taxonomy_test.go | 13 +++++--------
3 files changed, 50 insertions(+), 58 deletions(-)
---
DIR diff --git a/hugolib/page_paths_test.go b/hugolib/page_paths_test.go
@@ -28,9 +28,9 @@ func TestPageTargetPath(t *testing.T) {
pathSpec := newTestDefaultPathSpec()
for _, langPrefix := range []string{"", "no"} {
- t.Run(fmt.Sprintf("langPrefix=%q", langPrefix), func(t *testing.T) {
- for _, uglyURLs := range []bool{false, true} {
- t.Run(fmt.Sprintf("uglyURLs=%t", uglyURLs), func(t *testing.T) {
+ for _, uglyURLs := range []bool{false, true} {
+ t.Run(fmt.Sprintf("langPrefix=%q,uglyURLs=%t", langPrefix, uglyURLs),
+ func(t *testing.T) {
tests := []struct {
name string
@@ -171,8 +171,6 @@ func TestPageTargetPath(t *testing.T) {
}
}
})
- }
- })
+ }
}
-
}
DIR diff --git a/hugolib/pagination_test.go b/hugolib/pagination_test.go
@@ -206,58 +206,55 @@ func TestPaginationURLFactory(t *testing.T) {
cfg.Set("paginatePath", "zoo")
for _, uglyURLs := range []bool{false, true} {
- t.Run(fmt.Sprintf("uglyURLs=%t", uglyURLs), func(t *testing.T) {
- for _, canonifyURLs := range []bool{false, true} {
- t.Run(fmt.Sprintf("canonifyURLs=%t", canonifyURLs), func(t *testing.T) {
-
- tests := []struct {
- name string
- d targetPathDescriptor
- baseURL string
- page int
- expected string
- }{
- {"HTML home page 32",
- targetPathDescriptor{Kind: KindHome, Type: output.HTMLFormat}, "http://example.com/", 32, "/zoo/32/"},
- {"JSON home page 42",
- targetPathDescriptor{Kind: KindHome, Type: output.JSONFormat}, "http://example.com/", 42, "/zoo/42/"},
- // Issue #1252
- {"BaseURL with sub path",
- targetPathDescriptor{Kind: KindHome, Type: output.HTMLFormat}, "http://example.com/sub/", 999, "/sub/zoo/999/"},
+ for _, canonifyURLs := range []bool{false, true} {
+ t.Run(fmt.Sprintf("uglyURLs=%t,canonifyURLs=%t", uglyURLs, canonifyURLs), func(t *testing.T) {
+
+ tests := []struct {
+ name string
+ d targetPathDescriptor
+ baseURL string
+ page int
+ expected string
+ }{
+ {"HTML home page 32",
+ targetPathDescriptor{Kind: KindHome, Type: output.HTMLFormat}, "http://example.com/", 32, "/zoo/32/"},
+ {"JSON home page 42",
+ targetPathDescriptor{Kind: KindHome, Type: output.JSONFormat}, "http://example.com/", 42, "/zoo/42/"},
+ // Issue #1252
+ {"BaseURL with sub path",
+ targetPathDescriptor{Kind: KindHome, Type: output.HTMLFormat}, "http://example.com/sub/", 999, "/sub/zoo/999/"},
+ }
+
+ for _, test := range tests {
+ d := test.d
+ cfg.Set("baseURL", test.baseURL)
+ cfg.Set("canonifyURLs", canonifyURLs)
+ cfg.Set("uglyURLs", uglyURLs)
+ d.UglyURLs = uglyURLs
+
+ expected := test.expected
+
+ if canonifyURLs {
+ expected = strings.Replace(expected, "/sub", "", 1)
}
- for _, test := range tests {
- d := test.d
- cfg.Set("baseURL", test.baseURL)
- cfg.Set("canonifyURLs", canonifyURLs)
- cfg.Set("uglyURLs", uglyURLs)
- d.UglyURLs = uglyURLs
-
- expected := test.expected
-
- if canonifyURLs {
- expected = strings.Replace(expected, "/sub", "", 1)
- }
-
- if uglyURLs {
- expected = expected[:len(expected)-1] + "." + test.d.Type.MediaType.Suffix
- }
+ if uglyURLs {
+ expected = expected[:len(expected)-1] + "." + test.d.Type.MediaType.Suffix
+ }
- pathSpec := newTestPathSpec(fs, cfg)
- d.PathSpec = pathSpec
+ pathSpec := newTestPathSpec(fs, cfg)
+ d.PathSpec = pathSpec
- factory := newPaginationURLFactory(d)
+ factory := newPaginationURLFactory(d)
- got := factory(test.page)
+ got := factory(test.page)
- require.Equal(t, expected, got)
+ require.Equal(t, expected, got)
- }
- })
- }
- })
+ }
+ })
+ }
}
-
}
func TestPaginator(t *testing.T) {
DIR diff --git a/hugolib/taxonomy_test.go b/hugolib/taxonomy_test.go
@@ -53,14 +53,11 @@ func TestByCountOrderOfTaxonomies(t *testing.T) {
//
func TestTaxonomiesWithAndWithoutContentFile(t *testing.T) {
for _, uglyURLs := range []bool{false, true} {
- t.Run(fmt.Sprintf("uglyURLs=%t", uglyURLs), func(t *testing.T) {
- for _, preserveTaxonomyNames := range []bool{false, true} {
- t.Run(fmt.Sprintf("preserveTaxonomyNames=%t", preserveTaxonomyNames), func(t *testing.T) {
- doTestTaxonomiesWithAndWithoutContentFile(t, preserveTaxonomyNames, uglyURLs)
- })
- }
- })
-
+ for _, preserveTaxonomyNames := range []bool{false, true} {
+ t.Run(fmt.Sprintf("uglyURLs=%t,preserveTaxonomyNames=%t", uglyURLs, preserveTaxonomyNames), func(t *testing.T) {
+ doTestTaxonomiesWithAndWithoutContentFile(t, preserveTaxonomyNames, uglyURLs)
+ })
+ }
}
}