Fix it failure (#321)

* Fix IT failures Signed-off-by: zane-neo <[email protected]> * format code Signed-off-by: zane-neo <[email protected]> * fix Signed-off-by: zhichao-aws <[email protected]> * nit Signed-off-by: zhichao-aws <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Co-authored-by: zhichao-aws <[email protected]>
opensearch-project · Jun 12, 2024 · 5362a9a · 5362a9a
1 parent 62ac87f
commit 5362a9a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/src/test/java/org/opensearch/integTest/NeuralSparseSearchToolIT.java b/src/test/java/org/opensearch/integTest/NeuralSparseSearchToolIT.java
@@ -145,7 +145,10 @@ public void testNeuralSparseSearchToolInFlowAgent_withIllegalEmbeddingField_then
         org.hamcrest.MatcherAssert
             .assertThat(
                 exception.getMessage(),
-                allOf(containsString("all shards failed"), containsString("SearchPhaseExecutionException"))
+                allOf(
+                    containsString("[neural_sparse] query only works on [rank_features] fields"),
+                    containsString("IllegalArgumentException")
+                )
             );
     }
 

diff --git a/src/test/java/org/opensearch/integTest/RAGToolIT.java b/src/test/java/org/opensearch/integTest/RAGToolIT.java
@@ -354,7 +354,10 @@ public void testRAGToolWithNeuralSparseQuery_withIllegalEmbeddingField_thenThrow
         org.hamcrest.MatcherAssert
             .assertThat(
                 exception.getMessage(),
-                allOf(containsString("all shards failed"), containsString("SearchPhaseExecutionException"))
+                allOf(
+                    containsString("[neural_sparse] query only works on [rank_features] fields"),
+                    containsString("IllegalArgumentException")
+                )
             );
     }
 
@@ -365,7 +368,10 @@ public void testRAGToolWithNeuralSparseQueryAndLLM_withIllegalEmbeddingField_the
         org.hamcrest.MatcherAssert
             .assertThat(
                 exception.getMessage(),
-                allOf(containsString("all shards failed"), containsString("SearchPhaseExecutionException"))
+                allOf(
+                    containsString("[neural_sparse] query only works on [rank_features] fields"),
+                    containsString("IllegalArgumentException")
+                )
             );
     }
 
@@ -376,7 +382,7 @@ public void testRAGToolWithNeuralQuery_withIllegalEmbeddingField_thenThrowExcept
         org.hamcrest.MatcherAssert
             .assertThat(
                 exception.getMessage(),
-                allOf(containsString("all shards failed"), containsString("SearchPhaseExecutionException"))
+                allOf(containsString("Field 'embedding2' is not knn_vector type."), containsString("IllegalArgumentException"))
             );
     }
 
@@ -387,7 +393,7 @@ public void testRAGToolWithNeuralQueryAndLLM_withIllegalEmbeddingField_thenThrow
         org.hamcrest.MatcherAssert
             .assertThat(
                 exception.getMessage(),
-                allOf(containsString("all shards failed"), containsString("SearchPhaseExecutionException"))
+                allOf(containsString("Field 'embedding2' is not knn_vector type."), containsString("IllegalArgumentException"))
             );
     }
 

diff --git a/src/test/java/org/opensearch/integTest/VectorDBToolIT.java b/src/test/java/org/opensearch/integTest/VectorDBToolIT.java
@@ -174,7 +174,7 @@ public void testVectorDBToolInFlowAgent_withIllegalEmbeddingField_thenThrowExcep
         org.hamcrest.MatcherAssert
             .assertThat(
                 exception.getMessage(),
-                allOf(containsString("all shards failed"), containsString("SearchPhaseExecutionException"))
+                allOf(containsString("Field 'embedding2' is not knn_vector type."), containsString("IllegalArgumentException"))
             );
     }