Fix the flaky test for derived fields highlighter test

Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
opensearch-project · Apr 19, 2024 · 013bed0 · 013bed0
1 parent b4692c8
commit 013bed0
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/...va/org/opensearch/search/fetch/subphase/highlight/DerivedFieldFetchAndHighlightTests.java b/...va/org/opensearch/search/fetch/subphase/highlight/DerivedFieldFetchAndHighlightTests.java
@@ -144,17 +144,17 @@ public void testDerivedFieldFromIndexMapping() throws IOException {
 
                 // create a fetch context to be used by HighlightPhase processor
                 FetchContext fetchContext = mock(FetchContext.class);
-                when(fetchContext.mapperService()).thenReturn(mockShardContext.getMapperService());
+                when(fetchContext.mapperService()).thenReturn(mapperService);
                 when(fetchContext.getQueryShardContext()).thenReturn(mockShardContext);
                 when(fetchContext.getIndexSettings()).thenReturn(indexService.getIndexSettings());
                 when(fetchContext.searcher()).thenReturn(
                     new ContextIndexSearcher(
-                        searcher.getIndexReader(),
-                        searcher.getSimilarity(),
-                        searcher.getQueryCache(),
-                        searcher.getQueryCachingPolicy(),
+                        reader,
+                        IndexSearcher.getDefaultSimilarity(),
+                        IndexSearcher.getDefaultQueryCache(),
+                        IndexSearcher.getDefaultQueryCachingPolicy(),
                         true,
-                        searcher.getExecutor(),
+                        null,
                         null
                     )
                 );
@@ -253,17 +253,17 @@ public void testDerivedFieldFromSearchMapping() throws IOException {
 
                 // create a fetch context to be used by HighlightPhase processor
                 FetchContext fetchContext = mock(FetchContext.class);
-                when(fetchContext.mapperService()).thenReturn(mockShardContext.getMapperService());
+                when(fetchContext.mapperService()).thenReturn(mapperService);
                 when(fetchContext.getQueryShardContext()).thenReturn(mockShardContext);
                 when(fetchContext.getIndexSettings()).thenReturn(indexService.getIndexSettings());
                 when(fetchContext.searcher()).thenReturn(
                     new ContextIndexSearcher(
-                        searcher.getIndexReader(),
-                        searcher.getSimilarity(),
-                        searcher.getQueryCache(),
-                        searcher.getQueryCachingPolicy(),
+                        reader,
+                        IndexSearcher.getDefaultSimilarity(),
+                        IndexSearcher.getDefaultQueryCache(),
+                        IndexSearcher.getDefaultQueryCachingPolicy(),
                         true,
-                        searcher.getExecutor(),
+                        null,
                         null
                     )
                 );