Skip to content

Commit 5930032

Browse files
committed
Fix tests.
1 parent 39f199a commit 5930032

File tree

1 file changed

+7
-43
lines changed

1 file changed

+7
-43
lines changed

pkg/quickwit/response_parser_test.go

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -120,39 +120,6 @@ func TestProcessLogsResponse(t *testing.T) {
120120

121121
require.Contains(t, logsFieldMap, "number")
122122
require.Equal(t, data.FieldTypeNullableFloat64, logsFieldMap["number"].Type())
123-
124-
require.Contains(t, logsFieldMap, "_source")
125-
require.Equal(t, data.FieldTypeNullableJSON, logsFieldMap["_source"].Type())
126-
127-
actualJson1, err := json.Marshal(logsFieldMap["_source"].At(0).(*json.RawMessage))
128-
require.NoError(t, err)
129-
actualJson2, err := json.Marshal(logsFieldMap["_source"].At(1).(*json.RawMessage))
130-
require.NoError(t, err)
131-
132-
expectedJson1 := `
133-
{
134-
"fields.lvl": "debug",
135-
"host": "djisaodjsoad",
136-
"level": "debug",
137-
"line": "hello, i am a message",
138-
"number": 1,
139-
"testtime": "2019-06-24T09:51:19.765Z",
140-
"line": "hello, i am a message"
141-
}
142-
`
143-
144-
expectedJson2 := `
145-
{
146-
"testtime": "2019-06-24T09:52:19.765Z",
147-
"host": "dsalkdakdop",
148-
"number": 2,
149-
"line": "hello, i am also message",
150-
"level": "error",
151-
"fields.lvl": "info"
152-
}`
153-
154-
require.JSONEq(t, expectedJson1, string(actualJson1))
155-
require.JSONEq(t, expectedJson2, string(actualJson2))
156123
})
157124

158125
t.Run("creates correct level field", func(t *testing.T) {
@@ -307,27 +274,24 @@ func TestProcessLogsResponse(t *testing.T) {
307274
require.Len(t, dataframes, 1)
308275
frame := dataframes[0]
309276

310-
require.Equal(t, 12, len(frame.Fields))
277+
require.Equal(t, 11, len(frame.Fields))
311278
// Fields have the correct length
312279
require.Equal(t, 2, frame.Fields[0].Len())
313280
// First field is timeField
314281
require.Equal(t, data.FieldTypeNullableTime, frame.Fields[0].Type())
315-
// Second is log line
316282
require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
317-
require.Equal(t, "line", frame.Fields[1].Name)
318283
// Correctly renames lvl field to level
319-
require.Equal(t, "level", frame.Fields[6].Name)
284+
require.Equal(t, "level", frame.Fields[4].Name)
285+
require.Equal(t, "line", frame.Fields[5].Name)
320286
// Correctly uses string types
321287
require.Equal(t, data.FieldTypeNullableString, frame.Fields[1].Type())
322288
// Correctly detects float64 types
323-
require.Equal(t, data.FieldTypeNullableFloat64, frame.Fields[4].Type())
324-
// Correctly detects json types
325-
require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[2].Type())
289+
require.Equal(t, data.FieldTypeNullableFloat64, frame.Fields[2].Type())
326290
// Correctly flattens fields
327-
require.Equal(t, "nested.field.double_nested", frame.Fields[8].Name)
328-
require.Equal(t, data.FieldTypeNullableString, frame.Fields[8].Type())
291+
require.Equal(t, "nested.field.double_nested", frame.Fields[7].Name)
292+
require.Equal(t, data.FieldTypeNullableString, frame.Fields[7].Type())
329293
// Correctly detects type even if first value is null
330-
require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[10].Type())
294+
require.Equal(t, data.FieldTypeNullableJSON, frame.Fields[9].Type())
331295
})
332296
}
333297

0 commit comments

Comments
 (0)