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 dc97c8ba29a Rename E2ETestCases with module prefixes (#32196)
dc97c8ba29a is described below
commit dc97c8ba29aaa3049467c8ef3b4bac12772cd6b4
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 20 15:12:09 2024 +0800
Rename E2ETestCases with module prefixes (#32196)
* Add AgentE2ETestCases
* Use AgentE2ETestCasesLoader instead of E2ETestCasesLoader in each module
* Use AgentE2ETestCasesLoader instead of E2ETestCasesLoader in each module
* Rename E2ETestCases with module prefixes
* Rename E2ETestCases with module prefixes
---
.../test/e2e/agent/common/AgentTestActionExtension.java | 4 ++--
.../shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java | 4 ++--
.../agent/file/cases/{E2ETestCases.java => LogE2ETestCases.java} | 4 ++--
.../shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java | 4 ++--
.../metrics/cases/{E2ETestCases.java => MetricE2ETestCases.java} | 4 ++--
.../test/e2e/agent/metrics/cases/MetricQueryAssertion.java | 8 ++++----
.../prometheus/src/test/resources/cases/proxy/proxy_state.xml | 2 +-
.../shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 4 ++--
.../jaeger/cases/{E2ETestCases.java => JaegerE2ETestCases.java} | 4 ++--
.../shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 4 ++--
.../zipkin/cases/{E2ETestCases.java => ZipkinE2ETestCases.java} | 4 ++--
11 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
index e3e59366753..5ce644857a1 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
@@ -28,12 +28,12 @@ import org.junit.jupiter.api.extension.ExtensionContext;
public final class AgentTestActionExtension implements BeforeAllCallback,
AfterAllCallback {
@Override
- public void beforeAll(final ExtensionContext extensionContext) throws
Exception {
+ public void beforeAll(final ExtensionContext extensionContext) {
E2ETestEnvironment.getInstance().init();
}
@Override
- public void afterAll(final ExtensionContext extensionContext) throws
Exception {
+ public void afterAll(final ExtensionContext extensionContext) {
E2ETestEnvironment.getInstance().destroy();
}
}
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
index 841850493e3..a797aa0cc67 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.file.asserts.ContentAssert;
-import org.apache.shardingsphere.test.e2e.agent.file.cases.E2ETestCases;
+import org.apache.shardingsphere.test.e2e.agent.file.cases.LogE2ETestCases;
import org.apache.shardingsphere.test.e2e.agent.file.cases.LogTestCase;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -54,7 +54,7 @@ class FilePluginE2EIT {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(E2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(LogE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
}
}
}
diff --git
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/E2ETestCases.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCases.java
similarity index 92%
rename from
test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/E2ETestCases.java
rename to
test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCases.java
index 6c7fc1e01e2..7e4a7b94b4c 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/E2ETestCases.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogE2ETestCases.java
@@ -26,11 +26,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * E2E test cases.
+ * Log E2E test cases.
*/
@XmlRootElement(name = "e2e-test-cases")
@Getter
-public final class E2ETestCases implements AgentE2ETestCases<LogTestCase> {
+public final class LogE2ETestCases implements AgentE2ETestCases<LogTestCase> {
@XmlElement(name = "test-case")
private final Collection<LogTestCase> testCases = new LinkedList<>();
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
index dc483b34c0a..573aac498a7 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.common.util.OkHttpUtils;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.MetricMetadataAssert;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.MetricQueryAssert;
-import org.apache.shardingsphere.test.e2e.agent.metrics.cases.E2ETestCases;
+import
org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricE2ETestCases;
import
org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricQueryAssertion;
import org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricTestCase;
import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsMetaDataResult;
@@ -86,7 +86,7 @@ class MetricsPluginE2EIT {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(E2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(MetricE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
}
}
}
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/E2ETestCases.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCases.java
similarity index 92%
rename from
test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/E2ETestCases.java
rename to
test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCases.java
index 7ed5be27bde..e7a22ce1bd3 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/E2ETestCases.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricE2ETestCases.java
@@ -26,11 +26,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * E2E test cases.
+ * Metric E2E test cases.
*/
@XmlRootElement(name = "e2e-test-cases")
@Getter
-public final class E2ETestCases implements AgentE2ETestCases<MetricTestCase> {
+public final class MetricE2ETestCases implements
AgentE2ETestCases<MetricTestCase> {
@XmlElement(name = "test-case")
private final Collection<MetricTestCase> testCases = new LinkedList<>();
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricQueryAssertion.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricQueryAssertion.java
index c4f47758c68..692f0387212 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricQueryAssertion.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricQueryAssertion.java
@@ -32,15 +32,15 @@ import javax.xml.bind.annotation.XmlAttribute;
@XmlAccessorType(XmlAccessType.FIELD)
public final class MetricQueryAssertion {
- @XmlAttribute(name = "metric")
+ @XmlAttribute
private String metric;
- @XmlAttribute(name = "query")
+ @XmlAttribute
private String query;
- @XmlAttribute(name = "value")
+ @XmlAttribute
private int value;
- @XmlAttribute(name = "shouldAssertValue")
+ @XmlAttribute(name = "should-Assert-value")
private boolean shouldAssertValue;
}
diff --git
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/cases/proxy/proxy_state.xml
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/cases/proxy/proxy_state.xml
index 984ec75a05e..53a2f58af06 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/cases/proxy/proxy_state.xml
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/resources/cases/proxy/proxy_state.xml
@@ -18,6 +18,6 @@
<e2e-test-cases>
<test-case metric-name="proxy_state" metric-type="gauge">
- <query-assertion metric="proxy_state" query="proxy_state{}" value="0"
shouldAssertValue="true"/>
+ <query-assertion metric="proxy_state" query="proxy_state{}" value="0"
should-Assert-value="true" />
</test-case>
</e2e-test-cases>
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
index 44117ab8a78..20f1b1c5da6 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.jaeger.asserts.SpanAssert;
-import org.apache.shardingsphere.test.e2e.agent.jaeger.cases.E2ETestCases;
+import
org.apache.shardingsphere.test.e2e.agent.jaeger.cases.JaegerE2ETestCases;
import org.apache.shardingsphere.test.e2e.agent.jaeger.cases.SpanTestCase;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -51,7 +51,7 @@ class JaegerPluginE2EIT {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(E2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(JaegerE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
}
}
}
diff --git
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCases.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCases.java
similarity index 92%
rename from
test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCases.java
rename to
test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCases.java
index a957a99563c..2e8afc39190 100644
---
a/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/E2ETestCases.java
+++
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/JaegerE2ETestCases.java
@@ -26,11 +26,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * E2E test cases.
+ * Jaeger E2E test cases.
*/
@XmlRootElement(name = "e2e-test-cases")
@Getter
-public final class E2ETestCases implements AgentE2ETestCases<SpanTestCase> {
+public final class JaegerE2ETestCases implements
AgentE2ETestCases<SpanTestCase> {
@XmlElement(name = "test-case")
private final Collection<SpanTestCase> testCases = new LinkedList<>();
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 239be973a23..71c180a4b18 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
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
import
org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.zipkin.asserts.SpanAssert;
-import org.apache.shardingsphere.test.e2e.agent.zipkin.cases.E2ETestCases;
+import
org.apache.shardingsphere.test.e2e.agent.zipkin.cases.ZipkinE2ETestCases;
import org.apache.shardingsphere.test.e2e.agent.zipkin.cases.SpanTestCase;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -51,7 +51,7 @@ class ZipkinPluginE2EIT {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(E2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(ZipkinE2ETestCases.class).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/E2ETestCases.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCases.java
similarity index 92%
rename from
test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/E2ETestCases.java
rename to
test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCases.java
index 76af0320a97..562f3eb9e8d 100644
---
a/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/E2ETestCases.java
+++
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/ZipkinE2ETestCases.java
@@ -26,11 +26,11 @@ import java.util.Collection;
import java.util.LinkedList;
/**
- * E2E test cases.
+ * Zipkin E2E test cases.
*/
@XmlRootElement(name = "e2e-test-cases")
@Getter
-public final class E2ETestCases implements AgentE2ETestCases<SpanTestCase> {
+public final class ZipkinE2ETestCases implements
AgentE2ETestCases<SpanTestCase> {
@XmlElement(name = "test-case")
private final Collection<SpanTestCase> testCases = new LinkedList<>();
