diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2023-10-11 12:04:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-11 12:04:22 +0200 |
commit | 83f9bd2a81a06b5a6dce06e140692e7fce916aec (patch) | |
tree | a002aab0f8c4de2e7799a2fd5b1ff8453da2a0e8 /container-search/src/test/java/com | |
parent | 8effe89cf75cdf5bff1e3877879ddf02082032e7 (diff) | |
parent | b962b9427f9e91ebf2abccde2a5faaa4a1eb0406 (diff) |
Merge pull request #28862 from vespa-engine/balder/avoid-adding-errors-to-self
Balder/avoid adding errors to self
Diffstat (limited to 'container-search/src/test/java/com')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java index bbd307c6fac..7ec35151eab 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java @@ -12,6 +12,9 @@ import com.yahoo.search.Searcher; import com.yahoo.search.grouping.GroupingRequest; import com.yahoo.search.grouping.request.GroupingOperation; import com.yahoo.search.grouping.vespa.GroupingExecutor; +import com.yahoo.search.result.DefaultErrorHit; +import com.yahoo.search.result.ErrorHit; +import com.yahoo.search.result.ErrorMessage; import com.yahoo.search.result.Hit; import com.yahoo.search.result.HitGroup; import com.yahoo.search.searchchain.Execution; @@ -72,18 +75,21 @@ public class FlatteningSearcherTestCase { )); Execution execution = newExecution(new FlatteningSearcher(), new GroupingExecutor(ComponentId.fromString("grouping")), - new ResultProvider(Arrays.asList( + new ResultProvider(List.of( new GroupingListHit(List.of(group0), null), - new GroupingListHit(List.of(group1), null)))); + new GroupingListHit(List.of(group1), null))), + new HitsProvider(List.of( + new DefaultErrorHit("source 1", ErrorMessage.createBackendCommunicationError("backend communication error 1")), + new DefaultErrorHit("source 2", ErrorMessage.createBackendCommunicationError("backend communication error 1"))))); Result result = execution.search(query); - assertEquals(5, result.hits().size()); + assertEquals(6, result.hits().size()); assertFlat(result); assertEquals(2, result.getTotalHitCount()); } private void assertFlat(Result result) { for (var hit : result.hits()) - assertTrue(hit instanceof FastHit); + assertTrue(hit instanceof FastHit || hit instanceof ErrorHit); } private FS4Hit fs4Hit(double relevance) { @@ -126,5 +132,20 @@ public class FlatteningSearcherTestCase { return result; } } + @After (GroupingExecutor.COMPONENT_NAME) + private static class HitsProvider extends Searcher { + private final List<Hit> hits; + HitsProvider(List<Hit> hits) { + this.hits = hits; + } + @Override + public Result search(Query query, Execution exec) { + Result result = exec.search(query); + for (Hit hit : hits) { + result.hits().add(hit); + } + return result; + } + } } |