2018-09-10 03:48:10 -04:00
|
|
|
|
// Copyright 2018 The Hugo Authors. All rights reserved.
|
2017-03-13 18:55:02 -04:00
|
|
|
|
//
|
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
//
|
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
|
|
package collections
|
|
|
|
|
|
|
|
|
|
import (
|
|
|
|
|
"errors"
|
|
|
|
|
"fmt"
|
|
|
|
|
"html/template"
|
|
|
|
|
"math/rand"
|
|
|
|
|
"reflect"
|
|
|
|
|
"testing"
|
|
|
|
|
"time"
|
|
|
|
|
|
2018-10-03 08:58:09 -04:00
|
|
|
|
"github.com/gohugoio/hugo/common/loggers"
|
2017-06-13 12:42:45 -04:00
|
|
|
|
"github.com/gohugoio/hugo/config"
|
|
|
|
|
"github.com/gohugoio/hugo/deps"
|
|
|
|
|
"github.com/gohugoio/hugo/helpers"
|
|
|
|
|
"github.com/gohugoio/hugo/hugofs"
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
|
"github.com/gohugoio/hugo/langs"
|
2017-05-17 22:29:35 -04:00
|
|
|
|
"github.com/spf13/viper"
|
2017-03-13 18:55:02 -04:00
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
type tstNoStringer struct{}
|
|
|
|
|
|
|
|
|
|
func TestAfter(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
index interface{}
|
|
|
|
|
seq interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{int(2), []string{"a", "b", "c", "d"}, []string{"c", "d"}},
|
2018-07-01 14:34:02 -04:00
|
|
|
|
{int32(3), []string{"a", "b"}, []string{}},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{int64(2), []int{100, 200, 300}, []int{300}},
|
2018-07-01 14:34:02 -04:00
|
|
|
|
{100, []int{100, 200}, []int{}},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{"1", []int{100, 200, 300}, []int{200, 300}},
|
|
|
|
|
{int64(-1), []int{100, 200, 300}, false},
|
|
|
|
|
{"noint", []int{100, 200, 300}, false},
|
2018-07-01 14:34:02 -04:00
|
|
|
|
{2, []string{}, []string{}},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{1, nil, false},
|
|
|
|
|
{nil, []int{100}, false},
|
|
|
|
|
{1, t, false},
|
|
|
|
|
{1, (*string)(nil), false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.After(test.index, test.seq)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-08 07:00:36 -04:00
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
require.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type tstGrouper struct {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type tstGroupers []*tstGrouper
|
|
|
|
|
|
|
|
|
|
func (g tstGrouper) Group(key interface{}, items interface{}) (interface{}, error) {
|
|
|
|
|
ilen := reflect.ValueOf(items).Len()
|
|
|
|
|
return fmt.Sprintf("%v(%d)", key, ilen), nil
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-08 15:56:36 -04:00
|
|
|
|
type tstGrouper2 struct {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (g *tstGrouper2) Group(key interface{}, items interface{}) (interface{}, error) {
|
|
|
|
|
ilen := reflect.ValueOf(items).Len()
|
|
|
|
|
return fmt.Sprintf("%v(%d)", key, ilen), nil
|
|
|
|
|
}
|
|
|
|
|
|
2018-09-08 07:00:36 -04:00
|
|
|
|
func TestGroup(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
key interface{}
|
|
|
|
|
items interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{"a", []*tstGrouper{&tstGrouper{}, &tstGrouper{}}, "a(2)"},
|
|
|
|
|
{"b", tstGroupers{&tstGrouper{}, &tstGrouper{}}, "b(2)"},
|
|
|
|
|
{"a", []tstGrouper{tstGrouper{}, tstGrouper{}}, "a(2)"},
|
2018-09-08 15:56:36 -04:00
|
|
|
|
{"a", []*tstGrouper2{&tstGrouper2{}, &tstGrouper2{}}, "a(2)"},
|
|
|
|
|
{"b", []tstGrouper2{tstGrouper2{}, tstGrouper2{}}, "b(2)"},
|
2018-09-08 07:00:36 -04:00
|
|
|
|
{"a", []*tstGrouper{}, "a(0)"},
|
|
|
|
|
{"a", []string{"a", "b"}, false},
|
2018-09-09 04:15:11 -04:00
|
|
|
|
{"a", "asdf", false},
|
|
|
|
|
{"a", nil, false},
|
2018-09-08 07:00:36 -04:00
|
|
|
|
{nil, []*tstGrouper{&tstGrouper{}, &tstGrouper{}}, false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Group(test.key, test.items)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
require.NoError(t, err, errMsg)
|
2018-07-01 14:34:02 -04:00
|
|
|
|
require.Equal(t, test.expect, result, errMsg)
|
2017-03-13 18:55:02 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestDelimit(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
seq interface{}
|
|
|
|
|
delimiter interface{}
|
|
|
|
|
last interface{}
|
|
|
|
|
expect template.HTML
|
|
|
|
|
}{
|
|
|
|
|
{[]string{"class1", "class2", "class3"}, " ", nil, "class1 class2 class3"},
|
|
|
|
|
{[]int{1, 2, 3, 4, 5}, ",", nil, "1,2,3,4,5"},
|
|
|
|
|
{[]int{1, 2, 3, 4, 5}, ", ", nil, "1, 2, 3, 4, 5"},
|
|
|
|
|
{[]string{"class1", "class2", "class3"}, " ", " and ", "class1 class2 and class3"},
|
|
|
|
|
{[]int{1, 2, 3, 4, 5}, ",", ",", "1,2,3,4,5"},
|
|
|
|
|
{[]int{1, 2, 3, 4, 5}, ", ", ", and ", "1, 2, 3, 4, and 5"},
|
|
|
|
|
// test maps with and without sorting required
|
|
|
|
|
{map[string]int{"1": 10, "2": 20, "3": 30, "4": 40, "5": 50}, "--", nil, "10--20--30--40--50"},
|
|
|
|
|
{map[string]int{"3": 10, "2": 20, "1": 30, "4": 40, "5": 50}, "--", nil, "30--20--10--40--50"},
|
|
|
|
|
{map[string]string{"1": "10", "2": "20", "3": "30", "4": "40", "5": "50"}, "--", nil, "10--20--30--40--50"},
|
|
|
|
|
{map[string]string{"3": "10", "2": "20", "1": "30", "4": "40", "5": "50"}, "--", nil, "30--20--10--40--50"},
|
|
|
|
|
{map[string]string{"one": "10", "two": "20", "three": "30", "four": "40", "five": "50"}, "--", nil, "50--40--10--30--20"},
|
|
|
|
|
{map[int]string{1: "10", 2: "20", 3: "30", 4: "40", 5: "50"}, "--", nil, "10--20--30--40--50"},
|
|
|
|
|
{map[int]string{3: "10", 2: "20", 1: "30", 4: "40", 5: "50"}, "--", nil, "30--20--10--40--50"},
|
|
|
|
|
{map[float64]string{3.3: "10", 2.3: "20", 1.3: "30", 4.3: "40", 5.3: "50"}, "--", nil, "30--20--10--40--50"},
|
|
|
|
|
// test maps with a last delimiter
|
|
|
|
|
{map[string]int{"1": 10, "2": 20, "3": 30, "4": 40, "5": 50}, "--", "--and--", "10--20--30--40--and--50"},
|
|
|
|
|
{map[string]int{"3": 10, "2": 20, "1": 30, "4": 40, "5": 50}, "--", "--and--", "30--20--10--40--and--50"},
|
|
|
|
|
{map[string]string{"1": "10", "2": "20", "3": "30", "4": "40", "5": "50"}, "--", "--and--", "10--20--30--40--and--50"},
|
|
|
|
|
{map[string]string{"3": "10", "2": "20", "1": "30", "4": "40", "5": "50"}, "--", "--and--", "30--20--10--40--and--50"},
|
|
|
|
|
{map[string]string{"one": "10", "two": "20", "three": "30", "four": "40", "five": "50"}, "--", "--and--", "50--40--10--30--and--20"},
|
|
|
|
|
{map[int]string{1: "10", 2: "20", 3: "30", 4: "40", 5: "50"}, "--", "--and--", "10--20--30--40--and--50"},
|
|
|
|
|
{map[int]string{3: "10", 2: "20", 1: "30", 4: "40", 5: "50"}, "--", "--and--", "30--20--10--40--and--50"},
|
|
|
|
|
{map[float64]string{3.5: "10", 2.5: "20", 1.5: "30", 4.5: "40", 5.5: "50"}, "--", "--and--", "30--20--10--40--and--50"},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
var result template.HTML
|
|
|
|
|
var err error
|
|
|
|
|
|
|
|
|
|
if test.last == nil {
|
|
|
|
|
result, err = ns.Delimit(test.seq, test.delimiter)
|
|
|
|
|
} else {
|
|
|
|
|
result, err = ns.Delimit(test.seq, test.delimiter, test.last)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestDictionary(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
values []interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{[]interface{}{"a", "b"}, map[string]interface{}{"a": "b"}},
|
|
|
|
|
{[]interface{}{"a", 12, "b", []int{4}}, map[string]interface{}{"a": 12, "b": []int{4}}},
|
|
|
|
|
// errors
|
|
|
|
|
{[]interface{}{5, "b"}, false},
|
|
|
|
|
{[]interface{}{"a", "b", "c"}, false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test.values)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Dictionary(test.values...)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestEchoParam(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
a interface{}
|
|
|
|
|
key interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{[]int{1, 2, 3}, 1, int64(2)},
|
|
|
|
|
{[]uint{1, 2, 3}, 1, uint64(2)},
|
|
|
|
|
{[]float64{1.1, 2.2, 3.3}, 1, float64(2.2)},
|
|
|
|
|
{[]string{"foo", "bar", "baz"}, 1, "bar"},
|
|
|
|
|
{[]TstX{{A: "a", B: "b"}, {A: "c", B: "d"}, {A: "e", B: "f"}}, 1, ""},
|
|
|
|
|
{map[string]int{"foo": 1, "bar": 2, "baz": 3}, "bar", int64(2)},
|
|
|
|
|
{map[string]uint{"foo": 1, "bar": 2, "baz": 3}, "bar", uint64(2)},
|
|
|
|
|
{map[string]float64{"foo": 1.1, "bar": 2.2, "baz": 3.3}, "bar", float64(2.2)},
|
|
|
|
|
{map[string]string{"foo": "FOO", "bar": "BAR", "baz": "BAZ"}, "bar", "BAR"},
|
|
|
|
|
{map[string]TstX{"foo": {A: "a", B: "b"}, "bar": {A: "c", B: "d"}, "baz": {A: "e", B: "f"}}, "bar", ""},
|
|
|
|
|
{map[string]interface{}{"foo": nil}, "foo", ""},
|
|
|
|
|
{(*[]string)(nil), "bar", ""},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result := ns.EchoParam(test.a, test.key)
|
|
|
|
|
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestFirst(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
limit interface{}
|
|
|
|
|
seq interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{int(2), []string{"a", "b", "c"}, []string{"a", "b"}},
|
|
|
|
|
{int32(3), []string{"a", "b"}, []string{"a", "b"}},
|
|
|
|
|
{int64(2), []int{100, 200, 300}, []int{100, 200}},
|
|
|
|
|
{100, []int{100, 200}, []int{100, 200}},
|
|
|
|
|
{"1", []int{100, 200, 300}, []int{100}},
|
2018-09-22 14:58:46 -04:00
|
|
|
|
{0, []string{"h", "u", "g", "o"}, []string{}},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{int64(-1), []int{100, 200, 300}, false},
|
|
|
|
|
{"noint", []int{100, 200, 300}, false},
|
|
|
|
|
{1, nil, false},
|
|
|
|
|
{nil, []int{100}, false},
|
|
|
|
|
{1, t, false},
|
|
|
|
|
{1, (*string)(nil), false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.First(test.limit, test.seq)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestIn(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
l1 interface{}
|
|
|
|
|
l2 interface{}
|
|
|
|
|
expect bool
|
|
|
|
|
}{
|
|
|
|
|
{[]string{"a", "b", "c"}, "b", true},
|
|
|
|
|
{[]interface{}{"a", "b", "c"}, "b", true},
|
|
|
|
|
{[]interface{}{"a", "b", "c"}, "d", false},
|
|
|
|
|
{[]string{"a", "b", "c"}, "d", false},
|
|
|
|
|
{[]string{"a", "12", "c"}, 12, false},
|
|
|
|
|
{[]string{"a", "b", "c"}, nil, false},
|
|
|
|
|
{[]int{1, 2, 4}, 2, true},
|
|
|
|
|
{[]interface{}{1, 2, 4}, 2, true},
|
|
|
|
|
{[]interface{}{1, 2, 4}, nil, false},
|
|
|
|
|
{[]interface{}{nil}, nil, false},
|
|
|
|
|
{[]int{1, 2, 4}, 3, false},
|
|
|
|
|
{[]float64{1.23, 2.45, 4.67}, 1.23, true},
|
|
|
|
|
{[]float64{1.234567, 2.45, 4.67}, 1.234568, false},
|
2017-07-03 04:08:55 -04:00
|
|
|
|
{[]float64{1, 2, 3}, 1, true},
|
|
|
|
|
{[]float32{1, 2, 3}, 1, true},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{"this substring should be found", "substring", true},
|
|
|
|
|
{"this substring should not be found", "subseastring", false},
|
|
|
|
|
{nil, "foo", false},
|
|
|
|
|
} {
|
2017-07-03 04:08:55 -04:00
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result := ns.In(test.l1, test.l2)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-07-03 04:32:10 -04:00
|
|
|
|
type page struct {
|
|
|
|
|
Title string
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (p page) String() string {
|
|
|
|
|
return "p-" + p.Title
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type pagesPtr []*page
|
|
|
|
|
type pagesVals []page
|
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
func TestIntersect(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
2017-07-03 04:32:10 -04:00
|
|
|
|
var (
|
|
|
|
|
p1 = &page{"A"}
|
|
|
|
|
p2 = &page{"B"}
|
|
|
|
|
p3 = &page{"C"}
|
|
|
|
|
p4 = &page{"D"}
|
|
|
|
|
|
|
|
|
|
p1v = page{"A"}
|
|
|
|
|
p2v = page{"B"}
|
|
|
|
|
p3v = page{"C"}
|
|
|
|
|
p4v = page{"D"}
|
|
|
|
|
)
|
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
l1, l2 interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{[]string{"a", "b", "c", "c"}, []string{"a", "b", "b"}, []string{"a", "b"}},
|
|
|
|
|
{[]string{"a", "b"}, []string{"a", "b", "c"}, []string{"a", "b"}},
|
|
|
|
|
{[]string{"a", "b", "c"}, []string{"d", "e"}, []string{}},
|
|
|
|
|
{[]string{}, []string{}, []string{}},
|
2017-05-01 22:25:39 -04:00
|
|
|
|
{[]string{"a", "b"}, nil, []interface{}{}},
|
|
|
|
|
{nil, []string{"a", "b"}, []interface{}{}},
|
|
|
|
|
{nil, nil, []interface{}{}},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{[]string{"1", "2"}, []int{1, 2}, []string{}},
|
|
|
|
|
{[]int{1, 2}, []string{"1", "2"}, []int{}},
|
|
|
|
|
{[]int{1, 2, 4}, []int{2, 4}, []int{2, 4}},
|
|
|
|
|
{[]int{2, 4}, []int{1, 2, 4}, []int{2, 4}},
|
|
|
|
|
{[]int{1, 2, 4}, []int{3, 6}, []int{}},
|
|
|
|
|
{[]float64{2.2, 4.4}, []float64{1.1, 2.2, 4.4}, []float64{2.2, 4.4}},
|
2017-07-03 04:32:10 -04:00
|
|
|
|
|
2017-05-01 22:25:39 -04:00
|
|
|
|
// []interface{} ∩ []interface{}
|
|
|
|
|
{[]interface{}{"a", "b", "c"}, []interface{}{"a", "b", "b"}, []interface{}{"a", "b"}},
|
|
|
|
|
{[]interface{}{1, 2, 3}, []interface{}{1, 2, 2}, []interface{}{1, 2}},
|
|
|
|
|
{[]interface{}{int8(1), int8(2), int8(3)}, []interface{}{int8(1), int8(2), int8(2)}, []interface{}{int8(1), int8(2)}},
|
|
|
|
|
{[]interface{}{int16(1), int16(2), int16(3)}, []interface{}{int16(1), int16(2), int16(2)}, []interface{}{int16(1), int16(2)}},
|
|
|
|
|
{[]interface{}{int32(1), int32(2), int32(3)}, []interface{}{int32(1), int32(2), int32(2)}, []interface{}{int32(1), int32(2)}},
|
|
|
|
|
{[]interface{}{int64(1), int64(2), int64(3)}, []interface{}{int64(1), int64(2), int64(2)}, []interface{}{int64(1), int64(2)}},
|
|
|
|
|
{[]interface{}{float32(1), float32(2), float32(3)}, []interface{}{float32(1), float32(2), float32(2)}, []interface{}{float32(1), float32(2)}},
|
|
|
|
|
{[]interface{}{float64(1), float64(2), float64(3)}, []interface{}{float64(1), float64(2), float64(2)}, []interface{}{float64(1), float64(2)}},
|
|
|
|
|
|
|
|
|
|
// []interface{} ∩ []T
|
|
|
|
|
{[]interface{}{"a", "b", "c"}, []string{"a", "b", "b"}, []interface{}{"a", "b"}},
|
|
|
|
|
{[]interface{}{1, 2, 3}, []int{1, 2, 2}, []interface{}{1, 2}},
|
|
|
|
|
{[]interface{}{int8(1), int8(2), int8(3)}, []int8{1, 2, 2}, []interface{}{int8(1), int8(2)}},
|
|
|
|
|
{[]interface{}{int16(1), int16(2), int16(3)}, []int16{1, 2, 2}, []interface{}{int16(1), int16(2)}},
|
|
|
|
|
{[]interface{}{int32(1), int32(2), int32(3)}, []int32{1, 2, 2}, []interface{}{int32(1), int32(2)}},
|
|
|
|
|
{[]interface{}{int64(1), int64(2), int64(3)}, []int64{1, 2, 2}, []interface{}{int64(1), int64(2)}},
|
2017-05-21 22:10:27 -04:00
|
|
|
|
{[]interface{}{uint(1), uint(2), uint(3)}, []uint{1, 2, 2}, []interface{}{uint(1), uint(2)}},
|
2017-05-01 22:25:39 -04:00
|
|
|
|
{[]interface{}{float32(1), float32(2), float32(3)}, []float32{1, 2, 2}, []interface{}{float32(1), float32(2)}},
|
|
|
|
|
{[]interface{}{float64(1), float64(2), float64(3)}, []float64{1, 2, 2}, []interface{}{float64(1), float64(2)}},
|
|
|
|
|
|
|
|
|
|
// []T ∩ []interface{}
|
|
|
|
|
{[]string{"a", "b", "c"}, []interface{}{"a", "b", "b"}, []string{"a", "b"}},
|
|
|
|
|
{[]int{1, 2, 3}, []interface{}{1, 2, 2}, []int{1, 2}},
|
|
|
|
|
{[]int8{1, 2, 3}, []interface{}{int8(1), int8(2), int8(2)}, []int8{1, 2}},
|
|
|
|
|
{[]int16{1, 2, 3}, []interface{}{int16(1), int16(2), int16(2)}, []int16{1, 2}},
|
|
|
|
|
{[]int32{1, 2, 3}, []interface{}{int32(1), int32(2), int32(2)}, []int32{1, 2}},
|
|
|
|
|
{[]int64{1, 2, 3}, []interface{}{int64(1), int64(2), int64(2)}, []int64{1, 2}},
|
|
|
|
|
{[]float32{1, 2, 3}, []interface{}{float32(1), float32(2), float32(2)}, []float32{1, 2}},
|
|
|
|
|
{[]float64{1, 2, 3}, []interface{}{float64(1), float64(2), float64(2)}, []float64{1, 2}},
|
2017-07-03 04:32:10 -04:00
|
|
|
|
|
|
|
|
|
// Structs
|
|
|
|
|
{pagesPtr{p1, p4, p2, p3}, pagesPtr{p4, p2, p2}, pagesPtr{p4, p2}},
|
|
|
|
|
{pagesVals{p1v, p4v, p2v, p3v}, pagesVals{p1v, p3v, p3v}, pagesVals{p1v, p3v}},
|
|
|
|
|
{[]interface{}{p1, p4, p2, p3}, []interface{}{p4, p2, p2}, []interface{}{p4, p2}},
|
|
|
|
|
{[]interface{}{p1v, p4v, p2v, p3v}, []interface{}{p1v, p3v, p3v}, []interface{}{p1v, p3v}},
|
2017-07-08 04:34:42 -04:00
|
|
|
|
{pagesPtr{p1, p4, p2, p3}, pagesPtr{}, pagesPtr{}},
|
|
|
|
|
{pagesVals{}, pagesVals{p1v, p3v, p3v}, pagesVals{}},
|
|
|
|
|
{[]interface{}{p1, p4, p2, p3}, []interface{}{}, []interface{}{}},
|
|
|
|
|
{[]interface{}{}, []interface{}{p1v, p3v, p3v}, []interface{}{}},
|
2018-09-10 15:16:05 -04:00
|
|
|
|
|
|
|
|
|
// errors
|
|
|
|
|
{"not array or slice", []string{"a"}, false},
|
|
|
|
|
{[]string{"a"}, "not array or slice", false},
|
|
|
|
|
|
|
|
|
|
// uncomparable types - #3820
|
|
|
|
|
{[]map[int]int{{1: 1}, {2: 2}}, []map[int]int{{2: 2}, {3: 3}}, false},
|
|
|
|
|
{[][]int{{1, 1}, {1, 2}}, [][]int{{1, 2}, {1, 2}, {1, 3}}, false},
|
|
|
|
|
{[]int{1, 1}, [][]int{{1, 2}, {1, 2}, {1, 3}}, false},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
} {
|
2017-07-03 04:32:10 -04:00
|
|
|
|
|
2018-09-10 15:16:05 -04:00
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
2017-03-13 18:55:02 -04:00
|
|
|
|
|
|
|
|
|
result, err := ns.Intersect(test.l1, test.l2)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert.NoError(t, err, errMsg)
|
2017-07-03 04:32:10 -04:00
|
|
|
|
if !reflect.DeepEqual(result, test.expect) {
|
|
|
|
|
t.Fatalf("[%d] Got\n%v expected\n%v", i, result, test.expect)
|
|
|
|
|
}
|
2017-03-13 18:55:02 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestIsSet(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
2018-03-21 12:21:46 -04:00
|
|
|
|
ns := newTestNs()
|
2017-03-13 18:55:02 -04:00
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
a interface{}
|
|
|
|
|
key interface{}
|
|
|
|
|
expect bool
|
|
|
|
|
isErr bool
|
|
|
|
|
}{
|
2018-10-02 21:29:20 -04:00
|
|
|
|
{[]interface{}{1, 2, 3, 5}, 2, true, false},
|
|
|
|
|
{[]interface{}{1, 2, 3, 5}, "2", true, false},
|
|
|
|
|
{[]interface{}{1, 2, 3, 5}, 2.0, true, false},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
|
2018-10-02 21:29:20 -04:00
|
|
|
|
{[]interface{}{1, 2, 3, 5}, 22, false, false},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
|
2018-10-02 21:29:20 -04:00
|
|
|
|
{map[string]interface{}{"a": 1, "b": 2}, "b", true, false},
|
|
|
|
|
{map[string]interface{}{"a": 1, "b": 2}, "bc", false, false},
|
|
|
|
|
|
|
|
|
|
{time.Now(), "Day", false, false},
|
|
|
|
|
{nil, "nil", false, false},
|
|
|
|
|
{[]interface{}{1, 2, 3, 5}, TstX{}, false, true},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.IsSet(test.a, test.key)
|
|
|
|
|
if test.isErr {
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestLast(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
limit interface{}
|
|
|
|
|
seq interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{int(2), []string{"a", "b", "c"}, []string{"b", "c"}},
|
|
|
|
|
{int32(3), []string{"a", "b"}, []string{"a", "b"}},
|
|
|
|
|
{int64(2), []int{100, 200, 300}, []int{200, 300}},
|
|
|
|
|
{100, []int{100, 200}, []int{100, 200}},
|
|
|
|
|
{"1", []int{100, 200, 300}, []int{300}},
|
|
|
|
|
// errors
|
|
|
|
|
{int64(-1), []int{100, 200, 300}, false},
|
|
|
|
|
{"noint", []int{100, 200, 300}, false},
|
|
|
|
|
{1, nil, false},
|
|
|
|
|
{nil, []int{100}, false},
|
|
|
|
|
{1, t, false},
|
|
|
|
|
{1, (*string)(nil), false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Last(test.limit, test.seq)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestQuerify(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
params []interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{[]interface{}{"a", "b"}, "a=b"},
|
|
|
|
|
{[]interface{}{"a", "b", "c", "d", "f", " &"}, `a=b&c=d&f=+%26`},
|
|
|
|
|
// errors
|
|
|
|
|
{[]interface{}{5, "b"}, false},
|
|
|
|
|
{[]interface{}{"a", "b", "c"}, false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test.params)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Querify(test.params...)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestSeq(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
args []interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
}{
|
|
|
|
|
{[]interface{}{-2, 5}, []int{-2, -1, 0, 1, 2, 3, 4, 5}},
|
|
|
|
|
{[]interface{}{1, 2, 4}, []int{1, 3}},
|
|
|
|
|
{[]interface{}{1}, []int{1}},
|
|
|
|
|
{[]interface{}{3}, []int{1, 2, 3}},
|
|
|
|
|
{[]interface{}{3.2}, []int{1, 2, 3}},
|
|
|
|
|
{[]interface{}{0}, []int{}},
|
|
|
|
|
{[]interface{}{-1}, []int{-1}},
|
|
|
|
|
{[]interface{}{-3}, []int{-1, -2, -3}},
|
|
|
|
|
{[]interface{}{3, -2}, []int{3, 2, 1, 0, -1, -2}},
|
|
|
|
|
{[]interface{}{6, -2, 2}, []int{6, 4, 2}},
|
|
|
|
|
// errors
|
|
|
|
|
{[]interface{}{1, 0, 2}, false},
|
|
|
|
|
{[]interface{}{1, -1, 2}, false},
|
|
|
|
|
{[]interface{}{2, 1, 1}, false},
|
|
|
|
|
{[]interface{}{2, 1, 1, 1}, false},
|
|
|
|
|
{[]interface{}{2001}, false},
|
|
|
|
|
{[]interface{}{}, false},
|
|
|
|
|
{[]interface{}{0, -1000000}, false},
|
|
|
|
|
{[]interface{}{tstNoStringer{}}, false},
|
|
|
|
|
{nil, false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Seq(test.args...)
|
|
|
|
|
|
|
|
|
|
if b, ok := test.expect.(bool); ok && !b {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestShuffle(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
seq interface{}
|
|
|
|
|
success bool
|
|
|
|
|
}{
|
|
|
|
|
{[]string{"a", "b", "c", "d"}, true},
|
|
|
|
|
{[]int{100, 200, 300}, true},
|
|
|
|
|
{[]int{100, 200, 300}, true},
|
|
|
|
|
{[]int{100, 200}, true},
|
|
|
|
|
{[]string{"a", "b"}, true},
|
|
|
|
|
{[]int{100, 200, 300}, true},
|
|
|
|
|
{[]int{100, 200, 300}, true},
|
|
|
|
|
{[]int{100}, true},
|
|
|
|
|
// errors
|
|
|
|
|
{nil, false},
|
|
|
|
|
{t, false},
|
|
|
|
|
{(*string)(nil), false},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Shuffle(test.seq)
|
|
|
|
|
|
|
|
|
|
if !test.success {
|
|
|
|
|
require.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
|
|
|
|
|
|
resultv := reflect.ValueOf(result)
|
|
|
|
|
seqv := reflect.ValueOf(test.seq)
|
|
|
|
|
|
|
|
|
|
assert.Equal(t, resultv.Len(), seqv.Len(), errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestShuffleRandomising(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
// Note that this test can fail with false negative result if the shuffle
|
|
|
|
|
// of the sequence happens to be the same as the original sequence. However
|
|
|
|
|
// the propability of the event is 10^-158 which is negligible.
|
|
|
|
|
seqLen := 100
|
|
|
|
|
rand.Seed(time.Now().UTC().UnixNano())
|
|
|
|
|
|
|
|
|
|
for _, test := range []struct {
|
|
|
|
|
seq []int
|
|
|
|
|
}{
|
|
|
|
|
{rand.Perm(seqLen)},
|
|
|
|
|
} {
|
|
|
|
|
result, err := ns.Shuffle(test.seq)
|
|
|
|
|
resultv := reflect.ValueOf(result)
|
|
|
|
|
|
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
|
|
allSame := true
|
|
|
|
|
for i, v := range test.seq {
|
|
|
|
|
allSame = allSame && (resultv.Index(i).Interface() == v)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert.False(t, allSame, "Expected sequence to be shuffled but was in the same order")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-10-08 04:25:15 -04:00
|
|
|
|
// Also see tests in commons/collection.
|
2017-03-13 18:55:02 -04:00
|
|
|
|
func TestSlice(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
|
|
|
|
for i, test := range []struct {
|
2018-09-09 04:15:11 -04:00
|
|
|
|
args []interface{}
|
|
|
|
|
expected interface{}
|
2017-03-13 18:55:02 -04:00
|
|
|
|
}{
|
2018-09-10 03:48:10 -04:00
|
|
|
|
{[]interface{}{"a", "b"}, []string{"a", "b"}},
|
2018-09-09 04:15:11 -04:00
|
|
|
|
{[]interface{}{}, []interface{}{}},
|
|
|
|
|
{[]interface{}{nil}, []interface{}{nil}},
|
|
|
|
|
{[]interface{}{5, "b"}, []interface{}{5, "b"}},
|
2018-09-10 03:48:10 -04:00
|
|
|
|
{[]interface{}{tstNoStringer{}}, []tstNoStringer{tstNoStringer{}}},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test.args)
|
|
|
|
|
|
|
|
|
|
result := ns.Slice(test.args...)
|
|
|
|
|
|
2018-09-09 04:15:11 -04:00
|
|
|
|
assert.Equal(t, test.expected, result, errMsg)
|
2017-03-13 18:55:02 -04:00
|
|
|
|
}
|
2018-09-09 04:15:11 -04:00
|
|
|
|
|
|
|
|
|
assert.Len(t, ns.Slice(), 0)
|
2017-03-13 18:55:02 -04:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func TestUnion(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
|
2017-07-03 04:32:10 -04:00
|
|
|
|
var (
|
|
|
|
|
p1 = &page{"A"}
|
|
|
|
|
p2 = &page{"B"}
|
|
|
|
|
// p3 = &page{"C"}
|
|
|
|
|
p4 = &page{"D"}
|
|
|
|
|
|
|
|
|
|
p1v = page{"A"}
|
|
|
|
|
//p2v = page{"B"}
|
|
|
|
|
p3v = page{"C"}
|
|
|
|
|
//p4v = page{"D"}
|
|
|
|
|
)
|
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
l1 interface{}
|
|
|
|
|
l2 interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
isErr bool
|
|
|
|
|
}{
|
2017-05-20 12:54:13 -04:00
|
|
|
|
{nil, nil, []interface{}{}, false},
|
|
|
|
|
{nil, []string{"a", "b"}, []string{"a", "b"}, false},
|
|
|
|
|
{[]string{"a", "b"}, nil, []string{"a", "b"}, false},
|
|
|
|
|
|
|
|
|
|
// []A ∪ []B
|
|
|
|
|
{[]string{"1", "2"}, []int{3}, []string{}, false},
|
|
|
|
|
{[]int{1, 2}, []string{"1", "2"}, []int{}, false},
|
|
|
|
|
|
|
|
|
|
// []T ∪ []T
|
2017-03-13 18:55:02 -04:00
|
|
|
|
{[]string{"a", "b", "c", "c"}, []string{"a", "b", "b"}, []string{"a", "b", "c"}, false},
|
|
|
|
|
{[]string{"a", "b"}, []string{"a", "b", "c"}, []string{"a", "b", "c"}, false},
|
|
|
|
|
{[]string{"a", "b", "c"}, []string{"d", "e"}, []string{"a", "b", "c", "d", "e"}, false},
|
|
|
|
|
{[]string{}, []string{}, []string{}, false},
|
|
|
|
|
{[]int{1, 2, 3}, []int{3, 4, 5}, []int{1, 2, 3, 4, 5}, false},
|
|
|
|
|
{[]int{1, 2, 3}, []int{1, 2, 3}, []int{1, 2, 3}, false},
|
|
|
|
|
{[]int{1, 2, 4}, []int{2, 4}, []int{1, 2, 4}, false},
|
|
|
|
|
{[]int{2, 4}, []int{1, 2, 4}, []int{2, 4, 1}, false},
|
|
|
|
|
{[]int{1, 2, 4}, []int{3, 6}, []int{1, 2, 4, 3, 6}, false},
|
|
|
|
|
{[]float64{2.2, 4.4}, []float64{1.1, 2.2, 4.4}, []float64{2.2, 4.4, 1.1}, false},
|
2017-05-20 12:54:13 -04:00
|
|
|
|
{[]interface{}{"a", "b", "c", "c"}, []interface{}{"a", "b", "b"}, []interface{}{"a", "b", "c"}, false},
|
|
|
|
|
|
|
|
|
|
// []T ∪ []interface{}
|
|
|
|
|
{[]string{"1", "2"}, []interface{}{"9"}, []string{"1", "2", "9"}, false},
|
|
|
|
|
{[]int{2, 4}, []interface{}{1, 2, 4}, []int{2, 4, 1}, false},
|
|
|
|
|
{[]int8{2, 4}, []interface{}{int8(1), int8(2), int8(4)}, []int8{2, 4, 1}, false},
|
|
|
|
|
{[]int8{2, 4}, []interface{}{1, 2, 4}, []int8{2, 4, 1}, false},
|
|
|
|
|
{[]int16{2, 4}, []interface{}{1, 2, 4}, []int16{2, 4, 1}, false},
|
|
|
|
|
{[]int32{2, 4}, []interface{}{1, 2, 4}, []int32{2, 4, 1}, false},
|
|
|
|
|
{[]int64{2, 4}, []interface{}{1, 2, 4}, []int64{2, 4, 1}, false},
|
2017-07-03 04:32:10 -04:00
|
|
|
|
|
2017-05-20 12:54:13 -04:00
|
|
|
|
{[]float64{2.2, 4.4}, []interface{}{1.1, 2.2, 4.4}, []float64{2.2, 4.4, 1.1}, false},
|
|
|
|
|
{[]float32{2.2, 4.4}, []interface{}{1.1, 2.2, 4.4}, []float32{2.2, 4.4, 1.1}, false},
|
|
|
|
|
|
|
|
|
|
// []interface{} ∪ []T
|
2017-05-21 22:10:27 -04:00
|
|
|
|
{[]interface{}{"a", "b", "c", "c"}, []string{"a", "b", "d"}, []interface{}{"a", "b", "c", "d"}, false},
|
2017-05-20 12:54:13 -04:00
|
|
|
|
{[]interface{}{}, []string{}, []interface{}{}, false},
|
|
|
|
|
{[]interface{}{1, 2}, []int{2, 3}, []interface{}{1, 2, 3}, false},
|
2017-07-03 04:32:10 -04:00
|
|
|
|
{[]interface{}{1, 2}, []int8{2, 3}, []interface{}{1, 2, 3}, false}, // 28
|
2017-05-21 22:10:27 -04:00
|
|
|
|
{[]interface{}{uint(1), uint(2)}, []uint{2, 3}, []interface{}{uint(1), uint(2), uint(3)}, false},
|
2017-05-20 12:54:13 -04:00
|
|
|
|
{[]interface{}{1.1, 2.2}, []float64{2.2, 3.3}, []interface{}{1.1, 2.2, 3.3}, false},
|
|
|
|
|
|
2017-07-03 04:32:10 -04:00
|
|
|
|
// Structs
|
|
|
|
|
{pagesPtr{p1, p4}, pagesPtr{p4, p2, p2}, pagesPtr{p1, p4, p2}, false},
|
|
|
|
|
{pagesVals{p1v}, pagesVals{p3v, p3v}, pagesVals{p1v, p3v}, false},
|
|
|
|
|
{[]interface{}{p1, p4}, []interface{}{p4, p2, p2}, []interface{}{p1, p4, p2}, false},
|
|
|
|
|
{[]interface{}{p1v}, []interface{}{p3v, p3v}, []interface{}{p1v, p3v}, false},
|
2017-07-08 04:31:09 -04:00
|
|
|
|
// #3686
|
|
|
|
|
{[]interface{}{p1v}, []interface{}{}, []interface{}{p1v}, false},
|
|
|
|
|
{[]interface{}{}, []interface{}{p1v}, []interface{}{p1v}, false},
|
|
|
|
|
{pagesPtr{p1}, pagesPtr{}, pagesPtr{p1}, false},
|
|
|
|
|
{pagesVals{p1v}, pagesVals{}, pagesVals{p1v}, false},
|
|
|
|
|
{pagesPtr{}, pagesPtr{p1}, pagesPtr{p1}, false},
|
|
|
|
|
{pagesVals{}, pagesVals{p1v}, pagesVals{p1v}, false},
|
2017-07-03 04:32:10 -04:00
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
// errors
|
|
|
|
|
{"not array or slice", []string{"a"}, false, true},
|
|
|
|
|
{[]string{"a"}, "not array or slice", false, true},
|
2018-09-10 15:16:05 -04:00
|
|
|
|
|
|
|
|
|
// uncomparable types - #3820
|
|
|
|
|
{[]map[string]int{{"K1": 1}}, []map[string]int{{"K2": 2}, {"K2": 2}}, false, true},
|
|
|
|
|
{[][]int{{1, 1}, {1, 2}}, [][]int{{2, 1}, {2, 2}}, false, true},
|
2017-03-13 18:55:02 -04:00
|
|
|
|
} {
|
2017-07-03 04:32:10 -04:00
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Union(test.l1, test.l2)
|
|
|
|
|
if test.isErr {
|
|
|
|
|
assert.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert.NoError(t, err, errMsg)
|
2017-07-03 04:32:10 -04:00
|
|
|
|
if !reflect.DeepEqual(result, test.expect) {
|
|
|
|
|
t.Fatalf("[%d] Got\n%v expected\n%v", i, result, test.expect)
|
|
|
|
|
}
|
2017-03-13 18:55:02 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-29 15:03:38 -04:00
|
|
|
|
func TestUniq(t *testing.T) {
|
|
|
|
|
t.Parallel()
|
|
|
|
|
|
|
|
|
|
ns := New(&deps.Deps{})
|
|
|
|
|
for i, test := range []struct {
|
|
|
|
|
l interface{}
|
|
|
|
|
expect interface{}
|
|
|
|
|
isErr bool
|
|
|
|
|
}{
|
|
|
|
|
{[]string{"a", "b", "c"}, []string{"a", "b", "c"}, false},
|
|
|
|
|
{[]string{"a", "b", "c", "c"}, []string{"a", "b", "c"}, false},
|
|
|
|
|
{[]string{"a", "b", "b", "c"}, []string{"a", "b", "c"}, false},
|
|
|
|
|
{[]string{"a", "b", "c", "b"}, []string{"a", "b", "c"}, false},
|
|
|
|
|
{[]int{1, 2, 3}, []int{1, 2, 3}, false},
|
|
|
|
|
{[]int{1, 2, 3, 3}, []int{1, 2, 3}, false},
|
|
|
|
|
{[]int{1, 2, 2, 3}, []int{1, 2, 3}, false},
|
|
|
|
|
{[]int{1, 2, 3, 2}, []int{1, 2, 3}, false},
|
|
|
|
|
{[4]int{1, 2, 3, 2}, []int{1, 2, 3}, false},
|
|
|
|
|
{nil, make([]interface{}, 0), false},
|
|
|
|
|
// should-errors
|
|
|
|
|
{1, 1, true},
|
|
|
|
|
{"foo", "fo", true},
|
|
|
|
|
} {
|
|
|
|
|
errMsg := fmt.Sprintf("[%d] %v", i, test)
|
|
|
|
|
|
|
|
|
|
result, err := ns.Uniq(test.l)
|
|
|
|
|
if test.isErr {
|
|
|
|
|
assert.Error(t, err, errMsg)
|
|
|
|
|
continue
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
assert.NoError(t, err, errMsg)
|
|
|
|
|
assert.Equal(t, test.expect, result, errMsg)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-03-13 18:55:02 -04:00
|
|
|
|
func (x *TstX) TstRp() string {
|
|
|
|
|
return "r" + x.A
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) TstRv() string {
|
|
|
|
|
return "r" + x.B
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) unexportedMethod() string {
|
|
|
|
|
return x.unexported
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) MethodWithArg(s string) string {
|
|
|
|
|
return s
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) MethodReturnNothing() {}
|
|
|
|
|
|
|
|
|
|
func (x TstX) MethodReturnErrorOnly() error {
|
|
|
|
|
return errors.New("some error occurred")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) MethodReturnTwoValues() (string, string) {
|
|
|
|
|
return "foo", "bar"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) MethodReturnValueWithError() (string, error) {
|
|
|
|
|
return "", errors.New("some error occurred")
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
func (x TstX) String() string {
|
|
|
|
|
return fmt.Sprintf("A: %s, B: %s", x.A, x.B)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
type TstX struct {
|
|
|
|
|
A, B string
|
|
|
|
|
unexported string
|
|
|
|
|
}
|
2017-05-17 22:29:35 -04:00
|
|
|
|
|
|
|
|
|
func newDeps(cfg config.Provider) *deps.Deps {
|
Add support for theme composition and inheritance
This commit adds support for theme composition and inheritance in Hugo.
With this, it helps thinking about a theme as a set of ordered components:
```toml
theme = ["my-shortcodes", "base-theme", "hyde"]
```
The theme definition example above in `config.toml` creates a theme with the 3 components with presedence from left to right.
So, Hugo will, for any given file, data entry etc., look first in the project, and then in `my-shortcode`, `base-theme` and lastly `hyde`.
Hugo uses two different algorithms to merge the filesystems, depending on the file type:
* For `i18n` and `data` files, Hugo merges deeply using the translation id and data key inside the files.
* For `static`, `layouts` (templates) and `archetypes` files, these are merged on file level. So the left-most file will be chosen.
The name used in the `theme` definition above must match a folder in `/your-site/themes`, e.g. `/your-site/themes/my-shortcodes`. There are plans to improve on this and get a URL scheme so this can be resolved automatically.
Also note that a component that is part of a theme can have its own configuration file, e.g. `config.toml`. There are currently some restrictions to what a theme component can configure:
* `params` (global and per language)
* `menu` (global and per language)
* `outputformats` and `mediatypes`
The same rules apply here: The left-most param/menu etc. with the same ID will win. There are some hidden and experimental namespace support in the above, which we will work to improve in the future, but theme authors are encouraged to create their own namespaces to avoid naming conflicts.
A final note: Themes/components can also have a `theme` definition in their `config.toml` and similar, which is the "inheritance" part of this commit's title. This is currently not supported by the Hugo theme site. We will have to wait for some "auto dependency" feature to be implemented for that to happen, but this can be a powerful feature if you want to create your own theme-variant based on others.
Fixes #4460
Fixes #4450
2018-03-01 09:01:25 -05:00
|
|
|
|
l := langs.NewLanguage("en", cfg)
|
2017-05-17 22:29:35 -04:00
|
|
|
|
l.Set("i18nDir", "i18n")
|
2017-09-25 02:59:02 -04:00
|
|
|
|
cs, err := helpers.NewContentSpec(l)
|
|
|
|
|
if err != nil {
|
|
|
|
|
panic(err)
|
|
|
|
|
}
|
2017-05-17 22:29:35 -04:00
|
|
|
|
return &deps.Deps{
|
|
|
|
|
Cfg: cfg,
|
|
|
|
|
Fs: hugofs.NewMem(l),
|
2017-09-25 02:59:02 -04:00
|
|
|
|
ContentSpec: cs,
|
2018-10-03 08:58:09 -04:00
|
|
|
|
Log: loggers.NewErrorLogger(),
|
2017-05-17 22:29:35 -04:00
|
|
|
|
}
|
|
|
|
|
}
|
2018-03-21 12:21:46 -04:00
|
|
|
|
|
|
|
|
|
func newTestNs() *Namespace {
|
|
|
|
|
v := viper.New()
|
|
|
|
|
v.Set("contentDir", "content")
|
|
|
|
|
return New(newDeps(v))
|
|
|
|
|
}
|