Skip to content

Commit 68f22fa

Browse files
author
Christoph Büscher
authored
Delete removed token filter names from SynonymsAnalysisTests (#50438)
The `testPreconfiguredTokenFilters` test refers to the `nGram` and `edgeNGram` token filter which are no longer part of the preconfigured token filters, so they can be removed here as well.
1 parent 789f790 commit 68f22fa

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/SynonymsAnalysisTests.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ public void testTokenFiltersBypassSynonymAnalysis() throws IOException {
250250

251251
public void testPreconfiguredTokenFilters() throws IOException {
252252
Set<String> disallowedFilters = new HashSet<>(Arrays.asList(
253-
"common_grams", "edge_ngram", "edgeNGram", "keyword_repeat", "ngram", "nGram",
254-
"shingle", "word_delimiter", "word_delimiter_graph"
253+
"common_grams", "edge_ngram", "keyword_repeat", "ngram", "shingle",
254+
"word_delimiter", "word_delimiter_graph"
255255
));
256256

257257
Settings settings = Settings.builder()
@@ -260,23 +260,23 @@ public void testPreconfiguredTokenFilters() throws IOException {
260260
.put("path.home", createTempDir().toString())
261261
.build();
262262
IndexSettings idxSettings = IndexSettingsModule.newIndexSettings("index", settings);
263-
264-
CommonAnalysisPlugin plugin = new CommonAnalysisPlugin();
265-
266-
for (PreConfiguredTokenFilter tf : plugin.getPreConfiguredTokenFilters()) {
267-
if (disallowedFilters.contains(tf.getName())) {
268-
IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
269-
"Expected exception for factory " + tf.getName(), () -> {
270-
tf.get(idxSettings, null, tf.getName(), settings).getSynonymFilter();
271-
});
272-
assertEquals(tf.getName(), "Token filter [" + tf.getName()
273-
+ "] cannot be used to parse synonyms",
274-
e.getMessage());
275-
}
276-
else {
277-
tf.get(idxSettings, null, tf.getName(), settings).getSynonymFilter();
263+
Set<String> disallowedFiltersTested = new HashSet<String>();
264+
265+
try (CommonAnalysisPlugin plugin = new CommonAnalysisPlugin()) {
266+
for (PreConfiguredTokenFilter tf : plugin.getPreConfiguredTokenFilters()) {
267+
if (disallowedFilters.contains(tf.getName())) {
268+
IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
269+
"Expected exception for factory " + tf.getName(), () -> {
270+
tf.get(idxSettings, null, tf.getName(), settings).getSynonymFilter();
271+
});
272+
assertEquals(tf.getName(), "Token filter [" + tf.getName() + "] cannot be used to parse synonyms", e.getMessage());
273+
disallowedFiltersTested.add(tf.getName());
274+
} else {
275+
tf.get(idxSettings, null, tf.getName(), settings).getSynonymFilter();
276+
}
278277
}
279278
}
279+
assertEquals("Set of dissallowed filters contains more filters than tested", disallowedFiltersTested, disallowedFilters);
280280
}
281281

282282
public void testDisallowedTokenFilters() throws IOException {

0 commit comments

Comments
 (0)