shithub: hugo

Info  •  Files  •  Log  •  Branches

Fix sort test and title sort

See #1299

--- a/hugolib/pageSort.go

+++ b/hugolib/pageSort.go

@@ -44,7 +44,7 @@

 var DefaultPageSort = func(p1, p2 *Page) bool {

 	if p1.Weight == p2.Weight {

 		if p1.Date.Unix() == p2.Date.Unix() {

-			return strings.Compare(p1.LinkTitle(), p2.LinkTitle()) == 1

+			return strings.Compare(p1.LinkTitle(), p2.LinkTitle()) == -1

 		}

 		return p1.Date.Unix() > p2.Date.Unix()

 	}

--- a/hugolib/pageSort_test.go

+++ b/hugolib/pageSort_test.go

@@ -10,16 +10,16 @@

 	"github.com/spf13/hugo/source"

 )

-func TesDefaultSort(t *testing.T) {

+func TestDefaultSort(t *testing.T) {

 	d1 := time.Now()

-	d2 := d1.Add(1 * time.Hour)

-	d3 := d1.Add(2 * time.Hour)

+	d2 := d1.Add(-1 * time.Hour)

+	d3 := d1.Add(-2 * time.Hour)

 	p := createSortTestPages(3)

 	// first by weight

-	setSortVals([3]time.Time{d1, d2, d3}, [3]string{"a", "b", "c"}, [3]int{3, 2, 1}, p)

+	setSortVals([3]time.Time{d1, d2, d3}, [3]string{"b", "a", "c"}, [3]int{3, 2, 1}, p)

 	p.Sort()

 	assert.Equal(t, 1, p[0].Weight)

@@ -29,7 +29,7 @@

 	assert.Equal(t, d1, p[0].Date)

 	// finally by title

-	setSortVals([3]time.Time{d3, d3, d3}, [3]string{"b", "a", "c"}, [3]int{1, 1, 1}, p)

+	setSortVals([3]time.Time{d3, d3, d3}, [3]string{"b", "c", "a"}, [3]int{1, 1, 1}, p)

 	p.Sort()

 	assert.Equal(t, "a", p[0].Title)

 	assert.Equal(t, "b", p[1].Title)