Fix test

Signed-off-by: Thomas Farr <[email protected]>
Xtansia · Oct 20, 2024 · 2f35133 · 2f35133
1 parent 0fc3dd8
commit 2f35133
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...st/java11/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java b/...st/java11/org/opensearch/client/opensearch/integTest/AbstractSearchTemplateRequestIT.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
+import org.opensearch.Version;
 import org.opensearch.client.json.JsonData;
 import org.opensearch.client.opensearch._types.Refresh;
 import org.opensearch.client.opensearch._types.mapping.Property;
@@ -89,6 +90,14 @@ public void testTemplateSearchAggregations() throws Exception {
 
     @Test
     public void testMultiSearchTemplate() throws Exception {
+        Integer expectedSuccessStatus = null;
+        Integer expectedFailureStatus = null;
+
+        if (getServerVersion().onOrAfter(Version.V_2_18_0)) {
+            expectedSuccessStatus = 200;
+            expectedFailureStatus = 404;
+        }
+
         var index = "test-msearch-template";
         createDocuments(index);
 
@@ -120,11 +129,11 @@ public void testMultiSearchTemplate() throws Exception {
         assertEquals(2, searchResponse.responses().size());
         var response = searchResponse.responses().get(0);
         assertTrue(response.isResult());
-        assertNull(response.result().status());
+        assertEquals(expectedSuccessStatus, response.result().status());
         assertEquals(4, response.result().hits().hits().size());
         var failureResponse = searchResponse.responses().get(1);
         assertTrue(failureResponse.isFailure());
-        assertNull(failureResponse.failure().status());
+        assertEquals(expectedFailureStatus, failureResponse.failure().status());
     }
 
     private SearchTemplateResponse<SimpleDoc> sendTemplateRequest(String index, String title, boolean suggs, boolean aggs)