suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-09-01 14:14:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed global vars

Browse Source
This commit is contained in:
Mike Farah
2021-02-11 10:58:40 +11:00
parent b749973fe0
commit 7d5b6b5442
6 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/yqlib/operators_test.go
+5 -5
View File
@@ -30,7 +30,7 @@ func testScenario(t *testing.T, s *expressionScenario) {
var results *list.List
var err error
node, err := treeCreator.ParsePath(s.expression)
node, err := NewPathTreeCreator().ParsePath(s.expression)
if err != nil {
t.Error(fmt.Errorf("Error parsing expression %v of %v: %v", s.expression, s.description, err))
return
@@ -66,7 +66,7 @@ func testScenario(t *testing.T, s *expressionScenario) {
os.Setenv("myenv", s.environmentVariable)
}
results, err = treeNavigator.GetMatchingNodes(inputs, node)
results, err = NewDataTreeNavigator().GetMatchingNodes(inputs, node)
if err != nil {
t.Error(fmt.Errorf("%v: %v", err, s.expression))
@@ -110,7 +110,7 @@ func formatYaml(yaml string, filename string) string {
var output bytes.Buffer
printer := NewPrinter(bufio.NewWriter(&output), false, true, false, 2, true)
node, err := treeCreator.ParsePath(".. style= \"\"")
node, err := NewPathTreeCreator().ParsePath(".. style= \"\"")
if err != nil {
panic(err)
}
@@ -219,7 +219,7 @@ func documentOutput(t *testing.T, w *bufio.Writer, s expressionScenario, formatt
var err error
printer := NewPrinter(bufio.NewWriter(&output), false, true, false, 2, true)
node, err := treeCreator.ParsePath(s.expression)
node, err := NewPathTreeCreator().ParsePath(s.expression)
if err != nil {
t.Error(fmt.Errorf("Error parsing expression %v of %v: %v", s.expression, s.description, err))
return
@@ -252,7 +252,7 @@ func documentOutput(t *testing.T, w *bufio.Writer, s expressionScenario, formatt
}
results, err := treeNavigator.GetMatchingNodes(inputs, node)
results, err := NewDataTreeNavigator().GetMatchingNodes(inputs, node)
if err != nil {
t.Error(err, s.expression)
}