Skip to content

Commit da102fc

Browse files
[8.x] Add assertWarnings capabilities to base token stream test case (elastic#113619) (elastic#113688)
* Add assertWarnings capabilities to base token stream test case (elastic#113619) We need to be able to assert various warnings and check for such in typical token stream tests. This adds that capability. * fixing test --------- Co-authored-by: Elastic Machine <[email protected]>
1 parent 03804af commit da102fc

File tree

38 files changed

+86
-33
lines changed

38 files changed

+86
-33
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.io.IOException;
2222
import java.io.StringReader;
2323

24+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
25+
2426
public class ASCIIFoldingTokenFilterFactoryTests extends ESTokenStreamTestCase {
2527
public void testDefault() throws IOException {
2628
ESTestCase.TestAnalysis analysis = AnalysisTestsHelper.createTestAnalysisFromSettings(

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.io.IOException;
2121
import java.io.StringReader;
2222

23+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
24+
2325
/**
2426
* Base class to test {@link WordDelimiterTokenFilterFactory} and
2527
* {@link WordDelimiterGraphTokenFilterFactory}.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import java.io.IOException;
2323
import java.io.StringReader;
2424

25+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
26+
2527
public class CJKFilterFactoryTests extends ESTokenStreamTestCase {
2628
private static final String RESOURCE = "/org/elasticsearch/analysis/common/cjk_analysis.json";
2729

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.io.StringReader;
2525
import java.util.Arrays;
2626

27+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
28+
2729
public class CharGroupTokenizerFactoryTests extends ESTokenStreamTestCase {
2830

2931
public void testParseTokenChars() {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
import java.nio.file.Files;
2828
import java.nio.file.Path;
2929

30+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
31+
3032
public class CommonGramsTokenFilterFactoryTests extends ESTokenStreamTestCase {
3133
public void testDefault() throws IOException {
3234
Settings settings = Settings.builder()

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.StringReader;
2424
import java.text.ParseException;
2525

26+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
2627
import static org.hamcrest.Matchers.containsString;
2728

2829
public class ESSolrSynonymParserTests extends ESTokenStreamTestCase {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.io.StringReader;
2424
import java.text.ParseException;
2525

26+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
2627
import static org.hamcrest.Matchers.containsString;
2728

2829
public class ESWordnetSynonymParserTests extends ESTokenStreamTestCase {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import java.io.IOException;
2222
import java.io.StringReader;
2323

24+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
25+
2426
public class EdgeNGramTokenFilterFactoryTests extends ESTokenStreamTestCase {
2527

2628
public void testDefault() throws IOException {

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@
3131
import java.io.StringReader;
3232
import java.util.Collections;
3333

34+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
35+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
36+
3437
public class EdgeNGramTokenizerTests extends ESTokenStreamTestCase {
3538

3639
private IndexAnalyzers buildAnalyzers(IndexVersion version, String tokenizer) throws IOException {
@@ -88,20 +91,21 @@ public void testPreConfiguredTokenizer() throws IOException {
8891

8992
// Check deprecated name as well, needs version before 8.0 because throws IAE after that
9093
{
91-
try (
92-
IndexAnalyzers indexAnalyzers = buildAnalyzers(
93-
IndexVersionUtils.randomVersionBetween(
94-
random(),
95-
IndexVersions.V_7_3_0,
96-
IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0)
97-
),
98-
"edgeNGram"
99-
)
100-
) {
94+
IndexVersion version = IndexVersionUtils.randomVersionBetween(
95+
random(),
96+
IndexVersions.V_7_3_0,
97+
IndexVersionUtils.getPreviousVersion(IndexVersions.V_8_0_0)
98+
);
99+
try (IndexAnalyzers indexAnalyzers = buildAnalyzers(version, "edgeNGram")) {
101100
NamedAnalyzer analyzer = indexAnalyzers.get("my_analyzer");
102101
assertNotNull(analyzer);
103102
assertAnalyzesTo(analyzer, "test", new String[] { "t", "te" });
104-
103+
}
104+
if (version.onOrAfter(IndexVersions.V_7_6_0)) {
105+
assertWarnings(
106+
"The [edgeNGram] tokenizer name is deprecated and will be removed in a future version. "
107+
+ "Please change the tokenizer name to [edge_ngram] instead."
108+
);
105109
}
106110
}
107111

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import org.apache.lucene.analysis.CharArraySet;
1414
import org.elasticsearch.test.ESTokenStreamTestCase;
1515

16+
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
17+
1618
public class FingerprintAnalyzerTests extends ESTokenStreamTestCase {
1719

1820
public void testFingerprint() throws Exception {

0 commit comments

Comments
 (0)