Skip to content

Commit 6209919

Browse files
committed
(correctly) fix SemanticTextHighlighterTests tests
1 parent 5e9fee1 commit 6209919

File tree

2 files changed

+23
-4
lines changed

2 files changed

+23
-4
lines changed

x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/highlight/SemanticTextHighlighterTests.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,19 +133,23 @@ public void testSparseVector() throws Exception {
133133
Map<String, Object> queryMap = (Map<String, Object>) queries.get("sparse_vector_1");
134134
List<WeightedToken> tokens = readSparseVector(queryMap.get("embeddings"));
135135
var fieldType = (SemanticTextFieldMapper.SemanticTextFieldType) mapperService.mappingLookup().getFieldType(SEMANTIC_FIELD_ELSER);
136+
137+
Boolean doNotPruneTokens = randomBoolean() ? false : null;
138+
136139
SparseVectorQueryBuilder sparseQuery = new SparseVectorQueryBuilder(
137140
fieldType.getEmbeddingsField().fullPath(),
138141
tokens,
139142
null,
140143
null,
141-
false,
144+
doNotPruneTokens,
142145
null
143146
);
144147
NestedQueryBuilder nestedQueryBuilder = new NestedQueryBuilder(fieldType.getChunksField().fullPath(), sparseQuery, ScoreMode.Max);
145148
var shardRequest = createShardSearchRequest(nestedQueryBuilder);
146149
var sourceToParse = new SourceToParse("0", readSampleDoc(useLegacyFormat), XContentType.JSON);
147150

148-
String[] expectedScorePassages = ((List<String>) queryMap.get("expected_by_score")).toArray(String[]::new);
151+
String expectedScoringDocsKey = doNotPruneTokens == null ? "expected_by_score_with_pruning" : "expected_by_score";
152+
String[] expectedScorePassages = ((List<String>) queryMap.get(expectedScoringDocsKey)).toArray(String[]::new);
149153
for (int i = 0; i < expectedScorePassages.length; i++) {
150154
assertHighlightOneDoc(
151155
mapperService,
@@ -158,7 +162,8 @@ public void testSparseVector() throws Exception {
158162
);
159163
}
160164

161-
String[] expectedOffsetPassages = ((List<String>) queryMap.get("expected_by_offset")).toArray(String[]::new);
165+
String expectedOffsetDocsKey = doNotPruneTokens == null ? "expected_by_offset_with_pruning" : "expected_by_offset";
166+
String[] expectedOffsetPassages = ((List<String>) queryMap.get(expectedOffsetDocsKey)).toArray(String[]::new);
162167
assertHighlightOneDoc(
163168
mapperService,
164169
shardRequest,

0 commit comments

Comments
 (0)