Added Visitor test cases and addressed comments

Signed-off-by: Varun Jain <[email protected]>
opensearch-project · Sep 27, 2023 · c9ada83 · c9ada83
1 parent d0b70c7
commit c9ada83
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 6 deletions.
diff --git a/src/test/java/org/opensearch/neuralsearch/processor/NeuralQueryProcessorIT.java b/src/test/java/org/opensearch/neuralsearch/processor/NeuralQueryProcessorIT.java
@@ -24,9 +24,9 @@
 
 public class NeuralQueryProcessorIT extends BaseNeuralSearchIT {
 
-    public static final String index = "my-nlp-index";
-    public static final String search_pipeline = "search-pipeline";
-    public static final String ingest_pipeline = "nlp-pipeline";
+    private static final String index = "my-nlp-index";
+    private static final String search_pipeline = "search-pipeline";
+    private static final String ingest_pipeline = "nlp-pipeline";
     private static final String TEST_KNN_VECTOR_FIELD_NAME_1 = "test-knn-vector-1";
     private static final int TEST_DIMENSION = 768;
     private static final SpaceType TEST_SPACE_TYPE = SpaceType.L2;
@@ -47,6 +47,7 @@ public void tearDown() {
         findDeployedModels().forEach(this::deleteModel);
     }
 
+    @SneakyThrows
     public void testNeuralQueryProcessor() throws Exception {
         initializeIndexIfNotExist();
         String modelId = getDeployedModelId();

diff --git a/src/test/java/org/opensearch/neuralsearch/query/visitor/NeuralSearchQueryVisitorTests.java b/src/test/java/org/opensearch/neuralsearch/query/visitor/NeuralSearchQueryVisitorTests.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.opensearch.neuralsearch.query.visitor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.lucene.search.BooleanClause;
+import org.opensearch.neuralsearch.query.NeuralQueryBuilder;
+import org.opensearch.test.OpenSearchTestCase;
+
+public class NeuralSearchQueryVisitorTests extends OpenSearchTestCase {
+
+    public void testAccept_whenNeuralQueryBuilderWithoutModelId_thenSetModelId() {
+        String modelId = "bdcvjkcdjvkddcjxdjsc";
+        NeuralQueryBuilder neuralQueryBuilder = new NeuralQueryBuilder();
+        neuralQueryBuilder.fieldName("passage_text");
+        neuralQueryBuilder.k(768);
+
+        NeuralSearchQueryVisitor neuralSearchQueryVisitor = new NeuralSearchQueryVisitor(modelId, null);
+        neuralSearchQueryVisitor.accept(neuralQueryBuilder);
+
+        assertEquals(modelId, neuralQueryBuilder.modelId());
+    }
+
+    public void testAccept_whenNeuralQueryBuilderWithoutFieldModelId_thenSetFieldModelId() {
+        Map<String, Object> neuralInfoMap = new HashMap<>();
+        neuralInfoMap.put("passage_text", "bdcvjkcdjvkddcjxdjsc");
+        NeuralQueryBuilder neuralQueryBuilder = new NeuralQueryBuilder();
+        neuralQueryBuilder.fieldName("passage_text");
+        neuralQueryBuilder.k(768);
+
+        NeuralSearchQueryVisitor neuralSearchQueryVisitor = new NeuralSearchQueryVisitor(null, neuralInfoMap);
+        neuralSearchQueryVisitor.accept(neuralQueryBuilder);
+
+        assertEquals("bdcvjkcdjvkddcjxdjsc", neuralQueryBuilder.modelId());
+    }
+
+    public void testAccept_whenNullValuesInVisitor_thenFail() {
+        NeuralQueryBuilder neuralQueryBuilder = new NeuralQueryBuilder();
+        NeuralSearchQueryVisitor neuralSearchQueryVisitor = new NeuralSearchQueryVisitor(null, null);
+
+        expectThrows(IllegalArgumentException.class, () -> neuralSearchQueryVisitor.accept(neuralQueryBuilder));
+    }
+
+    public void testGetChildVisitor() {
+        NeuralSearchQueryVisitor neuralSearchQueryVisitor = new NeuralSearchQueryVisitor(null, null);
+
+        NeuralSearchQueryVisitor subVisitor = (NeuralSearchQueryVisitor) neuralSearchQueryVisitor.getChildVisitor(BooleanClause.Occur.MUST);
+
+        assertEquals(subVisitor, neuralSearchQueryVisitor);
+
+    }
+}
diff --git a/src/test/java/org/opensearch/neuralsearch/util/NeuralSearchClusterUtilTests.java b/src/test/java/org/opensearch/neuralsearch/util/NeuralSearchClusterUtilTests.java
@@ -15,7 +15,7 @@
 
 public class NeuralSearchClusterUtilTests extends OpenSearchTestCase {
 
-    public void testSingleNodeCluster() {
+    public void testMinNodeVersion_whenSingleNodeCluster_thenSuccess() {
         ClusterService clusterService = mockClusterService(Version.V_2_4_0);
 
         final NeuralSearchClusterUtil neuralSearchClusterUtil = NeuralSearchClusterUtil.instance();
@@ -26,7 +26,7 @@ public void testSingleNodeCluster() {
         assertTrue(Version.V_2_4_0.equals(minVersion));
     }
 
-    public void testMultipleNodesCluster() {
+    public void testMinNodeVersion_whenMultipleNodesCluster_thenSuccess() {
         ClusterService clusterService = mockClusterService(Version.V_2_3_0);
 
         final NeuralSearchClusterUtil neuralSearchClusterUtil = NeuralSearchClusterUtil.instance();
@@ -37,7 +37,7 @@ public void testMultipleNodesCluster() {
         assertTrue(Version.V_2_3_0.equals(minVersion));
     }
 
-    public void testWhenErrorOnClusterStateDiscover() {
+    public void testMinNodeVersion_WhenErrorOnClusterState_thenMatchCurrentVersion() {
         ClusterService clusterService = mock(ClusterService.class);
         when(clusterService.state()).thenThrow(new RuntimeException("Cluster state is not ready"));