Skip to content

Commit 04bb257

Browse files
martin-gaievskimartin-gaievski
committed
Removing redundant model uploads from integ tests
Signed-off-by: Martin Gaievski <gaievski@amazon.com>
1 parent cc6a6b2 commit 04bb257

File tree

4 files changed

+14
-38
lines changed

4 files changed

+14
-38
lines changed

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,10 @@ public void testNeuralQueryEnricherProcessor_whenNoModelIdPassedInNeuralSparseQu
8686

8787
@SneakyThrows
8888
public void testNeuralQueryEnricherProcessor_whenGetEmptyQueryBody_thenSuccess() {
89-
String modelId = null;
9089
try {
9190
initializeIndexIfNotExist(index);
92-
modelId = prepareModel();
93-
createSearchRequestProcessor(modelId, search_pipeline);
94-
createPipelineProcessor(modelId, ingest_pipeline, ProcessorType.TEXT_EMBEDDING);
91+
createSearchRequestProcessor(null, search_pipeline);
92+
createPipelineProcessor(null, ingest_pipeline, ProcessorType.TEXT_EMBEDDING);
9593
updateIndexSettings(index, Settings.builder().put("index.search.default_pipeline", search_pipeline));
9694
Request request = new Request("POST", "/" + index + "/_search");
9795
Response response = client().performRequest(request);
@@ -101,7 +99,7 @@ public void testNeuralQueryEnricherProcessor_whenGetEmptyQueryBody_thenSuccess()
10199
assertFalse(responseInMap.isEmpty());
102100
assertEquals(3, ((Map) responseInMap.get("hits")).size());
103101
} finally {
104-
wipeOfTestResources(index, ingest_pipeline, modelId, search_pipeline);
102+
wipeOfTestResources(index, ingest_pipeline, null, search_pipeline);
105103
}
106104
}
107105

‎src/test/java/org/opensearch/neuralsearch/processor/NormalizationProcessorIT.java

+2-6
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,8 @@ public void testResultProcessor_whenMultipleShardsAndQueryMatches_thenSuccessful
230230

231231
@SneakyThrows
232232
public void testResultProcessor_whenMultipleShardsAndNoMatches_thenSuccessful() {
233-
String modelId = null;
234233
try {
235234
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME);
236-
modelId = prepareModel();
237235
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
238236

239237
HybridQueryBuilder hybridQueryBuilder = new HybridQueryBuilder();
@@ -249,16 +247,14 @@ public void testResultProcessor_whenMultipleShardsAndNoMatches_thenSuccessful()
249247
);
250248
assertQueryResults(searchResponseAsMap, 0, true);
251249
} finally {
252-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, modelId, SEARCH_PIPELINE);
250+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, null, SEARCH_PIPELINE);
253251
}
254252
}
255253

256254
@SneakyThrows
257255
public void testResultProcessor_whenMultipleShardsAndPartialMatches_thenSuccessful() {
258-
String modelId = null;
259256
try {
260257
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME);
261-
modelId = prepareModel();
262258
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
263259

264260
HybridQueryBuilder hybridQueryBuilder = new HybridQueryBuilder();
@@ -275,7 +271,7 @@ public void testResultProcessor_whenMultipleShardsAndPartialMatches_thenSuccessf
275271
);
276272
assertQueryResults(searchResponseAsMap, 4, true, Range.between(0.33f, 1.0f));
277273
} finally {
278-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, modelId, SEARCH_PIPELINE);
274+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, null, SEARCH_PIPELINE);
279275
}
280276
}
281277

‎src/test/java/org/opensearch/neuralsearch/processor/ScoreCombinationIT.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,8 @@ public void setUp() throws Exception {
8585
*/
8686
@SneakyThrows
8787
public void testArithmeticWeightedMean_whenWeightsPassed_thenSuccessful() {
88-
String modelId = null;
8988
try {
9089
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME);
91-
modelId = prepareModel();
9290
// check case when number of weights and sub-queries are same
9391
createSearchPipeline(
9492
SEARCH_PIPELINE,
@@ -189,7 +187,7 @@ public void testArithmeticWeightedMean_whenWeightsPassed_thenSuccessful() {
189187
)
190188
);
191189
} finally {
192-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, modelId, SEARCH_PIPELINE);
190+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_THREE_SHARDS_NAME, null, null, SEARCH_PIPELINE);
193191
}
194192
}
195193

‎src/test/java/org/opensearch/neuralsearch/query/HybridQueryIT.java

+8-24
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,8 @@ protected boolean preserveClusterUponCompletion() {
129129
*/
130130
@SneakyThrows
131131
public void testComplexQuery_whenMultipleSubqueries_thenSuccessful() {
132-
String modelId = null;
133132
try {
134133
initializeIndexIfNotExist(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME);
135-
modelId = prepareModel();
136134
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
137135
TermQueryBuilder termQueryBuilder1 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
138136
TermQueryBuilder termQueryBuilder2 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT4);
@@ -173,7 +171,7 @@ public void testComplexQuery_whenMultipleSubqueries_thenSuccessful() {
173171
assertNotNull(total.get("relation"));
174172
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
175173
} finally {
176-
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, modelId, SEARCH_PIPELINE);
174+
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, null, SEARCH_PIPELINE);
177175
}
178176
}
179177

@@ -205,10 +203,8 @@ public void testComplexQuery_whenMultipleSubqueries_thenSuccessful() {
205203
*/
206204
@SneakyThrows
207205
public void testComplexQuery_whenMultipleIdenticalSubQueries_thenSuccessful() {
208-
String modelId = null;
209206
try {
210207
initializeIndexIfNotExist(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME);
211-
modelId = prepareModel();
212208
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
213209
TermQueryBuilder termQueryBuilder1 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
214210
TermQueryBuilder termQueryBuilder2 = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT4);
@@ -248,16 +244,14 @@ public void testComplexQuery_whenMultipleIdenticalSubQueries_thenSuccessful() {
248244
assertNotNull(total.get("relation"));
249245
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
250246
} finally {
251-
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, modelId, SEARCH_PIPELINE);
247+
wipeOfTestResources(TEST_BASIC_VECTOR_DOC_FIELD_INDEX_NAME, null, null, SEARCH_PIPELINE);
252248
}
253249
}
254250

255251
@SneakyThrows
256252
public void testNoMatchResults_whenOnlyTermSubQueryWithoutMatch_thenEmptyResult() {
257-
String modelId = null;
258253
try {
259254
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_NAME);
260-
modelId = prepareModel();
261255
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
262256
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT);
263257
TermQueryBuilder termQuery2Builder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT2);
@@ -283,16 +277,14 @@ public void testNoMatchResults_whenOnlyTermSubQueryWithoutMatch_thenEmptyResult(
283277
assertNotNull(total.get("relation"));
284278
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
285279
} finally {
286-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_NAME, null, modelId, SEARCH_PIPELINE);
280+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_NAME, null, null, SEARCH_PIPELINE);
287281
}
288282
}
289283

290284
@SneakyThrows
291285
public void testNestedQuery_whenHybridQueryIsWrappedIntoOtherQuery_thenFail() {
292-
String modelId = null;
293286
try {
294287
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_NAME_ONE_SHARD);
295-
modelId = prepareModel();
296288
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
297289
MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
298290
MatchQueryBuilder matchQuery2Builder = QueryBuilders.matchQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT4);
@@ -336,16 +328,14 @@ public void testNestedQuery_whenHybridQueryIsWrappedIntoOtherQuery_thenFail() {
336328
)
337329
);
338330
} finally {
339-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_NAME_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
331+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_NAME_ONE_SHARD, null, null, SEARCH_PIPELINE);
340332
}
341333
}
342334

343335
@SneakyThrows
344336
public void testIndexWithNestedFields_whenHybridQuery_thenSuccess() {
345-
String modelId = null;
346337
try {
347338
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD);
348-
modelId = prepareModel();
349339
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
350340
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT3);
351341
TermQueryBuilder termQuery2Builder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT2);
@@ -371,16 +361,14 @@ public void testIndexWithNestedFields_whenHybridQuery_thenSuccess() {
371361
assertNotNull(total.get("relation"));
372362
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
373363
} finally {
374-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
364+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, null, SEARCH_PIPELINE);
375365
}
376366
}
377367

378368
@SneakyThrows
379369
public void testIndexWithNestedFields_whenHybridQueryIncludesNested_thenSuccess() {
380-
String modelId = null;
381370
try {
382371
initializeIndexIfNotExist(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD);
383-
modelId = prepareModel();
384372
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
385373
TermQueryBuilder termQueryBuilder = QueryBuilders.termQuery(TEST_TEXT_FIELD_NAME_1, TEST_QUERY_TEXT);
386374
NestedQueryBuilder nestedQueryBuilder = QueryBuilders.nestedQuery(
@@ -410,16 +398,14 @@ public void testIndexWithNestedFields_whenHybridQueryIncludesNested_thenSuccess(
410398
assertNotNull(total.get("relation"));
411399
assertEquals(RELATION_EQUAL_TO, total.get("relation"));
412400
} finally {
413-
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
401+
wipeOfTestResources(TEST_MULTI_DOC_INDEX_WITH_NESTED_TYPE_NAME_ONE_SHARD, null, null, SEARCH_PIPELINE);
414402
}
415403
}
416404

417405
@SneakyThrows
418406
public void testRequestCache_whenOneShardAndQueryReturnResults_thenSuccessful() {
419-
String modelId = null;
420407
try {
421408
initializeIndexIfNotExist(TEST_INDEX_WITH_KEYWORDS_ONE_SHARD);
422-
modelId = prepareModel();
423409
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
424410
MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(KEYWORD_FIELD_1, KEYWORD_FIELD_2_VALUE);
425411
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(INTEGER_FIELD_PRICE).gte(10).lte(1000);
@@ -492,16 +478,14 @@ public void testRequestCache_whenOneShardAndQueryReturnResults_thenSuccessful()
492478
assertNotNull(totalSecondQuery.get("relation"));
493479
assertEquals(RELATION_EQUAL_TO, totalSecondQuery.get("relation"));
494480
} finally {
495-
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_ONE_SHARD, null, modelId, SEARCH_PIPELINE);
481+
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_ONE_SHARD, null, null, SEARCH_PIPELINE);
496482
}
497483
}
498484

499485
@SneakyThrows
500486
public void testRequestCache_whenMultipleShardsQueryReturnResults_thenSuccessful() {
501-
String modelId = null;
502487
try {
503488
initializeIndexIfNotExist(TEST_INDEX_WITH_KEYWORDS_THREE_SHARDS);
504-
modelId = prepareModel();
505489
createSearchPipelineWithResultsPostProcessor(SEARCH_PIPELINE);
506490
MatchQueryBuilder matchQueryBuilder = QueryBuilders.matchQuery(KEYWORD_FIELD_1, KEYWORD_FIELD_2_VALUE);
507491
RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(INTEGER_FIELD_PRICE).gte(10).lte(1000);
@@ -574,7 +558,7 @@ public void testRequestCache_whenMultipleShardsQueryReturnResults_thenSuccessful
574558
assertNotNull(totalSecondQuery.get("relation"));
575559
assertEquals(RELATION_EQUAL_TO, totalSecondQuery.get("relation"));
576560
} finally {
577-
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_THREE_SHARDS, null, modelId, SEARCH_PIPELINE);
561+
wipeOfTestResources(TEST_INDEX_WITH_KEYWORDS_THREE_SHARDS, null, null, SEARCH_PIPELINE);
578562
}
579563
}
580564

0 commit comments

Comments
 (0)