Skip to content

Commit 98cba31

Browse files
unit tests are now more randomized
1 parent 768b8f6 commit 98cba31

File tree

3 files changed

+35
-24
lines changed

3 files changed

+35
-24
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/index/query/SemanticKnnVectorQueryRewriteInterceptorTests.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,32 +54,40 @@ public void cleanup() {
5454
}
5555

5656
public void testKnnQueryWithVectorBuilderIsInterceptedAndRewritten() throws IOException {
57-
float boost = randomFloatBetween(1, 10, true);
58-
String queryName = randomAlphaOfLength(5);
5957
Map<String, InferenceFieldMetadata> inferenceFields = Map.of(
6058
FIELD_NAME,
6159
new InferenceFieldMetadata(index.getName(), INFERENCE_ID, new String[] { FIELD_NAME }, null)
6260
);
6361
QueryRewriteContext context = createQueryRewriteContext(inferenceFields);
6462
QueryVectorBuilder queryVectorBuilder = new TextEmbeddingQueryVectorBuilder(INFERENCE_ID, QUERY);
6563
KnnVectorQueryBuilder original = new KnnVectorQueryBuilder(FIELD_NAME, queryVectorBuilder, 10, 100, null);
66-
original.boost(boost);
67-
original.queryName(queryName);
64+
if (randomBoolean()) {
65+
float boost = randomFloatBetween(1, 10, randomBoolean());
66+
original.boost(boost);
67+
}
68+
if (randomBoolean()) {
69+
String queryName = randomAlphaOfLength(5);
70+
original.queryName(queryName);
71+
}
6872
testRewrittenInferenceQuery(context, original);
6973
}
7074

7175
public void testKnnWithQueryBuilderWithoutInferenceIdIsInterceptedAndRewritten() throws IOException {
72-
float boost = randomFloatBetween(1, 10, true);
73-
String queryName = randomAlphaOfLength(5);
7476
Map<String, InferenceFieldMetadata> inferenceFields = Map.of(
7577
FIELD_NAME,
7678
new InferenceFieldMetadata(index.getName(), INFERENCE_ID, new String[] { FIELD_NAME }, null)
7779
);
7880
QueryRewriteContext context = createQueryRewriteContext(inferenceFields);
7981
QueryVectorBuilder queryVectorBuilder = new TextEmbeddingQueryVectorBuilder(null, QUERY);
8082
KnnVectorQueryBuilder original = new KnnVectorQueryBuilder(FIELD_NAME, queryVectorBuilder, 10, 100, null);
81-
original.boost(boost);
82-
original.queryName(queryName);
83+
if (randomBoolean()) {
84+
float boost = randomFloatBetween(1, 10, randomBoolean());
85+
original.boost(boost);
86+
}
87+
if (randomBoolean()) {
88+
String queryName = randomAlphaOfLength(5);
89+
original.queryName(queryName);
90+
}
8391
testRewrittenInferenceQuery(context, original);
8492
}
8593

x-pack/plugin/inference/src/test/java/org/elasticsearch/index/query/SemanticMatchQueryRewriteInterceptorTests.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ public void testBoostAndQueryNameInMatchQueryRewrite() throws IOException {
8787
new InferenceFieldMetadata(index.getName(), "inferenceId", new String[] { FIELD_NAME }, null)
8888
);
8989
QueryRewriteContext context = createQueryRewriteContext(inferenceFields);
90-
QueryBuilder original = createTestQueryBuilderWithBoostAndQueryName();
90+
QueryBuilder original = createTestQueryBuilder();
91+
original.boost(BOOST);
92+
original.queryName(QUERY_NAME);
9193
QueryBuilder rewritten = original.rewrite(context);
9294
assertTrue(
9395
"Expected query to be intercepted, but was [" + rewritten.getClass().getName() + "]",
@@ -106,13 +108,6 @@ private MatchQueryBuilder createTestQueryBuilder() {
106108
return new MatchQueryBuilder(FIELD_NAME, VALUE);
107109
}
108110

109-
private MatchQueryBuilder createTestQueryBuilderWithBoostAndQueryName() {
110-
MatchQueryBuilder queryBuilder = createTestQueryBuilder();
111-
queryBuilder.boost(BOOST);
112-
queryBuilder.queryName(QUERY_NAME);
113-
return queryBuilder;
114-
}
115-
116111
private QueryRewriteContext createQueryRewriteContext(Map<String, InferenceFieldMetadata> inferenceFields) {
117112
IndexMetadata indexMetadata = IndexMetadata.builder(index.getName())
118113
.settings(

x-pack/plugin/inference/src/test/java/org/elasticsearch/index/query/SemanticSparseVectorQueryRewriteInterceptorTests.java

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,30 +52,38 @@ public void cleanup() {
5252
}
5353

5454
public void testSparseVectorQueryOnInferenceFieldIsInterceptedAndRewritten() throws IOException {
55-
float boost = randomFloatBetween(1, 10, true);
56-
String queryName = randomAlphaOfLength(5);
5755
Map<String, InferenceFieldMetadata> inferenceFields = Map.of(
5856
FIELD_NAME,
5957
new InferenceFieldMetadata(index.getName(), "inferenceId", new String[] { FIELD_NAME }, null)
6058
);
6159
QueryRewriteContext context = createQueryRewriteContext(inferenceFields);
6260
QueryBuilder original = new SparseVectorQueryBuilder(FIELD_NAME, INFERENCE_ID, QUERY);
63-
original.boost(boost);
64-
original.queryName(queryName);
61+
if (randomBoolean()) {
62+
float boost = randomFloatBetween(1, 10, randomBoolean());
63+
original.boost(boost);
64+
}
65+
if (randomBoolean()) {
66+
String queryName = randomAlphaOfLength(5);
67+
original.queryName(queryName);
68+
}
6569
testRewrittenInferenceQuery(context, original);
6670
}
6771

6872
public void testSparseVectorQueryOnInferenceFieldWithoutInferenceIdIsInterceptedAndRewritten() throws IOException {
69-
float boost = randomFloatBetween(1, 10, true);
70-
String queryName = randomAlphaOfLength(5);
7173
Map<String, InferenceFieldMetadata> inferenceFields = Map.of(
7274
FIELD_NAME,
7375
new InferenceFieldMetadata(index.getName(), "inferenceId", new String[] { FIELD_NAME }, null)
7476
);
7577
QueryRewriteContext context = createQueryRewriteContext(inferenceFields);
7678
QueryBuilder original = new SparseVectorQueryBuilder(FIELD_NAME, null, QUERY);
77-
original.boost(boost);
78-
original.queryName(queryName);
79+
if (randomBoolean()) {
80+
float boost = randomFloatBetween(1, 10, randomBoolean());
81+
original.boost(boost);
82+
}
83+
if (randomBoolean()) {
84+
String queryName = randomAlphaOfLength(5);
85+
original.queryName(queryName);
86+
}
7987
testRewrittenInferenceQuery(context, original);
8088
}
8189

0 commit comments

Comments
 (0)