Skip to content

Commit f5f2149

Browse files
authored
Remove much ceremony from parsing client yaml test suites (#22311)
* Remove a checked exception, replacing it with `ParsingException`. * Remove all Parser classes for the yaml sections, replacing them with static methods. * Remove `ClientYamlTestFragmentParser`. Isn't used any more. * Remove `ClientYamlTestSuiteParseContext`, replacing it with some static utility methods. I did not rewrite the parsers using `ObjectParser` because I don't think it is worth it right now.
1 parent e1b8528 commit f5f2149

File tree

93 files changed

+1373
-2174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1373
-2174
lines changed

core/src/test/java/org/elasticsearch/ExceptionSerializationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ public void testExceptionRegistration()
121121
final Path startPath = PathUtils.get(ElasticsearchException.class.getProtectionDomain().getCodeSource().getLocation().toURI())
122122
.resolve("org").resolve("elasticsearch");
123123
final Set<? extends Class<?>> ignore = Sets.newHashSet(
124-
org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException.class,
125124
CancellableThreadsTests.CustomException.class,
126125
org.elasticsearch.rest.BytesRestResponseTests.WithHeadersException.class,
127126
AbstractClientHeadersTestCase.InternalException.class);

distribution/deb/src/test/java/org/elasticsearch/test/rest/DebClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2525
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
26-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2726

2827
import java.io.IOException;
2928

@@ -34,7 +33,7 @@ public DebClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) {
3433
}
3534

3635
@ParametersFactory
37-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
36+
public static Iterable<Object[]> parameters() throws IOException {
3837
return createParameters();
3938
}
4039
}

distribution/integ-test-zip/src/test/java/org/elasticsearch/test/rest/IntegTestZipClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2525
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
26-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2726

2827
import java.io.IOException;
2928

@@ -34,7 +33,7 @@ public IntegTestZipClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate)
3433
}
3534

3635
@ParametersFactory
37-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
36+
public static Iterable<Object[]> parameters() throws IOException {
3837
return createParameters();
3938
}
4039
}

distribution/rpm/src/test/java/org/elasticsearch/test/rest/RpmClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2525
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
26-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2726

2827
import java.io.IOException;
2928

@@ -34,7 +33,7 @@ public RpmClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) {
3433
}
3534

3635
@ParametersFactory
37-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
36+
public static Iterable<Object[]> parameters() throws IOException {
3837
return createParameters();
3938
}
4039
}

distribution/tar/src/test/java/org/elasticsearch/test/rest/TarClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2525
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
26-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2726

2827
import java.io.IOException;
2928

@@ -34,7 +33,7 @@ public TarClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) {
3433
}
3534

3635
@ParametersFactory
37-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
36+
public static Iterable<Object[]> parameters() throws IOException {
3837
return createParameters();
3938
}
4039
}

distribution/zip/src/test/java/org/elasticsearch/test/rest/ZipClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2525
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
26-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2726

2827
import java.io.IOException;
2928

@@ -34,7 +33,7 @@ public ZipClientYamlTestSuiteIT(ClientYamlTestCandidate testCandidate) {
3433
}
3534

3635
@ParametersFactory
37-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
36+
public static Iterable<Object[]> parameters() throws IOException {
3837
return createParameters();
3938
}
4039
}

docs/src/test/java/org/elasticsearch/smoketest/DocsClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2626
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
27-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2827

2928
import java.io.IOException;
3029
import java.util.List;
@@ -36,7 +35,7 @@ public DocsClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandi
3635
}
3736

3837
@ParametersFactory
39-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
38+
public static Iterable<Object[]> parameters() throws IOException {
4039
return ESClientYamlSuiteTestCase.createParameters();
4140
}
4241

modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2525
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
26-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2726

2827
import java.io.IOException;
2928

@@ -33,7 +32,7 @@ public MatrixStatsClientYamlTestSuiteIT(@Name("yaml")ClientYamlTestCandidate tes
3332
}
3433

3534
@ParametersFactory
36-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
35+
public static Iterable<Object[]> parameters() throws IOException {
3736
return ESClientYamlSuiteTestCase.createParameters();
3837
}
3938
}

modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2626
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
27-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2827

2928
import java.io.IOException;
3029

@@ -35,7 +34,7 @@ public IngestCommonClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate t
3534
}
3635

3736
@ParametersFactory
38-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
37+
public static Iterable<Object[]> parameters() throws IOException {
3938
return ESClientYamlSuiteTestCase.createParameters();
4039
}
4140
}

modules/lang-expression/src/test/java/org/elasticsearch/script/expression/LangExpressionClientYamlTestSuiteIT.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
2626
import org.elasticsearch.test.rest.yaml.ESClientYamlSuiteTestCase;
27-
import org.elasticsearch.test.rest.yaml.parser.ClientYamlTestParseException;
2827

2928
import java.io.IOException;
3029

@@ -35,7 +34,7 @@ public LangExpressionClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate
3534
}
3635

3736
@ParametersFactory
38-
public static Iterable<Object[]> parameters() throws IOException, ClientYamlTestParseException {
37+
public static Iterable<Object[]> parameters() throws IOException {
3938
return ESClientYamlSuiteTestCase.createParameters();
4039
}
4140
}

0 commit comments

Comments
 (0)