Skip to content

Fix HybridCollectorManagerTests for a core change. #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2025
Merged

Fix HybridCollectorManagerTests for a core change. #1435

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/test/java/org/opensearch/neuralsearch/search/query/HybridCollectorManagerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import org.opensearch.search.query.QuerySearchResult;
import org.opensearch.search.query.ReduceableSearchResult;

import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand All @@ -71,6 +72,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.opensearch.neuralsearch.search.util.HybridSearchResultFormatUtil.MAGIC_NUMBER_DELIMITER;
Expand Down Expand Up @@ -764,6 +766,11 @@ public void testReduceAndRescore_whenMatchedDocsAndRescoreContextPresent_thenSuc
QueryShardContext mockQueryShardContext = mock(QueryShardContext.class);
TextFieldMapper.TextFieldType fieldType = (TextFieldMapper.TextFieldType) createMapperService().fieldType(TEXT_FIELD_NAME);
when(mockQueryShardContext.fieldMapper(eq(TEXT_FIELD_NAME))).thenReturn(fieldType);
// mock to query to generate the parsed query
doAnswer(invocationOnMock -> {
final QueryBuilder queryBuilder = invocationOnMock.getArgument(0);
return new ParsedQuery(queryBuilder.toQuery(mockQueryShardContext), Collections.emptyMap());
}).when(mockQueryShardContext).toQuery(any());
HybridQueryContext hybridQueryContext = HybridQueryContext.builder().paginationDepth(10).build();

HybridQuery hybridQueryWithTerm = new HybridQuery(
Expand Down Expand Up @@ -804,6 +811,7 @@ public void testReduceAndRescore_whenMatchedDocsAndRescoreContextPresent_thenSuc

RescorerBuilder<QueryRescorerBuilder> rescorerBuilder = new QueryRescorerBuilder(QueryBuilders.termQuery(TEXT_FIELD_NAME, QUERY2));
RescoreContext rescoreContext = rescorerBuilder.buildContext(mockQueryShardContext);

List<RescoreContext> rescoreContexts = List.of(rescoreContext);
when(searchContext.rescore()).thenReturn(rescoreContexts);
Weight rescoreWeight = mock(Weight.class);
Expand Down Expand Up @@ -890,6 +898,11 @@ public void testRescoreWithConcurrentSegmentSearch_whenMatchedDocsAndRescore_the
QueryShardContext mockQueryShardContext = mock(QueryShardContext.class);
TextFieldMapper.TextFieldType fieldType = (TextFieldMapper.TextFieldType) createMapperService().fieldType(TEXT_FIELD_NAME);
when(mockQueryShardContext.fieldMapper(eq(TEXT_FIELD_NAME))).thenReturn(fieldType);
// mock to query to generate the parsed query
doAnswer(invocationOnMock -> {
final QueryBuilder queryBuilder = invocationOnMock.getArgument(0);
return new ParsedQuery(queryBuilder.toQuery(mockQueryShardContext), Collections.emptyMap());
}).when(mockQueryShardContext).toQuery(any());
HybridQueryContext hybridQueryContext = HybridQueryContext.builder().paginationDepth(10).build();

HybridQuery hybridQueryWithTerm = new HybridQuery(
Expand Down
Loading