@@ -86,7 +86,7 @@ public void skipOnAborted() {
86
86
public void testSortByManyLongsSuccess () throws IOException {
87
87
initManyLongs ();
88
88
Response response = sortByManyLongs (500 );
89
- Map <?, ? > map = responseAsMap (response );
89
+ Map <String , Object > map = responseAsMap (response );
90
90
ListMatcher columns = matchesList ().item (matchesMap ().entry ("name" , "a" ).entry ("type" , "long" ))
91
91
.item (matchesMap ().entry ("name" , "b" ).entry ("type" , "long" ));
92
92
ListMatcher values = matchesList ();
@@ -95,8 +95,7 @@ public void testSortByManyLongsSuccess() throws IOException {
95
95
values = values .item (List .of (0 , b ));
96
96
}
97
97
}
98
- MapMatcher mapMatcher = matchesMap ();
99
- assertMap (map , mapMatcher .entry ("columns" , columns ).entry ("values" , values ).entry ("took" , greaterThanOrEqualTo (0 )));
98
+ assertResultMap (map , columns , values );
100
99
}
101
100
102
101
/**
@@ -236,11 +235,10 @@ private StringBuilder makeSortByManyLongs(int count) {
236
235
public void testGroupOnSomeLongs () throws IOException {
237
236
initManyLongs ();
238
237
Response resp = groupOnManyLongs (200 );
239
- Map <?, ? > map = responseAsMap (resp );
238
+ Map <String , Object > map = responseAsMap (resp );
240
239
ListMatcher columns = matchesList ().item (matchesMap ().entry ("name" , "MAX(a)" ).entry ("type" , "long" ));
241
240
ListMatcher values = matchesList ().item (List .of (9 ));
242
- MapMatcher mapMatcher = matchesMap ();
243
- assertMap (map , mapMatcher .entry ("columns" , columns ).entry ("values" , values ).entry ("took" , greaterThanOrEqualTo (0 )));
241
+ assertResultMap (map , columns , values );
244
242
}
245
243
246
244
/**
@@ -249,11 +247,10 @@ public void testGroupOnSomeLongs() throws IOException {
249
247
public void testGroupOnManyLongs () throws IOException {
250
248
initManyLongs ();
251
249
Response resp = groupOnManyLongs (5000 );
252
- Map <?, ? > map = responseAsMap (resp );
250
+ Map <String , Object > map = responseAsMap (resp );
253
251
ListMatcher columns = matchesList ().item (matchesMap ().entry ("name" , "MAX(a)" ).entry ("type" , "long" ));
254
252
ListMatcher values = matchesList ().item (List .of (9 ));
255
- MapMatcher mapMatcher = matchesMap ();
256
- assertMap (map , mapMatcher .entry ("columns" , columns ).entry ("values" , values ).entry ("took" , greaterThanOrEqualTo (0 )));
253
+ assertResultMap (map , columns , values );
257
254
}
258
255
259
256
private Response groupOnManyLongs (int count ) throws IOException {
@@ -279,12 +276,11 @@ private StringBuilder makeManyLongs(int count) {
279
276
public void testSmallConcat () throws IOException {
280
277
initSingleDocIndex ();
281
278
Response resp = concat (2 );
282
- Map <?, ? > map = responseAsMap (resp );
279
+ Map <String , Object > map = responseAsMap (resp );
283
280
ListMatcher columns = matchesList ().item (matchesMap ().entry ("name" , "a" ).entry ("type" , "long" ))
284
281
.item (matchesMap ().entry ("name" , "str" ).entry ("type" , "keyword" ));
285
282
ListMatcher values = matchesList ().item (List .of (1 , "1" .repeat (100 )));
286
- MapMatcher mapMatcher = matchesMap ();
287
- assertMap (map , mapMatcher .entry ("columns" , columns ).entry ("values" , values ).entry ("took" , greaterThanOrEqualTo (0 )));
283
+ assertResultMap (map , columns , values );
288
284
}
289
285
290
286
public void testHugeConcat () throws IOException {
@@ -465,7 +461,7 @@ private void assertManyStrings(Response resp, int strings) throws IOException {
465
461
public void testManyEval () throws IOException {
466
462
initManyLongs ();
467
463
Response resp = manyEval (1 );
468
- Map <?, ? > map = responseAsMap (resp );
464
+ Map <String , Object > map = responseAsMap (resp );
469
465
ListMatcher columns = matchesList ();
470
466
columns = columns .item (matchesMap ().entry ("name" , "a" ).entry ("type" , "long" ));
471
467
columns = columns .item (matchesMap ().entry ("name" , "b" ).entry ("type" , "long" ));
@@ -475,8 +471,7 @@ public void testManyEval() throws IOException {
475
471
for (int i = 0 ; i < 20 ; i ++) {
476
472
columns = columns .item (matchesMap ().entry ("name" , "i0" + i ).entry ("type" , "long" ));
477
473
}
478
- MapMatcher mapMatcher = matchesMap ();
479
- assertMap (map , mapMatcher .entry ("columns" , columns ).entry ("values" , hasSize (10_000 )).entry ("took" , greaterThanOrEqualTo (0 )));
474
+ assertResultMap (map , columns , hasSize (10_000 ));
480
475
}
481
476
482
477
public void testTooManyEval () throws IOException {
0 commit comments