Introduce unit testing for page.go

diff --git a/hugolib/page.go b/hugolib/page.go
index 3ec2b9005a30f9f07c2a4a03e923e0974fa587d0..b6a8498f77b729801be775170ed552573a655269 100644 (file)
--- a/hugolib/page.go
+++ b/hugolib/page.go
@@ -78,10 +78,9 @@ func (p Pages) Limit(n int) Pages { return p[0:n] }
 
 func initializePage(filename string) (page Page) {
        page = Page{contentType: "",
-               File: File{FileName: filename,
-               Extension: "html"},
+               File:   File{FileName: filename, Extension: "html"},
+               Node:   Node{Keywords: make([]string, 10, 30)},
                Params: make(map[string]interface{}),
-               Node: Node{Keywords: make([]string, 10, 30)},
                Markup: "md"}
        page.Date, _ = time.Parse("20060102", "20080101")
        page.setSection()

diff --git a/hugolib/path_seperators_test.go b/hugolib/path_seperators_test.go
index 79f1dd46be3e98eab794528ca13168f1d8909892..e86d5a216563829761205562e437452c2ccebd12 100644 (file)
--- a/hugolib/path_seperators_test.go
+++ b/hugolib/path_seperators_test.go
@@ -1,17 +1,33 @@
 package hugolib
 
 import (
-       "testing"
        "path/filepath"
+       "testing"
 )
 
 func TestDegenerateMissingFolderInPageFilename(t *testing.T) {
        p := NewPage(filepath.Join("foobar"))
-       if p != nil {
-               t.Fatalf("Creating a new Page without a subdirectory should result in nil page")
+       if p.Section != "" {
+               t.Fatalf("No section should be set for a file path: foobar")
+       }
+}
+
+func TestCreateNewPage(t *testing.T) {
+       toCheck := []map[string]string{
+               {"input": filepath.Join("sub", "foobar.html"), "expect": "sub"},
+               {"input": filepath.Join("content", "sub", "foobar.html"), "expect": "sub"},
+               {"input": filepath.Join("content", "dub", "sub", "foobar.html"), "expect": "sub"},
+       }
+
+       for _, el := range toCheck {
+               p := NewPage(el["input"])
+               if p.Section != el["expect"] {
+                       t.Fatalf("Section not set to %s for page %s. Got: %s", el["expect"], el["input"], p.Section)
+               }
        }
 }
 
+
 func TestSettingOutFileOnPageContainsCorrectSlashes(t *testing.T) {
        s := NewSite(&Config{})
        p := NewPage(filepath.Join("sub", "foobar"))

diff --git a/hugolib/site.go b/hugolib/site.go
index 4b21679b88f51557d18029aaeba7f8b899e34d52..c3a65f80e90af75fb5ab2b7e4d123e4fe1fd323e 100644 (file)
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -297,7 +297,7 @@ func (s *Site) RenderPages() error {
 
 func (s *Site) WritePages() {
        for _, p := range s.Pages {
-               s.WritePublic(p.Section + slash + p.OutFile, p.RenderedContent.Bytes())
+               s.WritePublic(p.Section+slash+p.OutFile, p.RenderedContent.Bytes())
        }
 }
 
@@ -409,7 +409,7 @@ func (s *Site) RenderLists() error {
                if err != nil {
                        return err
                }
-               s.WritePublic(section + slash + "index.html", x.Bytes())
+               s.WritePublic(section+slash+"index.html", x.Bytes())
 
                if a := s.Tmpl.Lookup("rss.xml"); a != nil {
                        // XML Feed
@@ -417,7 +417,7 @@ func (s *Site) RenderLists() error {
                        n.Permalink = template.HTML(string(n.Site.BaseUrl) + n.Url)
                        y := s.NewXMLBuffer()
                        s.Tmpl.ExecuteTemplate(y, "rss.xml", n)
-                       s.WritePublic(section + slash + "index.xml", y.Bytes())
+                       s.WritePublic(section+slash+"index.xml", y.Bytes())
                }
        }
        return nil