suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-04 19:35:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed load operator bug

Browse Source
This commit is contained in:
Mike Farah 2022-10-25 13:30:38 +11:00
parent c1640fb10d
commit c62e18f9b2
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/yqlib/operator_load.go
View File

@ -48,7 +48,7 @@ func loadYaml(filename string, decoder Decoder) (*CandidateNode, error) {
} else { } else {
sequenceNode := &CandidateNode{Node: &yaml.Node{Kind: yaml.SequenceNode}} sequenceNode := &CandidateNode{Node: &yaml.Node{Kind: yaml.SequenceNode}}
for doc := documents.Front(); doc != nil; doc = doc.Next() { for doc := documents.Front(); doc != nil; doc = doc.Next() {
sequenceNode.Node.Content = append(sequenceNode.Node.Content, doc.Value.(*CandidateNode).Node) sequenceNode.Node.Content = append(sequenceNode.Node.Content, unwrapDoc(doc.Value.(*CandidateNode).Node))
} }
return sequenceNode, nil return sequenceNode, nil
} }

16
pkg/yqlib/operator_load_test.go
View File

@ -5,6 +5,22 @@ import (
) )
var loadScenarios = []expressionScenario{ var loadScenarios = []expressionScenario{
{
skipDoc: true,
description: "Load empty file",
expression: `load("../../examples/empty.yaml")`,
expected: []string{
"D0, P[], (!!null)::\n",
},
},
{
skipDoc: true,
description: "Load multiple documents",
expression: `load("../../examples/multiple_docs_small.yaml")`,
expected: []string{
"D0, P[], ()::- a: Easy! as one two three\n- another:\n document: here\n- - 1\n - 2\n",
},
},
{ {
description: "Simple example", description: "Simple example",
document: `{myFile: "../../examples/thing.yml"}`, document: `{myFile: "../../examples/thing.yml"}`,

18
test/utils.go
View File

@ -23,17 +23,29 @@ func ParseData(rawData string) yaml.Node {
return parsedData return parsedData
} }
func printDifference(t *testing.T, expectedValue interface{}, actualValue interface{}) {
opts := []write.Option{write.TerminalColor()}
var differenceBuffer bytes.Buffer
expectedString := fmt.Sprintf("%v", expectedValue)
actualString := fmt.Sprintf("%v", actualValue)
if err := diff.Text("expected", "actual", expectedString, actualString, bufio.NewWriter(&differenceBuffer), opts...); err != nil {
t.Error(err)
} else {
t.Error(differenceBuffer.String())
}
}
func AssertResult(t *testing.T, expectedValue interface{}, actualValue interface{}) { func AssertResult(t *testing.T, expectedValue interface{}, actualValue interface{}) {
t.Helper() t.Helper()
if expectedValue != actualValue { if expectedValue != actualValue {
t.Error("Expected <", expectedValue, "> but got <", actualValue, ">", fmt.Sprintf("%T", actualValue)) printDifference(t, expectedValue, actualValue)
} }
} }
func AssertResultComplex(t *testing.T, expectedValue interface{}, actualValue interface{}) { func AssertResultComplex(t *testing.T, expectedValue interface{}, actualValue interface{}) {
t.Helper() t.Helper()
if !reflect.DeepEqual(expectedValue, actualValue) { if !reflect.DeepEqual(expectedValue, actualValue) {
t.Error("\nExpected <", expectedValue, ">\nbut got <", actualValue, ">", fmt.Sprintf("%T", actualValue)) printDifference(t, expectedValue, actualValue)
} }
} }
@ -41,7 +53,7 @@ func AssertResultComplexWithContext(t *testing.T, expectedValue interface{}, act
t.Helper() t.Helper()
if !reflect.DeepEqual(expectedValue, actualValue) { if !reflect.DeepEqual(expectedValue, actualValue) {
t.Error(context) t.Error(context)
t.Error("\nExpected <", expectedValue, ">\nbut got <", actualValue, ">", fmt.Sprintf("%T", actualValue)) printDifference(t, expectedValue, actualValue)
} }
} }