Skip to content

Commit d1137b6

Browse files
jonathan-buttnerjonathan-buttner
committed
Fixing test issue
1 parent 7eb72ff commit d1137b6

File tree

19 files changed

+66
-66
lines changed

19 files changed

+66
-66
lines changed

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/AbstractServiceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
227227
service.parseRequestConfig("id", parseRequestConfigTestConfig.taskType, config, listener);
228228

229229
var exception = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT));
230-
assertThat(exception.getMessage(), containsString("Model configuration contains settings [{extra_key=value}]"));
230+
assertThat(exception.getMessage(), containsString("Configuration contains settings [{extra_key=value}]"));
231231
}
232232
}
233233

@@ -246,7 +246,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
246246
service.parseRequestConfig("id", parseRequestConfigTestConfig.taskType, config, listener);
247247

248248
var exception = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT));
249-
assertThat(exception.getMessage(), containsString("Model configuration contains settings [{extra_key=value}]"));
249+
assertThat(exception.getMessage(), containsString("Configuration contains settings [{extra_key=value}]"));
250250
}
251251
}
252252

@@ -265,7 +265,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
265265
service.parseRequestConfig("id", parseRequestConfigTestConfig.taskType, config, listener);
266266

267267
var exception = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT));
268-
assertThat(exception.getMessage(), containsString("Model configuration contains settings [{extra_key=value}]"));
268+
assertThat(exception.getMessage(), containsString("Configuration contains settings [{extra_key=value}]"));
269269
}
270270
}
271271

@@ -284,7 +284,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
284284
service.parseRequestConfig("id", parseRequestConfigTestConfig.taskType, config, listener);
285285

286286
var exception = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT));
287-
assertThat(exception.getMessage(), containsString("Model configuration contains settings [{extra_key=value}]"));
287+
assertThat(exception.getMessage(), containsString("Configuration contains settings [{extra_key=value}]"));
288288
}
289289
}
290290

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/amazonbedrock/AmazonBedrockServiceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
349349
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
350350
assertThat(
351351
exception.getMessage(),
352-
is("Model configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
352+
is("Configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
353353
);
354354
});
355355

@@ -368,7 +368,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
368368
assertThat(e, instanceOf(ElasticsearchStatusException.class));
369369
assertThat(
370370
e.getMessage(),
371-
is("Model configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
371+
is("Configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
372372
);
373373
});
374374

@@ -390,7 +390,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
390390
assertThat(e, instanceOf(ElasticsearchStatusException.class));
391391
assertThat(
392392
e.getMessage(),
393-
is("Model configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
393+
is("Configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
394394
);
395395
});
396396

@@ -412,7 +412,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
412412
assertThat(e, instanceOf(ElasticsearchStatusException.class));
413413
assertThat(
414414
e.getMessage(),
415-
is("Model configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
415+
is("Configuration contains settings [{extra_key=value}] unknown to the [amazonbedrock] service")
416416
);
417417
});
418418

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/anthropic/AnthropicServiceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
153153

154154
var failureListener = getModelListenerForException(
155155
ElasticsearchStatusException.class,
156-
"Model configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
156+
"Configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
157157
);
158158
service.parseRequestConfig("id", TaskType.COMPLETION, config, failureListener);
159159
}
@@ -172,7 +172,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
172172

173173
var failureListener = getModelListenerForException(
174174
ElasticsearchStatusException.class,
175-
"Model configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
175+
"Configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
176176
);
177177
service.parseRequestConfig("id", TaskType.COMPLETION, config, failureListener);
178178
}
@@ -191,7 +191,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
191191

192192
var failureListener = getModelListenerForException(
193193
ElasticsearchStatusException.class,
194-
"Model configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
194+
"Configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
195195
);
196196
service.parseRequestConfig("id", TaskType.COMPLETION, config, failureListener);
197197
}
@@ -210,7 +210,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
210210

211211
var failureListener = getModelListenerForException(
212212
ElasticsearchStatusException.class,
213-
"Model configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
213+
"Configuration contains settings [{extra_key=value}] unknown to the [anthropic] service"
214214
);
215215
service.parseRequestConfig("id", TaskType.COMPLETION, config, failureListener);
216216
}

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/azureaistudio/AzureAiStudioServiceTests.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
257257
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
258258
assertThat(
259259
exception.getMessage(),
260-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
260+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
261261
);
262262
}
263263
);
@@ -279,7 +279,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInEmbeddingServiceS
279279
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
280280
assertThat(
281281
exception.getMessage(),
282-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
282+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
283283
);
284284
}
285285
);
@@ -328,7 +328,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInEmbeddingTaskSett
328328
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
329329
assertThat(
330330
exception.getMessage(),
331-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
331+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
332332
);
333333
}
334334
);
@@ -354,7 +354,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInEmbeddingSecretSe
354354
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
355355
assertThat(
356356
exception.getMessage(),
357-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
357+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
358358
);
359359
}
360360
);
@@ -380,7 +380,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInChatCompletionSer
380380
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
381381
assertThat(
382382
exception.getMessage(),
383-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
383+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
384384
);
385385
}
386386
);
@@ -406,7 +406,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInChatCompletionTas
406406
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
407407
assertThat(
408408
exception.getMessage(),
409-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
409+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
410410
);
411411
}
412412
);
@@ -432,7 +432,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInChatCompletionSec
432432
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
433433
assertThat(
434434
exception.getMessage(),
435-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
435+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureaistudio] service")
436436
);
437437
}
438438
);

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/azureopenai/AzureOpenAiServiceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
228228
assertThat(exception, instanceOf(ElasticsearchStatusException.class));
229229
assertThat(
230230
exception.getMessage(),
231-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
231+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
232232
);
233233
}
234234
);
@@ -254,7 +254,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
254254
assertThat(e, instanceOf(ElasticsearchStatusException.class));
255255
assertThat(
256256
e.getMessage(),
257-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
257+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
258258
);
259259
});
260260

@@ -279,7 +279,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
279279
assertThat(e, instanceOf(ElasticsearchStatusException.class));
280280
assertThat(
281281
e.getMessage(),
282-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
282+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
283283
);
284284
});
285285

@@ -304,7 +304,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
304304
assertThat(e, instanceOf(ElasticsearchStatusException.class));
305305
assertThat(
306306
e.getMessage(),
307-
is("Model configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
307+
is("Configuration contains settings [{extra_key=value}] unknown to the [azureopenai] service")
308308
);
309309
});
310310

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/cohere/CohereServiceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
272272

273273
var failureListener = getModelListenerForException(
274274
ElasticsearchStatusException.class,
275-
"Model configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
275+
"Configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
276276
);
277277
service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, failureListener);
278278
}
@@ -287,7 +287,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
287287

288288
var failureListener = getModelListenerForException(
289289
ElasticsearchStatusException.class,
290-
"Model configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
290+
"Configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
291291
);
292292
service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, failureListener);
293293
}
@@ -306,7 +306,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
306306

307307
var failureListener = getModelListenerForException(
308308
ElasticsearchStatusException.class,
309-
"Model configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
309+
"Configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
310310
);
311311
service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, failureListener);
312312

@@ -326,7 +326,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
326326

327327
var failureListener = getModelListenerForException(
328328
ElasticsearchStatusException.class,
329-
"Model configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
329+
"Configuration contains settings [{extra_key=value}] unknown to the [cohere] service"
330330
);
331331
service.parseRequestConfig("id", TaskType.TEXT_EMBEDDING, config, failureListener);
332332
}

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/custom/CustomServiceSettingsTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ public void testFromMap_ReturnsError_IfRequestMapIsNotEmptyAfterParsing() {
498498
assertThat(
499499
exception.getMessage(),
500500
is(
501-
"Model configuration contains unknown settings [{key=value}] while parsing field [request]"
501+
"Configuration contains unknown settings [{key=value}] while parsing field [request]"
502502
+ " for settings [custom_service_settings]"
503503
)
504504
);
@@ -543,7 +543,7 @@ public void testFromMap_ReturnsError_IfJsonParserMapIsNotEmptyAfterParsing() {
543543
assertThat(
544544
exception.getMessage(),
545545
is(
546-
"Model configuration contains unknown settings [{key=value}] while parsing field [json_parser]"
546+
"Configuration contains unknown settings [{key=value}] while parsing field [json_parser]"
547547
+ " for settings [custom_service_settings]"
548548
)
549549
);
@@ -585,7 +585,7 @@ public void testFromMap_ReturnsError_IfResponseMapIsNotEmptyAfterParsing() {
585585
assertThat(
586586
exception.getMessage(),
587587
is(
588-
"Model configuration contains unknown settings [{key=value}] while parsing field [response]"
588+
"Configuration contains unknown settings [{key=value}] while parsing field [response]"
589589
+ " for settings [custom_service_settings]"
590590
)
591591
);
@@ -625,7 +625,7 @@ public void testFromMap_ReturnsError_IfErrorParserMapIsNotEmptyAfterParsing() {
625625
assertThat(
626626
exception.getMessage(),
627627
is(
628-
"Model configuration contains unknown settings [{key=value}] while parsing field [error_parser]"
628+
"Configuration contains unknown settings [{key=value}] while parsing field [error_parser]"
629629
+ " for settings [custom_service_settings]"
630630
)
631631
);

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/deepseek/DeepSeekServiceTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void testParseRequestConfigWithExtraSettings() throws IOException {
148148
assertNoSuccessListener(
149149
e -> assertThat(
150150
e.getMessage(),
151-
equalTo("Model configuration contains settings [{so=extra}] unknown to the [deepseek] service")
151+
equalTo("Configuration contains settings [{so=extra}] unknown to the [deepseek] service")
152152
)
153153
)
154154
);

‎x-pack/plugin/inference/src/test/java/org/elasticsearch/xpack/inference/services/elastic/ElasticInferenceServiceTests.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInConfig() throws I
157157

158158
var failureListener = getModelListenerForException(
159159
ElasticsearchStatusException.class,
160-
"Model configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
160+
"Configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
161161
);
162162
service.parseRequestConfig("id", TaskType.SPARSE_EMBEDDING, config, failureListener);
163163
}
@@ -172,7 +172,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInServiceSettingsMa
172172

173173
var failureListener = getModelListenerForException(
174174
ElasticsearchStatusException.class,
175-
"Model configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
175+
"Configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
176176
);
177177
service.parseRequestConfig("id", TaskType.SPARSE_EMBEDDING, config, failureListener);
178178
}
@@ -186,7 +186,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInTaskSettingsMap()
186186

187187
var failureListener = getModelListenerForException(
188188
ElasticsearchStatusException.class,
189-
"Model configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
189+
"Configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
190190
);
191191
service.parseRequestConfig("id", TaskType.SPARSE_EMBEDDING, config, failureListener);
192192
}
@@ -200,7 +200,7 @@ public void testParseRequestConfig_ThrowsWhenAnExtraKeyExistsInSecretSettingsMap
200200

201201
var failureListener = getModelListenerForException(
202202
ElasticsearchStatusException.class,
203-
"Model configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
203+
"Configuration contains settings [{extra_key=value}] unknown to the [elastic] service"
204204
);
205205
service.parseRequestConfig("id", TaskType.SPARSE_EMBEDDING, config, failureListener);
206206
}

0 commit comments

Comments
 (0)