From: Anthony Fok Date: Sun, 11 Jan 2015 09:21:51 +0000 (-0700) Subject: Correct spelling of two test files: seperators → separators X-Git-Tag: v0.13~201 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a4eef4eb16f099a17181e2a9fa38262aafcd87f5;p=brevno-suite%2Fhugo Correct spelling of two test files: seperators → separators --- diff --git a/hugolib/path_separators_test.go b/hugolib/path_separators_test.go new file mode 100644 index 00000000..e9af0e92 --- /dev/null +++ b/hugolib/path_separators_test.go @@ -0,0 +1,54 @@ +package hugolib + +import ( + "path/filepath" + "strings" + "testing" +) + +var SIMPLE_PAGE_YAML = `--- +contenttype: "" +--- +Sample Text +` + +func TestDegenerateMissingFolderInPageFilename(t *testing.T) { + p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), filepath.Join("foobar")) + if err != nil { + t.Fatalf("Error in NewPageFrom") + } + if p.Section() != "" { + t.Fatalf("No section should be set for a file path: foobar") + } +} + +func TestNewPageWithFilePath(t *testing.T) { + toCheck := []struct { + input string + section string + layout []string + }{ + {filepath.Join("sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")}, + {filepath.Join("content", "foobar.html"), "", L("page/single.html", "_default/single.html")}, + {filepath.Join("content", "sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")}, + {filepath.Join("content", "dub", "sub", "foobar.html"), "dub", L("dub/single.html", "_default/single.html")}, + } + + for _, el := range toCheck { + p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), el.input) + if err != nil { + t.Errorf("Reading from SIMPLE_PAGE_YAML resulted in an error: %s", err) + } + if p.Section() != el.section { + t.Errorf("Section not set to %s for page %s. Got: %s", el.section, el.input, p.Section()) + } + + for _, y := range el.layout { + el.layout = append(el.layout, "theme/"+y) + } + + if !listEqual(p.Layout(), el.layout) { + t.Errorf("Layout incorrect. Expected: '%s', Got: '%s'", el.layout, p.Layout()) + } + } +} diff --git a/hugolib/path_separators_windows_test.go b/hugolib/path_separators_windows_test.go new file mode 100644 index 00000000..7f549b54 --- /dev/null +++ b/hugolib/path_separators_windows_test.go @@ -0,0 +1,18 @@ +package hugolib + +import ( + "github.com/spf13/hugo/tpl" + "testing" +) + +const ( + win_base = "c:\\a\\windows\\path\\layout" + win_path = "c:\\a\\windows\\path\\layout\\sub1\\index.html" +) + +func TestTemplatePathSeperator(t *testing.T) { + tmpl := new(tpl.GoHtmlTemplate) + if name := tmpl.GenerateTemplateNameFrom(win_base, win_path); name != "sub1/index.html" { + t.Fatalf("Template name incorrect. Expected: %s, Got: %s", "sub1/index.html", name) + } +} diff --git a/hugolib/path_seperators_test.go b/hugolib/path_seperators_test.go deleted file mode 100644 index e9af0e92..00000000 --- a/hugolib/path_seperators_test.go +++ /dev/null @@ -1,54 +0,0 @@ -package hugolib - -import ( - "path/filepath" - "strings" - "testing" -) - -var SIMPLE_PAGE_YAML = `--- -contenttype: "" ---- -Sample Text -` - -func TestDegenerateMissingFolderInPageFilename(t *testing.T) { - p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), filepath.Join("foobar")) - if err != nil { - t.Fatalf("Error in NewPageFrom") - } - if p.Section() != "" { - t.Fatalf("No section should be set for a file path: foobar") - } -} - -func TestNewPageWithFilePath(t *testing.T) { - toCheck := []struct { - input string - section string - layout []string - }{ - {filepath.Join("sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")}, - {filepath.Join("content", "foobar.html"), "", L("page/single.html", "_default/single.html")}, - {filepath.Join("content", "sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")}, - {filepath.Join("content", "dub", "sub", "foobar.html"), "dub", L("dub/single.html", "_default/single.html")}, - } - - for _, el := range toCheck { - p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), el.input) - if err != nil { - t.Errorf("Reading from SIMPLE_PAGE_YAML resulted in an error: %s", err) - } - if p.Section() != el.section { - t.Errorf("Section not set to %s for page %s. Got: %s", el.section, el.input, p.Section()) - } - - for _, y := range el.layout { - el.layout = append(el.layout, "theme/"+y) - } - - if !listEqual(p.Layout(), el.layout) { - t.Errorf("Layout incorrect. Expected: '%s', Got: '%s'", el.layout, p.Layout()) - } - } -} diff --git a/hugolib/path_seperators_windows_test.go b/hugolib/path_seperators_windows_test.go deleted file mode 100644 index 7f549b54..00000000 --- a/hugolib/path_seperators_windows_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package hugolib - -import ( - "github.com/spf13/hugo/tpl" - "testing" -) - -const ( - win_base = "c:\\a\\windows\\path\\layout" - win_path = "c:\\a\\windows\\path\\layout\\sub1\\index.html" -) - -func TestTemplatePathSeperator(t *testing.T) { - tmpl := new(tpl.GoHtmlTemplate) - if name := tmpl.GenerateTemplateNameFrom(win_base, win_path); name != "sub1/index.html" { - t.Fatalf("Template name incorrect. Expected: %s, Got: %s", "sub1/index.html", name) - } -}