Skip to content

Commit 0fe2cc9

Browse files
committed
Improved query string parsing
1 parent 8383e2d commit 0fe2cc9

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

requirejson/json.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@ import (
2222
func Query(t *testing.T, jsonData []byte, jqQuery string, jsonExpected string, msgAndArgs ...interface{}) {
2323
var data interface{}
2424
require.NoError(t, json.Unmarshal(jsonData, &data))
25-
var expected interface{}
26-
require.NoError(t, json.Unmarshal([]byte(jsonExpected), &expected))
2725
q, err := gojq.Parse(jqQuery)
2826
require.NoError(t, err)
2927
i := q.Run(data)
3028
v, ok := i.Next()
3129
require.True(t, ok)
32-
require.IsType(t, expected, v)
33-
require.Equal(t, expected, v, msgAndArgs...)
30+
res, err := json.Marshal(v)
31+
require.NoError(t, err)
32+
require.JSONEq(t, jsonExpected, string(res), msgAndArgs...)
3433
}
3534

3635
// Contains check if the json object is a subset of the jsonData.

requirejson/json_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ func TestJSONQuery(t *testing.T) {
3535
in3 := []byte(`[ 10, 20, 30 ]`)
3636
requirejson.NotEmpty(t, in3)
3737
requirejson.Len(t, in3, 3)
38+
39+
requirejson.Query(t, in, ".list | length", "3")
3840
}

0 commit comments

Comments
 (0)