github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix sort test and title sort

Browse source 
See #1299
This commit is contained in:
Bjørn Erik Pedersen 2015-07-25 17:22:19 +02:00
parent 36e0d005ed
commit 40efc8677a
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hugolib/pageSort.go
View file

@ -44,7 +44,7 @@ func (by PageBy) Sort(pages Pages) {
var DefaultPageSort = func(p1, p2 *Page) bool { var DefaultPageSort = func(p1, p2 *Page) bool {
if p1.Weight == p2.Weight { if p1.Weight == p2.Weight {
if p1.Date.Unix() == p2.Date.Unix() { 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() return p1.Date.Unix() > p2.Date.Unix()
} }

10
hugolib/pageSort_test.go
View file

@ -10,16 +10,16 @@ import (
"github.com/spf13/hugo/source" "github.com/spf13/hugo/source"
) )
func TesDefaultSort(t *testing.T) { func TestDefaultSort(t *testing.T) {
d1 := time.Now() d1 := time.Now()
d2 := d1.Add(1 * time.Hour) d2 := d1.Add(-1 * time.Hour)
d3 := d1.Add(2 * time.Hour) d3 := d1.Add(-2 * time.Hour)
p := createSortTestPages(3) p := createSortTestPages(3)
// first by weight // 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() p.Sort()
assert.Equal(t, 1, p[0].Weight) assert.Equal(t, 1, p[0].Weight)
@ -29,7 +29,7 @@ func TesDefaultSort(t *testing.T) {
assert.Equal(t, d1, p[0].Date) assert.Equal(t, d1, p[0].Date)
// finally by title // 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() p.Sort()
assert.Equal(t, "a", p[0].Title) assert.Equal(t, "a", p[0].Title)
assert.Equal(t, "b", p[1].Title) assert.Equal(t, "b", p[1].Title)