Skip to content

Commit c40c80d

Browse files
committed
add ut it
Signed-off-by: zhichao-aws <[email protected]>
1 parent 146e990 commit c40c80d

File tree

2 files changed

+42
-0
lines changed

2 files changed

+42
-0
lines changed

src/test/java/org/opensearch/neuralsearch/processor/NeuralQueryEnricherProcessorIT.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static org.opensearch.neuralsearch.TestUtils.createRandomVector;
1010

1111
import java.util.Collections;
12+
import java.util.List;
1213
import java.util.Map;
1314

1415
import org.apache.hc.core5.http.io.entity.EntityUtils;
@@ -26,13 +27,16 @@
2627
import com.google.common.primitives.Floats;
2728

2829
import lombok.SneakyThrows;
30+
import org.opensearch.neuralsearch.query.NeuralSparseQueryBuilder;
2931

3032
public class NeuralQueryEnricherProcessorIT extends BaseNeuralSearchIT {
3133

3234
private static final String index = "my-nlp-index";
35+
private static final String sparseIndex = "my-nlp-index-sparse";
3336
private static final String search_pipeline = "search-pipeline";
3437
private static final String ingest_pipeline = "nlp-pipeline";
3538
private static final String TEST_KNN_VECTOR_FIELD_NAME_1 = "test-knn-vector-1";
39+
private static final String TEST_RANK_FEATURES_FIELD_NAME_1 = "test-rank-features-1";
3640
private final float[] testVector = createRandomVector(TEST_DIMENSION);
3741

3842
@Before
@@ -61,6 +65,25 @@ public void testNeuralQueryEnricherProcessor_whenNoModelIdPassed_thenSuccess() {
6165
}
6266
}
6367

68+
@SneakyThrows
69+
public void testNeuralQueryEnricherProcessor_whenNoModelIdPassedInNeuralSparseQuery_thenSuccess() {
70+
String modelId = null;
71+
try {
72+
initializeIndexIfNotExist(sparseIndex);
73+
modelId = prepareSparseEncodingModel();
74+
createSearchRequestProcessor(modelId, search_pipeline);
75+
createPipelineProcessor(modelId, ingest_pipeline, ProcessorType.TEXT_EMBEDDING);
76+
updateIndexSettings(sparseIndex, Settings.builder().put("index.search.default_pipeline", search_pipeline));
77+
NeuralSparseQueryBuilder neuralSparseQueryBuilder = new NeuralSparseQueryBuilder();
78+
neuralSparseQueryBuilder.fieldName(TEST_RANK_FEATURES_FIELD_NAME_1);
79+
neuralSparseQueryBuilder.queryText("hello");
80+
Map<String, Object> response = search(sparseIndex, neuralSparseQueryBuilder, 2);
81+
assertFalse(response.isEmpty());
82+
} finally {
83+
wipeOfTestResources(sparseIndex, ingest_pipeline, modelId, search_pipeline);
84+
}
85+
}
86+
6487
@SneakyThrows
6588
public void testNeuralQueryEnricherProcessor_whenGetEmptyQueryBody_thenSuccess() {
6689
String modelId = null;
@@ -120,5 +143,11 @@ private void initializeIndexIfNotExist(String indexName) {
120143
);
121144
assertEquals(1, getDocCount(indexName));
122145
}
146+
147+
if (sparseIndex.equals(indexName) && !indexExists(indexName)) {
148+
prepareSparseEncodingIndex(indexName, List.of(TEST_RANK_FEATURES_FIELD_NAME_1));
149+
addSparseEncodingDoc(indexName, "1", List.of(TEST_RANK_FEATURES_FIELD_NAME_1), List.of(Map.of("hi", 1.0f, "hello", 1.1f)));
150+
assertEquals(1, getDocCount(indexName));
151+
}
123152
}
124153
}

src/test/java/org/opensearch/neuralsearch/query/visitor/NeuralSearchQueryVisitorTests.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,19 @@ public void testAccept_whenNeuralQueryBuilderWithoutFieldModelId_thenSetFieldMod
3939
assertEquals("bdcvjkcdjvkddcjxdjsc", neuralQueryBuilder.modelId());
4040
}
4141

42+
public void testAccept_whenNeuralSparseQueryBuilderWithModelId_theDoNothing() {
43+
String modelId1 = "bdcvjkcdjvkddcjxdjsc";
44+
String modelId2 = "45dfsnfoiqwrjcjxdjsc";
45+
NeuralSparseQueryBuilder neuralSparseQueryBuilder = new NeuralSparseQueryBuilder();
46+
neuralSparseQueryBuilder.fieldName("passage_text");
47+
neuralSparseQueryBuilder.modelId(modelId1);
48+
49+
NeuralSearchQueryVisitor neuralSearchQueryVisitor = new NeuralSearchQueryVisitor(modelId2, null);
50+
neuralSearchQueryVisitor.accept(neuralSparseQueryBuilder);
51+
52+
assertEquals(modelId1, neuralSparseQueryBuilder.modelId());
53+
}
54+
4255
public void testAccept_whenNeuralSparseQueryBuilderWithoutModelId_thenSetModelId() {
4356
String modelId = "bdcvjkcdjvkddcjxdjsc";
4457
NeuralSparseQueryBuilder neuralSparseQueryBuilder = new NeuralSparseQueryBuilder();

0 commit comments

Comments
 (0)