Skip to content

Commit

Permalink
Update tests to expect new lines after results
Browse files Browse the repository at this point in the history
  • Loading branch information
TomWright committed Oct 27, 2020
1 parent 2e8b8bf commit 85344e2
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 16 deletions.
18 changes: 9 additions & 9 deletions internal/command/root_select_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,19 @@ func selectTestFromFile(inputPath string, selector string, out string, expErr er

func selectTestForParser(parser string, data string, singleData string) func(t *testing.T) {
return func(t *testing.T) {
t.Run("RootElement", selectTest(singleData, parser, ".", "map[x:asd]", nil))
t.Run("SingleProperty", selectTest(data, parser, ".id", "1111", nil))
t.Run("ObjectProperty", selectTest(data, parser, ".details.name", "Tom", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[0].street", "101 Some Street", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[1].street", "34 Another Street", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=XXX XXX).street", "101 Some Street", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=YYY YYY).street", "34 Another Street", nil))
t.Run("RootElement", selectTest(singleData, parser, ".", "map[x:asd]\n", nil))
t.Run("SingleProperty", selectTest(data, parser, ".id", "1111\n", nil))
t.Run("ObjectProperty", selectTest(data, parser, ".details.name", "Tom\n", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[0].street", "101 Some Street\n", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[1].street", "34 Another Street\n", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=XXX XXX).street", "101 Some Street\n", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=YYY YYY).street", "34 Another Street\n", nil))

switch parser {
case "json":
t.Run("QueryFromFile", selectTestFromFile("./../../tests/assets/example.json", ".preferences.favouriteColour", "red", nil))
t.Run("QueryFromFile", selectTestFromFile("./../../tests/assets/example.json", ".preferences.favouriteColour", "red\n", nil))
case "yaml":
t.Run("QueryFromFile", selectTestFromFile("./../../tests/assets/example.yaml", ".preferences.favouriteColour", "red", nil))
t.Run("QueryFromFile", selectTestFromFile("./../../tests/assets/example.yaml", ".preferences.favouriteColour", "red\n", nil))
}
}
}
12 changes: 6 additions & 6 deletions internal/command/select_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ func selectTest(in string, parser string, selector string, out string, expErr er

func selectTestForParser(parser string, data string) func(t *testing.T) {
return func(t *testing.T) {
t.Run("SingleProperty", selectTest(data, parser, ".id", "1111", nil))
t.Run("ObjectProperty", selectTest(data, parser, ".details.name", "Tom", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[0].street", "101 Some Street", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[1].street", "34 Another Street", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=XXX XXX).street", "101 Some Street", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=YYY YYY).street", "34 Another Street", nil))
t.Run("SingleProperty", selectTest(data, parser, ".id", "1111\n", nil))
t.Run("ObjectProperty", selectTest(data, parser, ".details.name", "Tom\n", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[0].street", "101 Some Street\n", nil))
t.Run("Index", selectTest(data, parser, ".details.addresses.[1].street", "34 Another Street\n", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=XXX XXX).street", "101 Some Street\n", nil))
t.Run("DynamicString", selectTest(data, parser, ".details.addresses.(postcode=YYY YYY).street", "34 Another Street\n", nil))
}
}

Expand Down
3 changes: 2 additions & 1 deletion internal/storage/parser_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@ func TestWrite(t *testing.T) {

if exp, got := `{
"name": "Tom"
}`, buf.String(); exp != got {
}
`, buf.String(); exp != got {
t.Errorf("unexpected output:\n%s\ngot:\n%s", exp, got)
}
})
Expand Down

0 comments on commit 85344e2

Please sign in to comment.