suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-10 16:55:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Robert Brennan 2023-03-07 09:01:04 -05:00
parent 6cd9d8c8f9
commit 98c45ed622
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/yqlib/operator_filter.go
View File

@ -23,15 +23,15 @@ func filterOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
for resultEl := filtered.MatchingNodes.Front(); resultEl != nil; resultEl = resultEl.Next() {
result := resultEl.Value.(*CandidateNode)
log.Warningf("filtered %#v", result)
selfExpression := &ExpressionNode{Operation: &Operation{OperationType: selfReferenceOpType}}
childCtx := context.SingleReadonlyChildContext(result)
collected, err := collectTogether(d, childCtx, selfExpression)
if err != nil {
return Context{}, err
}
collected.Node.Style = unwrapDoc(result.Node).Style
results.PushBack(collected)
}
selfExpression := &ExpressionNode{Operation: &Operation{OperationType: selfReferenceOpType}}
collected, err := collectTogether(d, filtered, selfExpression)
if err != nil {
return Context{}, err
}
collected.Node.Style = unwrapDoc(candidate.Node).Style
results.PushBack(collected)
}
return context.ChildContext(results), nil
}

8
pkg/yqlib/operator_filter_test.go
View File

@ -10,8 +10,7 @@ var filterOperatorScenarios = []expressionScenario{
document: `[1,2,3]`,
expression: `filter(. < 3)`,
expected: []string{
"D0, P[], (!!seq)::- 1\n",
"D0, P[], (!!seq)::- 2\n",
"D0, P[], (!!seq)::[1, 2]\n",
},
},
{
@ -19,8 +18,7 @@ var filterOperatorScenarios = []expressionScenario{
document: `[1,2,3]`,
expression: `filter(. > 1)`,
expected: []string{
"D0, P[], (!!seq)::- 2\n",
"D0, P[], (!!seq)::- 3\n",
"D0, P[], (!!seq)::[2, 3]\n",
},
},
{
@ -29,6 +27,7 @@ var filterOperatorScenarios = []expressionScenario{
document: `[1,2,3]`,
expression: `filter(. > 4)`,
expected: []string{
"D0, P[], (!!seq)::[]\n",
},
},
{
@ -37,6 +36,7 @@ var filterOperatorScenarios = []expressionScenario{
document: `[]`,
expression: `filter(. > 1)`,
expected: []string{
"D0, P[], (!!seq)::[]\n",
},
},
}