Skip to content

Commit 1521484

Browse files
original-brownbearoriginal-brownbear
authored
Remove more explicit references to SearchResponse in tests (#101092) (#101172)
Follow-up to #100966. Add more assertion overloads that consume a requestBuilder as in the other PRs and start using `assertHitCount` in more places that were duplicating what it does. Also add a shortcut for `client().prepareSearch()` to integ tests and bulk-replace some usages of this pattern to avoid these changes from blowing up test code line count further.
1 parent 1eda6ac commit 1521484

File tree

16 files changed

+808
-827
lines changed

16 files changed

+808
-827
lines changed

‎modules/data-streams/src/internalClusterTest/java/org/elasticsearch/datastreams/DataStreamIT.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
package org.elasticsearch.datastreams;
99

1010
import org.apache.logging.log4j.core.util.Throwables;
11-
import org.apache.lucene.search.TotalHits;
1211
import org.elasticsearch.ElasticsearchStatusException;
1312
import org.elasticsearch.ExceptionsHelper;
1413
import org.elasticsearch.action.ActionRequestBuilder;
@@ -829,9 +828,9 @@ public void testSearchFilteredAndUnfilteredAlias() throws Exception {
829828
);
830829

831830
// Searching the filtered and unfiltered aliases should return all results (unfiltered):
832-
assertSearchHits(client().prepareSearch("foo", "bar"), "1", "2");
831+
assertSearchHits(prepareSearch("foo", "bar"), "1", "2");
833832
// Searching the data stream name and the filtered alias should return all results (unfiltered):
834-
assertSearchHits(client().prepareSearch("foo", dataStreamName), "1", "2");
833+
assertSearchHits(prepareSearch("foo", dataStreamName), "1", "2");
835834
}
836835

837836
public void testRandomDataSteamAliasesUpdate() throws Exception {
@@ -1297,8 +1296,7 @@ public void testSearchAllResolvesDataStreams() throws Exception {
12971296
indexDocs("metrics-foo", numDocsRolledFoo);
12981297

12991298
SearchRequest searchRequest = new SearchRequest("*");
1300-
SearchResponse searchResponse = client().search(searchRequest).actionGet();
1301-
assertThat(searchResponse.getHits().getTotalHits().value, is((long) numDocsBar + numDocsFoo + numDocsRolledFoo));
1299+
assertHitCount(client().search(searchRequest), numDocsBar + numDocsFoo + numDocsRolledFoo);
13021300
}
13031301

13041302
public void testGetDataStream() throws Exception {
@@ -1473,9 +1471,7 @@ public void testQueryDataStreamNameInIndexField() throws Exception {
14731471

14741472
SearchRequest searchRequest = new SearchRequest("*");
14751473
searchRequest.source().query(new TermQueryBuilder("_index", "metrics-foo"));
1476-
SearchResponse searchResponse = client().search(searchRequest).actionGet();
1477-
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
1478-
assertThat(searchResponse.getHits().getTotalHits().relation, equalTo(TotalHits.Relation.EQUAL_TO));
1474+
assertHitCount(client().search(searchRequest), 1);
14791475
}
14801476

14811477
public void testDataStreamMetadata() throws Exception {

‎server/src/internalClusterTest/java/org/elasticsearch/action/admin/HotThreadsIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,7 @@ public void onFailure(Exception e) {
107107
ensureSearchable();
108108
while (latch.getCount() > 0) {
109109
assertHitCount(
110-
client().prepareSearch()
111-
.setQuery(matchAllQuery())
110+
prepareSearch().setQuery(matchAllQuery())
112111
.setPostFilter(
113112
boolQuery().must(matchAllQuery())
114113
.mustNot(boolQuery().must(termQuery("field1", "value1")).must(termQuery("field1", "value2")))

‎server/src/internalClusterTest/java/org/elasticsearch/action/search/TransportSearchIT.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@
7070
import java.util.List;
7171
import java.util.Map;
7272
import java.util.concurrent.CountDownLatch;
73+
import java.util.concurrent.ExecutionException;
7374

7475
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
76+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
7577
import static org.hamcrest.Matchers.containsString;
7678
import static org.hamcrest.Matchers.equalTo;
7779

@@ -167,7 +169,7 @@ public void testLocalClusterAlias() {
167169
}
168170
}
169171

170-
public void testAbsoluteStartMillis() {
172+
public void testAbsoluteStartMillis() throws ExecutionException, InterruptedException {
171173
TaskId parentTaskId = new TaskId("node", randomNonNegativeLong());
172174
{
173175
IndexRequest indexRequest = new IndexRequest("test-1970.01.01");
@@ -186,9 +188,7 @@ public void testAbsoluteStartMillis() {
186188
assertEquals(RestStatus.CREATED, indexResponse.status());
187189
}
188190
{
189-
SearchRequest searchRequest = new SearchRequest();
190-
SearchResponse searchResponse = client().search(searchRequest).actionGet();
191-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
191+
assertHitCount(client().search(new SearchRequest()), 2);
192192
}
193193
{
194194
SearchRequest searchRequest = new SearchRequest("<test-{now/d}>");
@@ -205,8 +205,7 @@ public void testAbsoluteStartMillis() {
205205
0,
206206
randomBoolean()
207207
);
208-
SearchResponse searchResponse = client().search(searchRequest).actionGet();
209-
assertEquals(2, searchResponse.getHits().getTotalHits().value);
208+
assertHitCount(client().search(searchRequest), 2);
210209
}
211210
{
212211
SearchRequest searchRequest = SearchRequest.subSearchRequest(

‎server/src/internalClusterTest/java/org/elasticsearch/index/mapper/CopyToMapperIntegrationIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.io.IOException;
2222

2323
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
24+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
2425
import static org.elasticsearch.xcontent.XContentFactory.jsonBuilder;
2526
import static org.hamcrest.Matchers.equalTo;
2627

@@ -66,8 +67,7 @@ public void testDynamicObjectCopyTo() throws Exception {
6667
assertAcked(indicesAdmin().prepareCreate("test-idx").setMapping(mapping));
6768
client().prepareIndex("test-idx").setId("1").setSource("foo", "bar").get();
6869
indicesAdmin().prepareRefresh("test-idx").execute().actionGet();
69-
SearchResponse response = prepareSearch("test-idx").setQuery(QueryBuilders.termQuery("root.top.child", "bar")).get();
70-
assertThat(response.getHits().getTotalHits().value, equalTo(1L));
70+
assertHitCount(prepareSearch("test-idx").setQuery(QueryBuilders.termQuery("root.top.child", "bar")), 1L);
7171
}
7272

7373
private XContentBuilder createDynamicTemplateMapping() throws IOException {

‎server/src/internalClusterTest/java/org/elasticsearch/index/mapper/DynamicMappingIT.java

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.action.bulk.BulkResponse;
1414
import org.elasticsearch.action.index.IndexRequest;
1515
import org.elasticsearch.action.index.IndexRequestBuilder;
16-
import org.elasticsearch.action.search.SearchResponse;
1716
import org.elasticsearch.action.support.WriteRequest;
1817
import org.elasticsearch.cluster.ClusterState;
1918
import org.elasticsearch.cluster.ClusterStateUpdateTask;
@@ -49,6 +48,7 @@
4948
import static org.elasticsearch.index.mapper.MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING;
5049
import static org.elasticsearch.index.mapper.vectors.DenseVectorFieldMapper.MIN_DIMS_FOR_DYNAMIC_FLOAT_MAPPING;
5150
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
51+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
5252
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSearchHits;
5353
import static org.hamcrest.Matchers.containsString;
5454
import static org.hamcrest.Matchers.equalTo;
@@ -461,18 +461,9 @@ public void testDynamicRuntimeNoConflicts() {
461461
BulkResponse bulkItemResponses = client().bulk(bulkRequest).actionGet();
462462
assertFalse(bulkItemResponses.buildFailureMessage(), bulkItemResponses.hasFailures());
463463

464-
{
465-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("one", "one")).get();
466-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
467-
}
468-
{
469-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("one.two", 3.5)).get();
470-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
471-
}
472-
{
473-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("one.two.three", "1")).get();
474-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
475-
}
464+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("one", "one")), 1);
465+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("one.two", 3.5)), 1);
466+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("one.two.three", "1")), 1);
476467
}
477468

478469
public void testDynamicRuntimeObjectFields() {
@@ -509,22 +500,10 @@ public void testDynamicRuntimeObjectFields() {
509500
BulkResponse bulkItemResponses = client().bulk(bulkRequest).actionGet();
510501
assertFalse(bulkItemResponses.buildFailureMessage(), bulkItemResponses.hasFailures());
511502

512-
{
513-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.one", 1)).get();
514-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
515-
}
516-
{
517-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("anything", "anything")).get();
518-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
519-
}
520-
{
521-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one", "one")).get();
522-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
523-
}
524-
{
525-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one.two", "1")).get();
526-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
527-
}
503+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.one", 1)), 1);
504+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("anything", "anything")), 1);
505+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one", "one")), 1);
506+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.one.two", "1")), 1);
528507

529508
Exception exception = expectThrows(
530509
DocumentParsingException.class,
@@ -568,10 +547,7 @@ public void testDynamicRuntimeObjectFields() {
568547
.status()
569548
);
570549

571-
{
572-
SearchResponse searchResponse = prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.dynamic.number", 1)).get();
573-
assertEquals(1, searchResponse.getHits().getTotalHits().value);
574-
}
550+
assertHitCount(prepareSearch("test").setQuery(new MatchQueryBuilder("obj.runtime.dynamic.number", 1)), 1);
575551

576552
// a doc with the same field but a different type causes a conflict
577553
Exception e = expectThrows(

‎server/src/internalClusterTest/java/org/elasticsearch/index/mapper/MultiFieldsIntegrationIT.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import static org.elasticsearch.index.query.QueryBuilders.geoDistanceQuery;
2727
import static org.elasticsearch.index.query.QueryBuilders.matchQuery;
2828
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
29+
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
2930
import static org.hamcrest.Matchers.equalTo;
3031
import static org.hamcrest.Matchers.not;
3132
import static org.hamcrest.Matchers.notNullValue;
@@ -47,10 +48,8 @@ public void testMultiFields() throws Exception {
4748

4849
client().prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get();
4950

50-
SearchResponse searchResponse = prepareSearch("my-index").setQuery(matchQuery("title", "multi")).get();
51-
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
52-
searchResponse = prepareSearch("my-index").setQuery(matchQuery("title.not_analyzed", "Multi fields")).get();
53-
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
51+
assertHitCount(client().prepareSearch("my-index").setQuery(matchQuery("title", "multi")), 1);
52+
assertHitCount(client().prepareSearch("my-index").setQuery(matchQuery("title.not_analyzed", "Multi fields")), 1);
5453

5554
assertAcked(indicesAdmin().preparePutMapping("my-index").setSource(createPutMappingSource()));
5655

@@ -68,8 +67,7 @@ public void testMultiFields() throws Exception {
6867

6968
client().prepareIndex("my-index").setId("1").setSource("title", "Multi fields").setRefreshPolicy(IMMEDIATE).get();
7069

71-
searchResponse = prepareSearch("my-index").setQuery(matchQuery("title.uncased", "Multi")).get();
72-
assertThat(searchResponse.getHits().getTotalHits().value, equalTo(1L));
70+
assertHitCount(client().prepareSearch("my-index").setQuery(matchQuery("title.uncased", "Multi")), 1);
7371
}
7472

7573
@SuppressWarnings("unchecked")

‎server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ public void testInvalidateIndicesRequestCacheWhenRollbackEngine() throws Excepti
672672
}
673673
}
674674
shard.refresh("test");
675-
assertThat(client().search(countRequest).actionGet().getHits().getTotalHits().value, equalTo(numDocs));
675+
assertHitCount(client().search(countRequest), numDocs);
676676
assertThat(shard.getLocalCheckpoint(), equalTo(shard.seqNoStats().getMaxSeqNo()));
677677

678678
final CountDownLatch engineResetLatch = new CountDownLatch(1);
@@ -701,11 +701,7 @@ public void testInvalidateIndicesRequestCacheWhenRollbackEngine() throws Excepti
701701
equalTo(numDocs + moreDocs)
702702
);
703703
}
704-
assertThat(
705-
"numDocs=" + numDocs + " moreDocs=" + moreDocs,
706-
client().search(countRequest).actionGet().getHits().getTotalHits().value,
707-
equalTo(numDocs + moreDocs)
708-
);
704+
assertHitCount(client().search(countRequest), numDocs + moreDocs);
709705
}
710706

711707
public void testShardChangesWithDefaultDocType() throws Exception {

0 commit comments

Comments
 (0)