Skip to content

Commit bfbdc9f

Browse files
Fix the flaky test for derived fields highlighter test (opensearch-project#13313)
Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
1 parent b4692c8 commit bfbdc9f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

server/src/test/java/org/opensearch/search/fetch/subphase/highlight/DerivedFieldFetchAndHighlightTests.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,17 @@ public void testDerivedFieldFromIndexMapping() throws IOException {
144144

145145
// create a fetch context to be used by HighlightPhase processor
146146
FetchContext fetchContext = mock(FetchContext.class);
147-
when(fetchContext.mapperService()).thenReturn(mockShardContext.getMapperService());
147+
when(fetchContext.mapperService()).thenReturn(mapperService);
148148
when(fetchContext.getQueryShardContext()).thenReturn(mockShardContext);
149149
when(fetchContext.getIndexSettings()).thenReturn(indexService.getIndexSettings());
150150
when(fetchContext.searcher()).thenReturn(
151151
new ContextIndexSearcher(
152-
searcher.getIndexReader(),
153-
searcher.getSimilarity(),
154-
searcher.getQueryCache(),
155-
searcher.getQueryCachingPolicy(),
152+
reader,
153+
IndexSearcher.getDefaultSimilarity(),
154+
IndexSearcher.getDefaultQueryCache(),
155+
IndexSearcher.getDefaultQueryCachingPolicy(),
156156
true,
157-
searcher.getExecutor(),
157+
null,
158158
null
159159
)
160160
);
@@ -253,17 +253,17 @@ public void testDerivedFieldFromSearchMapping() throws IOException {
253253

254254
// create a fetch context to be used by HighlightPhase processor
255255
FetchContext fetchContext = mock(FetchContext.class);
256-
when(fetchContext.mapperService()).thenReturn(mockShardContext.getMapperService());
256+
when(fetchContext.mapperService()).thenReturn(mapperService);
257257
when(fetchContext.getQueryShardContext()).thenReturn(mockShardContext);
258258
when(fetchContext.getIndexSettings()).thenReturn(indexService.getIndexSettings());
259259
when(fetchContext.searcher()).thenReturn(
260260
new ContextIndexSearcher(
261-
searcher.getIndexReader(),
262-
searcher.getSimilarity(),
263-
searcher.getQueryCache(),
264-
searcher.getQueryCachingPolicy(),
261+
reader,
262+
IndexSearcher.getDefaultSimilarity(),
263+
IndexSearcher.getDefaultQueryCache(),
264+
IndexSearcher.getDefaultQueryCachingPolicy(),
265265
true,
266-
searcher.getExecutor(),
266+
null,
267267
null
268268
)
269269
);

0 commit comments

Comments
 (0)