mirror of
https://github.com/gohugoio/hugo.git
synced 2024-12-02 09:49:11 -05:00
2159d77f36
The fix introduced in Hugo `0.49.1` had an unintended side-effect in the `Append` func used in both `append` and `.Scratch.Add`. This commit fixes that by loosen/fixing the type checking so concrete types can be appended to interface slices. Fixes #5303
76 lines
2.4 KiB
Go
76 lines
2.4 KiB
Go
// Copyright 2018 The Hugo Authors. All rights reserved.
|
|
//
|
|
// 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 (
|
|
"fmt"
|
|
"reflect"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestAppend(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
for i, test := range []struct {
|
|
start interface{}
|
|
addend []interface{}
|
|
expected interface{}
|
|
}{
|
|
{[]string{"a", "b"}, []interface{}{"c"}, []string{"a", "b", "c"}},
|
|
{[]string{"a", "b"}, []interface{}{"c", "d", "e"}, []string{"a", "b", "c", "d", "e"}},
|
|
{[]string{"a", "b"}, []interface{}{[]string{"c", "d", "e"}}, []string{"a", "b", "c", "d", "e"}},
|
|
{nil, []interface{}{"a", "b"}, []string{"a", "b"}},
|
|
{nil, []interface{}{nil}, []interface{}{nil}},
|
|
{[]interface{}{}, []interface{}{[]string{"c", "d", "e"}}, []string{"c", "d", "e"}},
|
|
{tstSlicers{&tstSlicer{"a"}, &tstSlicer{"b"}},
|
|
[]interface{}{&tstSlicer{"c"}},
|
|
tstSlicers{&tstSlicer{"a"}, &tstSlicer{"b"}, &tstSlicer{"c"}}},
|
|
{&tstSlicers{&tstSlicer{"a"}, &tstSlicer{"b"}},
|
|
[]interface{}{&tstSlicer{"c"}},
|
|
tstSlicers{&tstSlicer{"a"},
|
|
&tstSlicer{"b"},
|
|
&tstSlicer{"c"}}},
|
|
{testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn1{"b"}},
|
|
[]interface{}{&tstSlicerIn1{"c"}},
|
|
testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn1{"b"}, &tstSlicerIn1{"c"}}},
|
|
// Errors
|
|
{testSlicerInterfaces{&tstSlicerIn1{"a"}, &tstSlicerIn1{"b"}},
|
|
[]interface{}{"c"},
|
|
false},
|
|
{"", []interface{}{[]string{"a", "b"}}, false},
|
|
// No string concatenation.
|
|
{"ab",
|
|
[]interface{}{"c"},
|
|
false},
|
|
} {
|
|
|
|
errMsg := fmt.Sprintf("[%d]", i)
|
|
|
|
result, err := Append(test.start, test.addend...)
|
|
|
|
if b, ok := test.expected.(bool); ok && !b {
|
|
require.Error(t, err, errMsg)
|
|
continue
|
|
}
|
|
|
|
require.NoError(t, err, errMsg)
|
|
|
|
if !reflect.DeepEqual(test.expected, result) {
|
|
t.Fatalf("%s got\n%T: %v\nexpected\n%T: %v", errMsg, result, result, test.expected, test.expected)
|
|
}
|
|
}
|
|
|
|
}
|