This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 e42c3cc7563 Add AgentE2ETestCaseArgumentsProvider (#32202)
e42c3cc7563 is described below
commit e42c3cc75639ff0407c9eb55ff3ca2aded5762e4
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 20 19:30:45 2024 +0800
Add AgentE2ETestCaseArgumentsProvider (#32202)
* Add AgentE2ETestCaseArgumentsProvider
* Add AgentE2ETestCaseArgumentsProvider
* Add AgentE2ETestCaseArgumentsProvider
* Add AgentE2ETestCaseArgumentsProvider
---
.../AgentE2ETestActionExtension.java} | 6 +++---
.../AgentE2ETestCaseArgumentsProvider.java} | 25 ++++++++++++----------
.../test/e2e/agent/file/FilePluginE2EIT.java | 18 ++++++----------
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 17 ++++++---------
.../test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 18 ++++++----------
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 20 ++++++-----------
6 files changed, 42 insertions(+), 62 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/framework/AgentE2ETestActionExtension.java
similarity index 87%
copy from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
copy to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/framework/AgentE2ETestActionExtension.java
index acf393f6866..d4a54097683 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/framework/AgentE2ETestActionExtension.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common;
+package org.apache.shardingsphere.test.e2e.agent.common.framework;
import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import org.junit.jupiter.api.extension.AfterAllCallback;
@@ -23,9 +23,9 @@ import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
/**
- * Agent test action extension.
+ * Agent E2E test action extension.
*/
-public final class AgentTestActionExtension implements BeforeAllCallback,
AfterAllCallback {
+public final class AgentE2ETestActionExtension implements BeforeAllCallback,
AfterAllCallback {
@Override
public void beforeAll(final ExtensionContext extensionContext) {
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/framework/AgentE2ETestCaseArgumentsProvider.java
similarity index 51%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/framework/AgentE2ETestCaseArgumentsProvider.java
index acf393f6866..11285573d4f 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/framework/AgentE2ETestCaseArgumentsProvider.java
@@ -15,25 +15,28 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common;
+package org.apache.shardingsphere.test.e2e.agent.common.framework;
+import lombok.RequiredArgsConstructor;
+import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCases;
+import
org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCasesLoader;
import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
-import org.junit.jupiter.api.extension.AfterAllCallback;
-import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.ArgumentsProvider;
+
+import java.util.stream.Stream;
/**
- * Agent test action extension.
+ * Agent E2E test case arguments provider.
*/
-public final class AgentTestActionExtension implements BeforeAllCallback,
AfterAllCallback {
+@RequiredArgsConstructor
+public abstract class AgentE2ETestCaseArgumentsProvider implements
ArgumentsProvider {
- @Override
- public void beforeAll(final ExtensionContext extensionContext) {
- AgentE2ETestEnvironment.getInstance().init();
- }
+ private final Class<? extends AgentE2ETestCases<?>> agentE2ETestCasesClass;
@Override
- public void afterAll(final ExtensionContext extensionContext) {
- AgentE2ETestEnvironment.getInstance().destroy();
+ public final Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
+ return new
AgentE2ETestCasesLoader(agentE2ETestCasesClass).loadTestCases(AgentE2ETestEnvironment.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/FilePluginE2EIT.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java
index 4705e9429b7..44242f5a438 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
@@ -17,25 +17,20 @@
package org.apache.shardingsphere.test.e2e.agent.file;
-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.AgentE2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.agent.file.asserts.ContentAssert;
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;
-import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.stream.Stream;
-
import static org.junit.jupiter.api.Assertions.assertFalse;
-@ExtendWith(AgentTestActionExtension.class)
+@ExtendWith(AgentE2ETestActionExtension.class)
class FilePluginE2EIT {
@EnabledIf("isEnabled")
@@ -50,11 +45,10 @@ class FilePluginE2EIT {
return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+ private static final class TestCaseArgumentsProvider extends
AgentE2ETestCaseArgumentsProvider {
- @Override
- public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(LogE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ private TestCaseArgumentsProvider() {
+ super(LogE2ETestCases.class);
}
}
}
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 1fc7ad9ed5a..8a531bac113 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
@@ -19,9 +19,9 @@ package org.apache.shardingsphere.test.e2e.agent.metrics;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.util.json.JsonUtils;
-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.AgentE2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.agent.common.util.HttpUtils;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.MetricMetadataAssert;
import
org.apache.shardingsphere.test.e2e.agent.metrics.asserts.MetricQueryAssert;
@@ -32,17 +32,13 @@ import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsMetaDataRe
import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsQueryResult;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
import java.io.IOException;
import java.net.URLEncoder;
-import java.util.stream.Stream;
-@ExtendWith(AgentTestActionExtension.class)
+@ExtendWith(AgentE2ETestActionExtension.class)
@Slf4j
class MetricsPluginE2EIT {
@@ -83,11 +79,10 @@ class MetricsPluginE2EIT {
return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+ private static final class TestCaseArgumentsProvider extends
AgentE2ETestCaseArgumentsProvider {
- @Override
- public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(MetricE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ private TestCaseArgumentsProvider() {
+ super(MetricE2ETestCases.class);
}
}
}
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 4f2ab4fcbfc..719a3fe1758 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
@@ -17,23 +17,18 @@
package org.apache.shardingsphere.test.e2e.agent.jaeger;
-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.AgentE2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.agent.jaeger.asserts.SpanAssert;
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;
-import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.stream.Stream;
-
-@ExtendWith(AgentTestActionExtension.class)
+@ExtendWith(AgentE2ETestActionExtension.class)
class JaegerPluginE2EIT {
@EnabledIf("isEnabled")
@@ -47,11 +42,10 @@ class JaegerPluginE2EIT {
return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+ private static final class TestCaseArgumentsProvider extends
AgentE2ETestCaseArgumentsProvider {
- @Override
- public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(JaegerE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ private TestCaseArgumentsProvider() {
+ super(JaegerE2ETestCases.class);
}
}
}
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 8be01da677a..aba00c66880 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
@@ -17,23 +17,18 @@
package org.apache.shardingsphere.test.e2e.agent.zipkin;
-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.AgentE2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestActionExtension;
+import
org.apache.shardingsphere.test.e2e.agent.common.framework.AgentE2ETestCaseArgumentsProvider;
import org.apache.shardingsphere.test.e2e.agent.zipkin.asserts.SpanAssert;
-import
org.apache.shardingsphere.test.e2e.agent.zipkin.cases.ZipkinE2ETestCases;
import org.apache.shardingsphere.test.e2e.agent.zipkin.cases.SpanTestCase;
+import
org.apache.shardingsphere.test.e2e.agent.zipkin.cases.ZipkinE2ETestCases;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ArgumentsProvider;
import org.junit.jupiter.params.provider.ArgumentsSource;
-import java.util.stream.Stream;
-
-@ExtendWith(AgentTestActionExtension.class)
+@ExtendWith(AgentE2ETestActionExtension.class)
class ZipkinPluginE2EIT {
@EnabledIf("isEnabled")
@@ -47,11 +42,10 @@ class ZipkinPluginE2EIT {
return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
- private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+ private static final class TestCaseArgumentsProvider extends
AgentE2ETestCaseArgumentsProvider {
- @Override
- public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(ZipkinE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ private TestCaseArgumentsProvider() {
+ super(ZipkinE2ETestCases.class);
}
}
}
