This is an automated email from the ASF dual-hosted git repository.
panjuan 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 27cd75bcb5d Upgrade junit 5 on Agent E2E (#24567)
27cd75bcb5d is described below
commit 27cd75bcb5d65686833798714b389ccf306bef6f
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Mar 13 07:13:07 2023 +0800
Upgrade junit 5 on Agent E2E (#24567)
---
...ntExtension.java => TracingAgentExtension.java} | 5 +-
.../AbstractJDBCExecutorCallbackAdviceTest.java | 4 +-
.../advice/AbstractSQLParserEngineAdviceTest.java | 4 +-
.../advice/OpenTelemetryRootSpanAdviceTest.java | 4 +-
.../advice/OpenTracingRootSpanAdviceTest.java | 4 +-
...ginE2EIT.java => AgentTestActionExtension.java} | 34 +++++++-------
.../test/e2e/agent/file/FilePluginE2EIT.java | 21 +++------
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 45 +++++++++---------
.../test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 53 ++++++++--------------
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 51 ++++++++-------------
.../cases/readonly/SetReadOnlyTestCase.java | 2 +-
.../engine/base/TransactionBaseE2EIT.java | 2 +-
12 files changed, 100 insertions(+), 129 deletions(-)
diff --git
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentExtension.java
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/TracingAgentExtension.java
similarity index 96%
rename from
agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentExtension.java
rename to
agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/TracingAgentExtension.java
index 28855939700..12ec131e343 100644
---
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/AgentExtension.java
+++
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/TracingAgentExtension.java
@@ -36,7 +36,10 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.HashSet;
-public final class AgentExtension implements BeforeAllCallback,
AfterAllCallback, BeforeEachCallback {
+/**
+ * Tracing agent extension.
+ */
+public final class TracingAgentExtension implements BeforeAllCallback,
AfterAllCallback, BeforeEachCallback {
private static final String EXTRA_DATA = "_$EXTRA_DATA$_";
diff --git
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
index d474fc487fd..d9696cfe04b 100644
---
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
+++
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractJDBCExecutorCallbackAdviceTest.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.agent.plugin.tracing.advice;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
-import org.apache.shardingsphere.agent.plugin.tracing.AgentExtension;
+import org.apache.shardingsphere.agent.plugin.tracing.TracingAgentExtension;
import org.apache.shardingsphere.agent.plugin.tracing.MockDataSourceMetaData;
import org.apache.shardingsphere.infra.database.metadata.DataSourceMetaData;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
@@ -43,7 +43,7 @@ import java.util.Map;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@ExtendWith(AgentExtension.class)
+@ExtendWith(TracingAgentExtension.class)
public abstract class AbstractJDBCExecutorCallbackAdviceTest implements
AdviceTestBase {
@Getter
diff --git
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
index b13b2faf694..e755f0824f2 100644
---
a/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
+++
b/agent/plugins/tracing/test/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/advice/AbstractSQLParserEngineAdviceTest.java
@@ -19,13 +19,13 @@ package
org.apache.shardingsphere.agent.plugin.tracing.advice;
import lombok.Getter;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
-import org.apache.shardingsphere.agent.plugin.tracing.AgentExtension;
+import org.apache.shardingsphere.agent.plugin.tracing.TracingAgentExtension;
import org.apache.shardingsphere.infra.parser.ShardingSphereSQLParserEngine;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.mockito.Mockito.mock;
-@ExtendWith(AgentExtension.class)
+@ExtendWith(TracingAgentExtension.class)
public abstract class AbstractSQLParserEngineAdviceTest implements
AdviceTestBase {
@Getter
diff --git
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryRootSpanAdviceTest.java
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryRootSpanAdviceTest.java
index f9585fc364c..8040675fae0 100644
---
a/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryRootSpanAdviceTest.java
+++
b/agent/plugins/tracing/type/opentelemetry/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/advice/OpenTelemetryRootSpanAdviceTest.java
@@ -27,7 +27,7 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.data.SpanData;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
-import org.apache.shardingsphere.agent.plugin.tracing.AgentExtension;
+import org.apache.shardingsphere.agent.plugin.tracing.TracingAgentExtension;
import
org.apache.shardingsphere.agent.plugin.tracing.core.constant.AttributeConstants;
import
org.apache.shardingsphere.agent.plugin.tracing.opentelemetry.constant.OpenTelemetryConstants;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
@@ -52,7 +52,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@ExtendWith({AgentExtension.class, AutoMockExtension.class})
+@ExtendWith({TracingAgentExtension.class, AutoMockExtension.class})
@StaticMockSettings(ProxyContext.class)
public final class OpenTelemetryRootSpanAdviceTest {
diff --git
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingRootSpanAdviceTest.java
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingRootSpanAdviceTest.java
index 2bfb6825a7e..da946277792 100644
---
a/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingRootSpanAdviceTest.java
+++
b/agent/plugins/tracing/type/opentracing/src/test/java/org/apache/shardingsphere/agent/plugin/tracing/opentracing/advice/OpenTracingRootSpanAdviceTest.java
@@ -24,7 +24,7 @@ import io.opentracing.mock.MockSpan.LogEntry;
import io.opentracing.mock.MockTracer;
import io.opentracing.util.GlobalTracer;
import org.apache.shardingsphere.agent.api.advice.TargetAdviceObject;
-import org.apache.shardingsphere.agent.plugin.tracing.AgentExtension;
+import org.apache.shardingsphere.agent.plugin.tracing.TracingAgentExtension;
import
org.apache.shardingsphere.agent.plugin.tracing.core.constant.AttributeConstants;
import org.apache.shardingsphere.db.protocol.payload.PacketPayload;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
@@ -54,7 +54,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-@ExtendWith({AgentExtension.class, AutoMockExtension.class})
+@ExtendWith({TracingAgentExtension.class, AutoMockExtension.class})
@StaticMockSettings(ProxyContext.class)
public final class OpenTracingRootSpanAdviceTest {
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
similarity index 80%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
index 5b1559b1bba..28dcf4a69cf 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/AgentTestActionExtension.java
@@ -22,36 +22,29 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.test.e2e.agent.common.entity.OrderEntity;
import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
import org.apache.shardingsphere.test.e2e.agent.common.util.JDBCAgentTestUtils;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
-import static org.hamcrest.CoreMatchers.is;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
/**
- * Basic integration test.
+ * Agent test action extension.
*/
@Slf4j
-public abstract class BasePluginE2EIT {
+public final class AgentTestActionExtension implements BeforeEachCallback {
- private static boolean hasSleep;
+ private static volatile boolean hasSleep;
- @Before
- public void check() {
-
Assume.assumeThat(E2ETestEnvironment.getInstance().isEnvironmentPrepared(),
is(true));
-
Assume.assumeThat(E2ETestEnvironment.getInstance().isInitializationFailed(),
is(false));
- E2ETestEnvironment.getInstance().createDataSource();
- assertNotNull(E2ETestEnvironment.getInstance().getDataSource());
- }
-
- @Test
- public void assertProxyWithAgent() {
+ @Override
+ public void beforeEach(final ExtensionContext context) {
+ checkEnvironment();
DataSource dataSource =
E2ETestEnvironment.getInstance().getDataSource();
List<Long> results = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
@@ -70,6 +63,13 @@ public abstract class BasePluginE2EIT {
sleep();
}
+ private void checkEnvironment() {
+ assumeTrue(E2ETestEnvironment.getInstance().isEnvironmentPrepared());
+ assumeFalse(E2ETestEnvironment.getInstance().isInitializationFailed());
+ E2ETestEnvironment.getInstance().createDataSource();
+ assertNotNull(E2ETestEnvironment.getInstance().getDataSource());
+ }
+
@SneakyThrows(InterruptedException.class)
private void sleep() {
if (!hasSleep) {
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 4b2681d9135..208cdda8a68 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,29 +17,20 @@
package org.apache.shardingsphere.test.e2e.agent.file;
-import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
+import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
import org.apache.shardingsphere.test.e2e.agent.file.asserts.ContentAssert;
import org.apache.shardingsphere.test.e2e.agent.file.loader.LogLoader;
-import org.junit.Test;
-
-import java.util.Collection;
-import java.util.LinkedList;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import static org.junit.jupiter.api.Assertions.assertTrue;
-public final class FilePluginE2EIT extends BasePluginE2EIT {
+@ExtendWith(AgentTestActionExtension.class)
+public final class FilePluginE2EIT {
@Test
public void assertProxyWithAgent() {
- super.assertProxyWithAgent();
assertTrue(LogLoader.getLogFile().exists(), String.format("The file
`%s` does not exist", LogLoader.getLogFilePath()));
- Collection<String> expectedLogRegexs = getExpectedLogRegex();
- expectedLogRegexs.forEach(ContentAssert::assertIs);
- }
-
- private Collection<String> getExpectedLogRegex() {
- Collection<String> result = new LinkedList<>();
- result.add("Build meta data contexts finished, cost\\s(?=[1-9]+\\d*)");
- return result;
+ ContentAssert.assertIs("Build meta data contexts finished,
cost\\s(?=[1-9]+\\d*)");
}
}
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 6e73a4c56da..510b26d9350 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
@@ -17,9 +17,8 @@
package org.apache.shardingsphere.test.e2e.agent.metrics;
-import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
+import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
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;
@@ -29,31 +28,25 @@ import
org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricQueryAsserti
import org.apache.shardingsphere.test.e2e.agent.metrics.cases.MetricTestCase;
import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsMetaDataResult;
import
org.apache.shardingsphere.test.e2e.agent.metrics.result.MetricsQueryResult;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+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.Collection;
import java.util.Properties;
+import java.util.stream.Stream;
-@RunWith(Parameterized.class)
-@RequiredArgsConstructor
+@ExtendWith(AgentTestActionExtension.class)
@Slf4j
-public final class MetricsPluginE2EIT extends BasePluginE2EIT {
+public final class MetricsPluginE2EIT {
- private final MetricTestCase metricTestCase;
-
- @Parameters
- public static Collection<MetricTestCase> getTestParameters() {
- return
IntegrationTestCasesLoader.getInstance().loadIntegrationTestCases();
- }
-
- @Test
- public void assertProxyWithAgent() {
- super.assertProxyWithAgent();
+ @ParameterizedTest
+ @ArgumentsSource(TestCaseArgumentsProvider.class)
+ public void assertProxyWithAgent(final MetricTestCase metricTestCase) {
Properties props = E2ETestEnvironment.getInstance().getProps();
String metaDataURL = props.getProperty("prometheus.metadata.url");
String queryURL = props.getProperty("prometheus.query.url");
@@ -69,7 +62,7 @@ public final class MetricsPluginE2EIT extends BasePluginE2EIT
{
String metaDataURLWithParam = String.join("", metaDataURL,
"?metric=", URLEncoder.encode(metricName, "UTF-8"));
MetricMetadataAssert.assertIs(OkHttpUtils.getInstance().get(metaDataURLWithParam,
MetricsMetaDataResult.class), metricCase);
} catch (final IOException ex) {
- log.info("Access prometheus HTTP RESTful API error: ", ex);
+ log.info("Access prometheus HTTP RESTFul API error: ", ex);
}
}
@@ -79,8 +72,16 @@ public final class MetricsPluginE2EIT extends
BasePluginE2EIT {
String queryURLWithParam = String.join("", queryURL,
"?query=", URLEncoder.encode(each.getQuery(), "UTF-8"));
MetricQueryAssert.assertIs(OkHttpUtils.getInstance().get(queryURLWithParam,
MetricsQueryResult.class), each);
} catch (final IOException ex) {
- log.info("Access prometheus HTTP RESTful API error: ", ex);
+ log.info("Access prometheus HTTP RESTFul API error: ", ex);
}
}
}
+
+ private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+
+ @Override
+ public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
+ return
IntegrationTestCasesLoader.getInstance().loadIntegrationTestCases().stream().map(Arguments::of);
+ }
+ }
}
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 cdd9331f62c..4c164938607 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,47 +17,34 @@
package org.apache.shardingsphere.test.e2e.agent.jaeger;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
+import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
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.IntegrationTestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.jaeger.cases.SpanTestCase;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+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.Collection;
-import java.util.Properties;
+import java.util.stream.Stream;
-@RunWith(Parameterized.class)
-@RequiredArgsConstructor
-@Slf4j
-public final class JaegerPluginE2EIT extends BasePluginE2EIT {
+@ExtendWith(AgentTestActionExtension.class)
+public final class JaegerPluginE2EIT {
- private final SpanTestCase spanTestCase;
-
- private Properties props;
-
- private String url;
-
- @Parameters
- public static Collection<SpanTestCase> getTestParameters() {
- return
IntegrationTestCasesLoader.getInstance().loadIntegrationTestCases();
- }
-
- @Before
- public void before() {
- props = E2ETestEnvironment.getInstance().getProps();
- url = props.getProperty("jaeger.url");
+ @ParameterizedTest
+ @ArgumentsSource(TestCaseArgumentsProvider.class)
+ public void assertProxyWithAgent(final SpanTestCase spanTestCase) {
+
SpanAssert.assertIs(E2ETestEnvironment.getInstance().getProps().getProperty("jaeger.url"),
spanTestCase);
}
- @Test
- public void assertProxyWithAgent() {
- super.assertProxyWithAgent();
- SpanAssert.assertIs(url, spanTestCase);
+ private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+
+ @Override
+ public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
+ return
IntegrationTestCasesLoader.getInstance().loadIntegrationTestCases().stream().map(Arguments::of);
+ }
}
}
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 e86c1fa1245..c62d23de4a4 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,45 +17,34 @@
package org.apache.shardingsphere.test.e2e.agent.zipkin;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
+import
org.apache.shardingsphere.test.e2e.agent.common.AgentTestActionExtension;
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.IntegrationTestCasesLoader;
import org.apache.shardingsphere.test.e2e.agent.zipkin.cases.SpanTestCase;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+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.Collection;
-import java.util.Properties;
+import java.util.stream.Stream;
-@RunWith(Parameterized.class)
-@RequiredArgsConstructor
-public final class ZipkinPluginE2EIT extends BasePluginE2EIT {
+@ExtendWith(AgentTestActionExtension.class)
+public final class ZipkinPluginE2EIT {
- private final SpanTestCase spanTestCase;
-
- private Properties props;
-
- private String url;
-
- @Parameters
- public static Collection<SpanTestCase> getTestParameters() {
- return
IntegrationTestCasesLoader.getInstance().loadIntegrationTestCases();
- }
-
- @Before
- public void before() {
- props = E2ETestEnvironment.getInstance().getProps();
- url = props.getProperty("zipkin.url");
+ @ParameterizedTest
+ @ArgumentsSource(TestCaseArgumentsProvider.class)
+ public void assertProxyWithAgent(final SpanTestCase spanTestCase) {
+
SpanAssert.assertIs(E2ETestEnvironment.getInstance().getProps().getProperty("zipkin.url"),
spanTestCase);
}
- @Test
- public void assertProxyWithAgent() {
- super.assertProxyWithAgent();
- SpanAssert.assertIs(url, spanTestCase);
+ private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
+
+ @Override
+ public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
+ return
IntegrationTestCasesLoader.getInstance().loadIntegrationTestCases().stream().map(Arguments::of);
+ }
}
}
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
index 2e8896a9b27..747e563d7a9 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/SetReadOnlyTestCase.java
@@ -45,7 +45,7 @@ public abstract class SetReadOnlyTestCase extends
BaseTransactionTestCase {
ResultSet resultSet = executeQueryWithLog(connection, "select *
from account where id = 2");
assertTrue(resultSet.next());
int balanceResult = resultSet.getInt("balance");
- assertThat(String.format("Balance is %s, should be 101.",
balanceResult), balanceResult, is(101));
+ assertThat(String.format("Balance is %s, should be 101.",
balanceResult), balanceResult, is(101));
}
}
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index c13bf821c4b..77ce02cd81f 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -199,7 +199,7 @@ public abstract class TransactionBaseE2EIT {
return;
}
String alterLocalTransactionRule =
commonSQL.getAlterLocalTransactionRule();
- executeWithLog(connection, alterLocalTransactionRule);
+ executeWithLog(connection, alterLocalTransactionRule);
}
assertTrue(waitExpectedTransactionRule(TransactionType.LOCAL, "",
containerComposer));
}
