mirror of
https://github.com/elastic/elasticsearch.git
synced 2025-04-24 15:17:30 -04:00
Remove more explicit references to SearchResponse in tests (#101092)
Remove `assertSearchResponse` which was just an alias for `assertNoFailures` and then cleanup many spots in the result by combining the hit count and no failure assertion into a single method. follow-up to #100966
This commit is contained in:
Armin Braun
GitHub
parent
c1aa78bcab
commit
ca6295e582
94 changed files with 788 additions and 861 deletions
|
|
@ -44,7 +44,6 @@ import static org.elasticsearch.search.aggregations.AggregationBuilders.sum;
|
|||
import static org.elasticsearch.search.aggregations.PipelineAggregatorBuilders.bucketScript;
|
||||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
|
||||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
|
||||
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchResponse;
|
||||
import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
|
||||
import static org.hamcrest.Matchers.equalTo;
|
||||
import static org.hamcrest.Matchers.greaterThan;
|
||||
|
|
@ -88,7 +87,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
ensureGreen("test");
|
||||
client().prepareIndex("test").setId("1").setSource("foo", 4).setRefreshPolicy(IMMEDIATE).get();
|
||||
SearchResponse rsp = buildRequest("doc['foo'] + abs(1)").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(1, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(5.0, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D);
|
||||
}
|
||||
|
|
@ -118,7 +117,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
req.setQuery(QueryBuilders.functionScoreQuery(QueryBuilders.termQuery("text", "hello"), score).boostMode(CombineFunction.REPLACE));
|
||||
req.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); // make sure DF is consistent
|
||||
SearchResponse rsp = req.get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
SearchHits hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals("1", hits.getAt(0).getId());
|
||||
|
|
@ -223,7 +222,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
);
|
||||
|
||||
SearchResponse rsp = buildRequest("doc['double0'].count() + doc['double1'].count()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
SearchHits hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -231,7 +230,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
assertEquals(5.0, hits.getAt(2).field("foo").getValue(), 0.0D);
|
||||
|
||||
rsp = buildRequest("doc['double0'].sum()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(7.5, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -239,7 +238,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
assertEquals(6.0, hits.getAt(2).field("foo").getValue(), 0.0D);
|
||||
|
||||
rsp = buildRequest("doc['double0'].avg() + doc['double1'].avg()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(4.3, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -247,7 +246,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
assertEquals(5.5, hits.getAt(2).field("foo").getValue(), 0.0D);
|
||||
|
||||
rsp = buildRequest("doc['double0'].median()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(1.5, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -255,7 +254,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
assertEquals(1.25, hits.getAt(2).field("foo").getValue(), 0.0D);
|
||||
|
||||
rsp = buildRequest("doc['double0'].min()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(1.0, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -263,7 +262,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
assertEquals(-1.5, hits.getAt(2).field("foo").getValue(), 0.0D);
|
||||
|
||||
rsp = buildRequest("doc['double0'].max()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -271,7 +270,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
assertEquals(5.0, hits.getAt(2).field("foo").getValue(), 0.0D);
|
||||
|
||||
rsp = buildRequest("doc['double0'].sum()/doc['double0'].count()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(2.5, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -280,7 +279,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
|
||||
// make sure count() works for missing
|
||||
rsp = buildRequest("doc['double2'].count()").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(1.0, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -289,7 +288,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
|
||||
// make sure .empty works in the same way
|
||||
rsp = buildRequest("doc['double2'].empty ? 5.0 : 2.0").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
hits = rsp.getHits();
|
||||
assertEquals(3, hits.getTotalHits().value);
|
||||
assertEquals(2.0, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -327,7 +326,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
client().prepareIndex("test").setId("2").setSource("id", 2, "y", 2)
|
||||
);
|
||||
SearchResponse rsp = buildRequest("doc['x'] + 1").get();
|
||||
ElasticsearchAssertions.assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
SearchHits hits = rsp.getHits();
|
||||
assertEquals(2, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(5.0, hits.getAt(0).field("foo").getValue(), 0.0D);
|
||||
|
|
@ -640,22 +639,22 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
refresh();
|
||||
// access .lat
|
||||
SearchResponse rsp = buildRequest("doc['location'].lat").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(1, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(61.5240, rsp.getHits().getAt(0).field("foo").getValue(), 1.0D);
|
||||
// access .lon
|
||||
rsp = buildRequest("doc['location'].lon").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(1, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(105.3188, rsp.getHits().getAt(0).field("foo").getValue(), 1.0D);
|
||||
// access .empty
|
||||
rsp = buildRequest("doc['location'].empty ? 1 : 0").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(1, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(0, rsp.getHits().getAt(0).field("foo").getValue(), 1.0D);
|
||||
// call haversin
|
||||
rsp = buildRequest("haversin(38.9072, 77.0369, doc['location'].lat, doc['location'].lon)").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(1, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(3170D, rsp.getHits().getAt(0).field("foo").getValue(), 50D);
|
||||
}
|
||||
|
|
@ -678,14 +677,14 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
);
|
||||
// access .value
|
||||
SearchResponse rsp = buildRequest("doc['vip'].value").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(3, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(1.0D, rsp.getHits().getAt(0).field("foo").getValue(), 1.0D);
|
||||
assertEquals(0.0D, rsp.getHits().getAt(1).field("foo").getValue(), 1.0D);
|
||||
assertEquals(0.0D, rsp.getHits().getAt(2).field("foo").getValue(), 1.0D);
|
||||
// access .empty
|
||||
rsp = buildRequest("doc['vip'].empty ? 1 : 0").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(3, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(0.0D, rsp.getHits().getAt(0).field("foo").getValue(), 1.0D);
|
||||
assertEquals(0.0D, rsp.getHits().getAt(1).field("foo").getValue(), 1.0D);
|
||||
|
|
@ -693,7 +692,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
// ternary operator
|
||||
// vip's have a 50% discount
|
||||
rsp = buildRequest("doc['vip'] ? doc['price']/2 : doc['price']").get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(3, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(0.5D, rsp.getHits().getAt(0).field("foo").getValue(), 1.0D);
|
||||
assertEquals(2.0D, rsp.getHits().getAt(1).field("foo").getValue(), 1.0D);
|
||||
|
|
@ -712,7 +711,7 @@ public class MoreExpressionIT extends ESIntegTestCase {
|
|||
Script script = new Script(ScriptType.INLINE, "expression", "doc['foo'].value", Collections.emptyMap());
|
||||
builder.setQuery(QueryBuilders.boolQuery().filter(QueryBuilders.scriptQuery(script)));
|
||||
SearchResponse rsp = builder.get();
|
||||
assertSearchResponse(rsp);
|
||||
assertNoFailures(rsp);
|
||||
assertEquals(1, rsp.getHits().getTotalHits().value);
|
||||
assertEquals(1.0D, rsp.getHits().getAt(0).field("foo").getValue(), 0.0D);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue