Fixed some more tests

Signed-off-by: Norman Jordan <norman.jordan@improving.com>
opensearch-project · Oct 23, 2024 · 1fba9ec · 1fba9ec
1 parent e93cc5f
commit 1fba9ec
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 2 deletions.
diff --git a/...va/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java b/...va/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java
@@ -90,6 +90,7 @@ public void setup() {
   @Test
   void test_protect_indexScan() {
     when(settings.getSettingValue(Settings.Key.SQL_PAGINATION_API_SEARCH_AFTER)).thenReturn(true);
+    when(settings.getSettingValue(Settings.Key.FIELD_TYPE_TOLERANCE)).thenReturn(false);
 
     String indexName = "test";
     final int maxResultWindow = 10000;

diff --git a/...earch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java b/...earch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java
@@ -20,7 +20,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.opensearch.action.search.SearchRequest;
@@ -72,7 +71,7 @@ public class OpenSearchQueryRequestTest {
   @Mock private OpenSearchStorageEngine engine;
   @Mock private PointInTimeBuilder pointInTimeBuilder;
 
-  @InjectMocks private OpenSearchQueryRequest serializationRequest;
+  private OpenSearchQueryRequest serializationRequest;
 
   private SearchSourceBuilder sourceBuilderForSerializer;
 

diff --git a/...rch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java b/...rch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java
@@ -86,6 +86,7 @@ void setup() {
     lenient()
         .when(settings.getSettingValue(Settings.Key.SQL_PAGINATION_API_SEARCH_AFTER))
         .thenReturn(true);
+    lenient().when(settings.getSettingValue(Settings.Key.FIELD_TYPE_TOLERANCE)).thenReturn(false);
   }
 
   @Test

diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/OpenSearchIndexTest.java
@@ -82,6 +82,7 @@ void setUp() {
     lenient()
         .when(settings.getSettingValue(Settings.Key.SQL_PAGINATION_API_SEARCH_AFTER))
         .thenReturn(true);
+    lenient().when(settings.getSettingValue(Settings.Key.FIELD_TYPE_TOLERANCE)).thenReturn(false);
   }
 
   @Test

diff --git a/...st/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java b/...st/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java
@@ -59,6 +59,7 @@ void setup() {
     lenient()
         .when(settings.getSettingValue(Settings.Key.SQL_PAGINATION_API_SEARCH_AFTER))
         .thenReturn(true);
+    lenient().when(settings.getSettingValue(Settings.Key.FIELD_TYPE_TOLERANCE)).thenReturn(false);
   }
 
   @Mock private OpenSearchClient client;