Remove explicit SearchResponse references from spatial module test code #101196
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/CentroidAggregationTestBase.java # test/framework/src/main/java/org/elasticsearch/search/aggregations/metrics/SpatialBoundsAggregationTestBase.java # test/framework/src/main/java/org/elasticsearch/search/geo/BaseShapeIntegTestCase.java # test/framework/src/main/java/org/elasticsearch/search/geo/GeoBoundingBoxQueryIntegTestCase.java # x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoGridAggAndQueryConsistencyIT.java # x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeWithDocValuesIT.java # x-pack/plugin/spatial/src/internalClusterTest/java/org/elasticsearch/xpack/spatial/search/LegacyGeoShapeWithDocValuesIT.java
iverase
added
>test
|
Pinging @elastic/es-search (Team:Search) |
original-brownbear
approved these changes
Oct 23, 2023
| assertNoFailuresAndResponse(searchRequestBuilder, r -> {}); | ||
| } | ||
|
|
||
| public static void assertNoFailuresAndResponse(SearchRequestBuilder searchRequestBuilder, Consumer<SearchResponse> consumer) { |
There was a problem hiding this comment.
If we're doing this (and I think it's fine) let's do a CheckedConsumer here and allow any exception maybe? Otherwise the code might get even more verbose if we have to deal with anything that throws checked?
There was a problem hiding this comment.
I am not sure adding a CheckedConsumer here as it will have huge effect everywhere. I hope we will understand what we need here as we add more cases so I would prefer to keep it simple until we know better what we need.
There was a problem hiding this comment.
Nevermind, sorry just waking up fully seemingly :D We can change that later if need be ... my 🧠 thought we couldn't earlier :)
test/framework/src/main/java/org/elasticsearch/test/hamcrest/ElasticsearchAssertions.java
Outdated
Show resolved
Hide resolved
...ternalClusterTest/java/org/elasticsearch/xpack/spatial/search/GeoShapeScriptDocValuesIT.java
Outdated
Show resolved
Hide resolved
78 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds new ElasticsearchAssertions#assertRespose methods that take a consumer for further inspection of the response. I refactor the ElasticsearchAssertions so all methods are calling this new method so there is only a few places where we call #decRef().