This is an automated email from the ASF dual-hosted git repository.
sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new e5da78dc463 Keep consistent for E2ETestCasesLoader on jaeger and
zipkin module (#32190)
e5da78dc463 is described below
commit e5da78dc463377df43118e46dd2a538435d75357
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Jul 19 19:49:38 2024 +0800
Keep consistent for E2ETestCasesLoader on jaeger and zipkin module (#32190)
* Rename E2ETestEnvironment
* Keep consistent for E2ETestCasesLoader on jaeger and zipkin module
---
.../e2e/agent/jaeger/cases/E2ETestCasesLoader.java | 6 +++---
.../test/e2e/agent/jaeger/cases/SpanTestCase.java | 2 +-
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 2 +-
.../e2e/agent/zipkin/cases/E2ETestCasesLoader.java | 20 ++++++++++----------
.../test/e2e/agent/zipkin/cases/SpanTestCase.java | 2 +-
5 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCasesLoader.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCasesLoader.java
index bc8f638c597..9ebbdc40595 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCasesLoader.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCasesLoader.java
@@ -62,7 +62,7 @@ public final class E2ETestCasesLoader {
}
/**
- * Load E2E test cases.
+ * Load test cases.
*
* @param adapter adapter
* @return test cases
@@ -103,8 +103,8 @@ public final class E2ETestCasesLoader {
return result;
}
- private E2ETestCases unmarshal(final String integrateCasesFile) throws
IOException, JAXBException {
- try (FileReader reader = new FileReader(integrateCasesFile)) {
+ private E2ETestCases unmarshal(final String e2eCasesFile) throws
IOException, JAXBException {
+ try (FileReader reader = new FileReader(e2eCasesFile)) {
return (E2ETestCases)
JAXBContext.newInstance(E2ETestCases.class).createUnmarshaller().unmarshal(reader);
}
}
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/SpanTestCase.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/SpanTestCase.java
index 7cf823c39cd..8fcab62fa0c 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/SpanTestCase.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/SpanTestCase.java
@@ -30,9 +30,9 @@ import java.util.Collection;
/**
* Span test case.
*/
+@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
public final class SpanTestCase {
@XmlAttribute(name = "service-name")
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
index 8fd0815245d..411b22d560d 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
@@ -50,7 +50,7 @@ class ZipkinPluginE2EIT {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return
E2ETestCasesLoader.getInstance().loadE2ETestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return
E2ETestCasesLoader.getInstance().loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
}
}
}
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/E2ETestCasesLoader.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/E2ETestCasesLoader.java
index d822dcc85a9..ada9f9c8b31 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/E2ETestCasesLoader.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/E2ETestCasesLoader.java
@@ -50,7 +50,7 @@ public final class E2ETestCasesLoader {
private static final E2ETestCasesLoader INSTANCE = new
E2ETestCasesLoader();
- private Collection<SpanTestCase> e2eTestCases;
+ private Collection<SpanTestCase> testCases;
/**
* Get singleton instance.
@@ -62,25 +62,25 @@ public final class E2ETestCasesLoader {
}
/**
- * Load E2E test cases.
+ * Load test cases.
*
* @param adapter adapter
- * @return E2E test cases
+ * @return test cases
*/
@SneakyThrows({IOException.class, URISyntaxException.class,
JAXBException.class})
- public Collection<SpanTestCase> loadE2ETestCases(final String adapter) {
- if (null != e2eTestCases) {
- return e2eTestCases;
+ public Collection<SpanTestCase> loadTestCases(final String adapter) {
+ if (null != testCases) {
+ return testCases;
}
- e2eTestCases = new LinkedList<>();
+ testCases = new LinkedList<>();
URL url =
Objects.requireNonNull(Thread.currentThread().getContextClassLoader().getResource(String.format("cases/%s",
adapter)));
for (File each : getFiles(url)) {
- e2eTestCases.addAll(loadE2ETestCases(each));
+ testCases.addAll(loadTestCases(each));
}
- return e2eTestCases;
+ return testCases;
}
- private Collection<SpanTestCase> loadE2ETestCases(final File file) throws
IOException, JAXBException {
+ private Collection<SpanTestCase> loadTestCases(final File file) throws
IOException, JAXBException {
Collection<SpanTestCase> result = new LinkedList<>();
for (SpanTestCase each : unmarshal(file.getPath()).getTestCases()) {
result.addAll(each.getTagCases().stream().map(optional ->
createSpanTestCase(each.getServiceName(), each.getSpanName(),
optional)).collect(Collectors.toList()));
diff --git
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/SpanTestCase.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/SpanTestCase.java
index c4f61b3450c..8a429b09bcd 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/SpanTestCase.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/SpanTestCase.java
@@ -30,9 +30,9 @@ import java.util.Collection;
/**
* Span test case.
*/
+@XmlAccessorType(XmlAccessType.FIELD)
@Getter
@Setter
-@XmlAccessorType(XmlAccessType.FIELD)
public final class SpanTestCase {
@XmlAttribute(name = "service-name")
