Fix failing tests

Signed-off-by: rithin-pullela-aws <rithinp@amazon.com>

Author: rithin-pullela-aws

ml-algorithms/src/test/java/org/opensearch/ml/engine/algorithms/agent/MLAgentExecutorTest.java

@@ -76,6 +76,7 @@
 import org.opensearch.ml.common.output.model.ModelTensor;
 import org.opensearch.ml.common.output.model.ModelTensorOutput;
 import org.opensearch.ml.common.output.model.ModelTensors;
+import org.opensearch.ml.common.settings.MLFeatureEnabledSetting;
 import org.opensearch.ml.common.spi.memory.Memory;
 import org.opensearch.ml.common.spi.tools.Tool;
 import org.opensearch.ml.engine.memory.ConversationIndexMemory;
@@ -130,6 +131,9 @@ public class MLAgentExecutorTest {
     private MLMemoryManager memoryManager;
     private MLAgentExecutor mlAgentExecutor;
 
+    @Mock
+    private MLFeatureEnabledSetting mlFeatureEnabledSetting;
+
     @Captor
     private ArgumentCaptor<Output> objectCaptor;
 
@@ -177,9 +181,26 @@ public void setup() {
         when(this.clusterService.getClusterSettings())
             .thenReturn(new ClusterSettings(settings, Set.of(ML_COMMONS_MCP_CONNECTOR_ENABLED, ML_COMMONS_AGENTIC_SEARCH_ENABLED)));
 
+        // Mock MLFeatureEnabledSetting
+        when(mlFeatureEnabledSetting.isMultiTenancyEnabled()).thenReturn(false);
+        when(mlFeatureEnabledSetting.isMcpConnectorEnabled()).thenReturn(true);
+        when(mlFeatureEnabledSetting.isAgenticSearchEnabled()).thenReturn(true);
+
         settings = Settings.builder().build();
         mlAgentExecutor = Mockito
-            .spy(new MLAgentExecutor(client, sdkClient, settings, clusterService, xContentRegistry, toolFactories, memoryMap, false, null));
+            .spy(
+                new MLAgentExecutor(
+                    client,
+                    sdkClient,
+                    settings,
+                    clusterService,
+                    xContentRegistry,
+                    toolFactories,
+                    memoryMap,
+                    mlFeatureEnabledSetting,
+                    null
+                )
+            );
 
     }
 
@@ -816,8 +837,25 @@ public void test_query_planning_requires_agentic_search_enabled() throws IOExcep
         GetResponse agentGetResponse = new GetResponse(getResult);
 
         // Create a new MLAgentExecutor with agentic search disabled
+        MLFeatureEnabledSetting disabledSearchSetting = Mockito.mock(MLFeatureEnabledSetting.class);
+        when(disabledSearchSetting.isMultiTenancyEnabled()).thenReturn(false);
+        when(disabledSearchSetting.isMcpConnectorEnabled()).thenReturn(true);
+        when(disabledSearchSetting.isAgenticSearchEnabled()).thenReturn(false);
+
         MLAgentExecutor mlAgentExecutorWithDisabledSearch = Mockito
-            .spy(new MLAgentExecutor(client, sdkClient, settings, clusterService, xContentRegistry, toolFactories, memoryMap, false, null));
+            .spy(
+                new MLAgentExecutor(
+                    client,
+                    sdkClient,
+                    settings,
+                    clusterService,
+                    xContentRegistry,
+                    toolFactories,
+                    memoryMap,
+                    disabledSearchSetting,
+                    null
+                )
+            );
 
         // Mock the agent get response
         Mockito.doAnswer(invocation -> {