From 1fba9ecaed24101b839b491634491e3639ce1bd9 Mon Sep 17 00:00:00 2001
From: Norman Jordan <norman.jordan@improving.com>
Date: Wed, 23 Oct 2024 15:27:38 -0700
Subject: [PATCH] Fixed some more tests

Signed-off-by: Norman Jordan <norman.jordan@improving.com>
---
 .../executor/protector/OpenSearchExecutionProtectorTest.java   | 1 +
 .../sql/opensearch/request/OpenSearchQueryRequestTest.java     | 3 +--
 .../sql/opensearch/request/OpenSearchRequestBuilderTest.java   | 1 +
 .../opensearch/sql/opensearch/storage/OpenSearchIndexTest.java | 1 +
 .../storage/scan/OpenSearchIndexScanPaginationTest.java        | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java
index da06c1eb66..767da431aa 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/executor/protector/OpenSearchExecutionProtectorTest.java
+++ b/opensearch/src/test/java/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/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java
index 89b51207b5..0847e520cc 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchQueryRequestTest.java
+++ b/opensearch/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/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java
index bf87840b60..a2430a671d 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/request/OpenSearchRequestBuilderTest.java
+++ b/opensearch/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
index ef6b86c42a..fc95395b17 100644
--- 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/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java
index e6a17aceaf..28006894a7 100644
--- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanPaginationTest.java
+++ b/opensearch/src/test/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;