mirror of
https://github.com/mikefarah/yq.git
synced 2026-07-10 16:55:40 +00:00
fix tests
This commit is contained in:
parent
6cd9d8c8f9
commit
98c45ed622
@ -23,15 +23,15 @@ func filterOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
|
|||||||
for resultEl := filtered.MatchingNodes.Front(); resultEl != nil; resultEl = resultEl.Next() {
|
for resultEl := filtered.MatchingNodes.Front(); resultEl != nil; resultEl = resultEl.Next() {
|
||||||
result := resultEl.Value.(*CandidateNode)
|
result := resultEl.Value.(*CandidateNode)
|
||||||
log.Warningf("filtered %#v", result)
|
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
|
return context.ChildContext(results), nil
|
||||||
}
|
}
|
||||||
|
|||||||
@ -10,8 +10,7 @@ var filterOperatorScenarios = []expressionScenario{
|
|||||||
document: `[1,2,3]`,
|
document: `[1,2,3]`,
|
||||||
expression: `filter(. < 3)`,
|
expression: `filter(. < 3)`,
|
||||||
expected: []string{
|
expected: []string{
|
||||||
"D0, P[], (!!seq)::- 1\n",
|
"D0, P[], (!!seq)::[1, 2]\n",
|
||||||
"D0, P[], (!!seq)::- 2\n",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -19,8 +18,7 @@ var filterOperatorScenarios = []expressionScenario{
|
|||||||
document: `[1,2,3]`,
|
document: `[1,2,3]`,
|
||||||
expression: `filter(. > 1)`,
|
expression: `filter(. > 1)`,
|
||||||
expected: []string{
|
expected: []string{
|
||||||
"D0, P[], (!!seq)::- 2\n",
|
"D0, P[], (!!seq)::[2, 3]\n",
|
||||||
"D0, P[], (!!seq)::- 3\n",
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -29,6 +27,7 @@ var filterOperatorScenarios = []expressionScenario{
|
|||||||
document: `[1,2,3]`,
|
document: `[1,2,3]`,
|
||||||
expression: `filter(. > 4)`,
|
expression: `filter(. > 4)`,
|
||||||
expected: []string{
|
expected: []string{
|
||||||
|
"D0, P[], (!!seq)::[]\n",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -37,6 +36,7 @@ var filterOperatorScenarios = []expressionScenario{
|
|||||||
document: `[]`,
|
document: `[]`,
|
||||||
expression: `filter(. > 1)`,
|
expression: `filter(. > 1)`,
|
||||||
expected: []string{
|
expected: []string{
|
||||||
|
"D0, P[], (!!seq)::[]\n",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user