From eb038cfa0a8ada29dfcba1204ec5c432da9ed7e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sat, 20 Oct 2018 17:38:49 +0200 Subject: Convert the rest to new page parser code paths And remove some now unused code. See #5324 --- parser/frontmatter_test.go | 206 ++++----------------------------------------- 1 file changed, 15 insertions(+), 191 deletions(-) (limited to 'parser/frontmatter_test.go') diff --git a/parser/frontmatter_test.go b/parser/frontmatter_test.go index d6e6e79c3..9d9b7c3b8 100644 --- a/parser/frontmatter_test.go +++ b/parser/frontmatter_test.go @@ -15,55 +15,55 @@ package parser import ( "bytes" - "fmt" "reflect" - "strings" "testing" + + "github.com/gohugoio/hugo/parser/metadecoders" ) func TestInterfaceToConfig(t *testing.T) { cases := []struct { - input interface{} - mark byte - want []byte - isErr bool + input interface{} + format metadecoders.Format + want []byte + isErr bool }{ // TOML - {map[string]interface{}{}, TOMLLead[0], nil, false}, + {map[string]interface{}{}, metadecoders.TOML, nil, false}, { map[string]interface{}{"title": "test 1"}, - TOMLLead[0], + metadecoders.TOML, []byte("title = \"test 1\"\n"), false, }, // YAML - {map[string]interface{}{}, YAMLLead[0], []byte("{}\n"), false}, + {map[string]interface{}{}, metadecoders.YAML, []byte("{}\n"), false}, { map[string]interface{}{"title": "test 1"}, - YAMLLead[0], + metadecoders.YAML, []byte("title: test 1\n"), false, }, // JSON - {map[string]interface{}{}, JSONLead[0], []byte("{}\n"), false}, + {map[string]interface{}{}, metadecoders.JSON, []byte("{}\n"), false}, { map[string]interface{}{"title": "test 1"}, - JSONLead[0], + metadecoders.JSON, []byte("{\n \"title\": \"test 1\"\n}\n"), false, }, // Errors - {nil, TOMLLead[0], nil, true}, - {map[string]interface{}{}, '$', nil, true}, + {nil, metadecoders.TOML, nil, true}, + {map[string]interface{}{}, "foo", nil, true}, } for i, c := range cases { var buf bytes.Buffer - err := InterfaceToConfig(c.input, rune(c.mark), &buf) + err := InterfaceToConfig(c.input, c.format, &buf) if err != nil { if c.isErr { continue @@ -76,179 +76,3 @@ func TestInterfaceToConfig(t *testing.T) { } } } - -func TestInterfaceToFrontMatter(t *testing.T) { - cases := []struct { - input interface{} - mark rune - want []byte - isErr bool - }{ - // TOML - {map[string]interface{}{}, '+', []byte("+++\n\n+++\n"), false}, - { - map[string]interface{}{"title": "test 1"}, - '+', - []byte("+++\ntitle = \"test 1\"\n\n+++\n"), - false, - }, - - // YAML - {map[string]interface{}{}, '-', []byte("---\n{}\n---\n"), false}, // - { - map[string]interface{}{"title": "test 1"}, - '-', - []byte("---\ntitle: test 1\n---\n"), - false, - }, - - // JSON - {map[string]interface{}{}, '{', []byte("{}\n"), false}, - { - map[string]interface{}{"title": "test 1"}, - '{', - []byte("{\n \"title\": \"test 1\"\n}\n"), - false, - }, - - // Errors - {nil, '+', nil, true}, - {map[string]interface{}{}, '$', nil, true}, - } - - for i, c := range cases { - var buf bytes.Buffer - err := InterfaceToFrontMatter(c.input, c.mark, &buf) - if err != nil { - if c.isErr { - continue - } - t.Fatalf("[%d] unexpected error value: %v", i, err) - } - - if !reflect.DeepEqual(buf.Bytes(), c.want) { - t.Errorf("[%d] not equal:\nwant %q,\n got %q", i, c.want, buf.Bytes()) - } - } -} - -func TestFormatToLeadRune(t *testing.T) { - for i, this := range []struct { - kind string - expect rune - }{ - {"yaml", '-'}, - {"yml", '-'}, - {"toml", '+'}, - {"tml", '+'}, - {"json", '{'}, - {"js", '{'}, - {"org", '#'}, - {"unknown", '+'}, - } { - result := FormatToLeadRune(this.kind) - - if result != this.expect { - t.Errorf("[%d] got %q but expected %q", i, result, this.expect) - } - } -} - -func TestRemoveTOMLIdentifier(t *testing.T) { - cases := []struct { - input string - want string - }{ - {"a = 1", "a = 1"}, - {"a = 1\r\n", "a = 1\r\n"}, - {"+++\r\na = 1\r\n+++\r\n", "a = 1\r\n"}, - {"+++\na = 1\n+++\n", "a = 1\n"}, - {"+++\nb = \"+++ oops +++\"\n+++\n", "b = \"+++ oops +++\"\n"}, - {"+++\nc = \"\"\"+++\noops\n+++\n\"\"\"\"\n+++\n", "c = \"\"\"+++\noops\n+++\n\"\"\"\"\n"}, - {"+++\nd = 1\n+++", "d = 1\n"}, - } - - for i, c := range cases { - res := removeTOMLIdentifier([]byte(c.input)) - if string(res) != c.want { - t.Errorf("[%d] given %q\nwant: %q\n got: %q", i, c.input, c.want, res) - } - } -} - -func BenchmarkFrontmatterTags(b *testing.B) { - - for _, frontmatter := range []string{"JSON", "YAML", "YAML2", "TOML"} { - for i := 1; i < 60; i += 20 { - doBenchmarkFrontmatter(b, frontmatter, i) - } - } -} - -func doBenchmarkFrontmatter(b *testing.B, fileformat string, numTags int) { - yamlTemplate := `--- -name: "Tags" -tags: -%s ---- -` - - yaml2Template := `--- -name: "Tags" -tags: %s ---- -` - tomlTemplate := `+++ -name = "Tags" -tags = %s -+++ -` - - jsonTemplate := `{ - "name": "Tags", - "tags": [ - %s - ] -}` - name := fmt.Sprintf("%s:%d", fileformat, numTags) - b.Run(name, func(b *testing.B) { - tags := make([]string, numTags) - var ( - tagsStr string - frontmatterTemplate string - ) - for i := 0; i < numTags; i++ { - tags[i] = fmt.Sprintf("Hugo %d", i+1) - } - if fileformat == "TOML" { - frontmatterTemplate = tomlTemplate - tagsStr = strings.Replace(fmt.Sprintf("%q", tags), " ", ", ", -1) - } else if fileformat == "JSON" { - frontmatterTemplate = jsonTemplate - tagsStr = strings.Replace(fmt.Sprintf("%q", tags), " ", ", ", -1) - } else if fileformat == "YAML2" { - frontmatterTemplate = yaml2Template - tagsStr = strings.Replace(fmt.Sprintf("%q", tags), " ", ", ", -1) - } else { - frontmatterTemplate = yamlTemplate - for _, tag := range tags { - tagsStr += "\n- " + tag - } - } - - frontmatter := fmt.Sprintf(frontmatterTemplate, tagsStr) - - p := page{frontmatter: []byte(frontmatter)} - - b.ResetTimer() - for i := 0; i < b.N; i++ { - meta, err := p.Metadata() - if err != nil { - b.Fatal(err) - } - if meta == nil { - b.Fatal("Meta is nil") - } - } - }) -} -- cgit v1.2.3