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 729dbdfcf7f Rename AgentE2ETestEnvironment (#32199)
729dbdfcf7f is described below
commit 729dbdfcf7f8faf2aa016e590e17913e4ca7ba82
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jul 20 17:07:12 2024 +0800
Rename AgentE2ETestEnvironment (#32199)
* Rename AgentE2ETestEnvironment
* Refactor AgentTestJDBCRepository
* Rename package of fixture.executor
---
.../test/e2e/agent/common/AgentTestActionExtension.java | 6 +++---
...E2ETestEnvironment.java => AgentE2ETestEnvironment.java} | 12 ++++++------
.../test/e2e/agent/common/fixture/entity/OrderEntity.java | 3 +++
.../fixture/{request => executor}/ProxyRequestExecutor.java | 13 ++++++-------
.../common/fixture/repository/AgentTestJDBCRepository.java | 8 ++++----
.../shardingsphere/test/e2e/agent/file/FilePluginE2EIT.java | 10 +++++-----
.../test/e2e/agent/file/cases/LogTestCase.java | 4 ++--
.../test/e2e/agent/metrics/MetricsPluginE2EIT.java | 10 +++++-----
.../test/e2e/agent/metrics/cases/MetricTestCase.java | 4 ++--
.../test/e2e/agent/jaeger/JaegerPluginE2EIT.java | 8 ++++----
.../test/e2e/agent/jaeger/cases/SpanTestCase.java | 4 ++--
.../test/e2e/agent/zipkin/ZipkinPluginE2EIT.java | 8 ++++----
.../test/e2e/agent/zipkin/cases/SpanTestCase.java | 4 ++--
13 files changed, 48 insertions(+), 46 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 5ce644857a1..acf393f6866 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
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.agent.common;
-import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
+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;
@@ -29,11 +29,11 @@ public final class AgentTestActionExtension implements
BeforeAllCallback, AfterA
@Override
public void beforeAll(final ExtensionContext extensionContext) {
- E2ETestEnvironment.getInstance().init();
+ AgentE2ETestEnvironment.getInstance().init();
}
@Override
public void afterAll(final ExtensionContext extensionContext) {
- E2ETestEnvironment.getInstance().destroy();
+ AgentE2ETestEnvironment.getInstance().destroy();
}
}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
similarity index 96%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
index a754694939c..4eac97803ef 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/AgentE2ETestEnvironment.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.test.e2e.agent.common.container.ShardingSphereP
import
org.apache.shardingsphere.test.e2e.agent.common.container.ZipkinContainer;
import org.apache.shardingsphere.test.e2e.agent.common.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.agent.common.enums.PluginType;
-import
org.apache.shardingsphere.test.e2e.agent.common.fixture.request.ProxyRequestExecutor;
+import
org.apache.shardingsphere.test.e2e.agent.common.fixture.executor.ProxyRequestExecutor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
@@ -45,12 +45,12 @@ import java.util.Properties;
import java.util.concurrent.TimeUnit;
/**
- * E2E test environment.
+ * Agent E2E test environment.
*/
@Slf4j
-public final class E2ETestEnvironment {
+public final class AgentE2ETestEnvironment {
- private static final E2ETestEnvironment INSTANCE = new
E2ETestEnvironment();
+ private static final AgentE2ETestEnvironment INSTANCE = new
AgentE2ETestEnvironment();
@Getter
private final Collection<String> actualLogs = new LinkedList<>();
@@ -96,7 +96,7 @@ public final class E2ETestEnvironment {
private String jdbcProjectImage;
- private E2ETestEnvironment() {
+ private AgentE2ETestEnvironment() {
initContainerImage();
Properties props =
EnvironmentProperties.loadProperties("env/engine-env.properties");
adapter = props.getProperty("it.env.adapter");
@@ -119,7 +119,7 @@ public final class E2ETestEnvironment {
*
* @return singleton instance
*/
- public static E2ETestEnvironment getInstance() {
+ public static AgentE2ETestEnvironment getInstance() {
return INSTANCE;
}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/entity/OrderEntity.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/entity/OrderEntity.java
index d4109db38db..59fe595c09d 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/entity/OrderEntity.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/entity/OrderEntity.java
@@ -20,6 +20,9 @@ package
org.apache.shardingsphere.test.e2e.agent.common.fixture.entity;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
+/**
+ * Order entity.
+ */
@RequiredArgsConstructor
@Getter
public final class OrderEntity {
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/request/ProxyRequestExecutor.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/executor/ProxyRequestExecutor.java
similarity index 93%
rename from
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/request/ProxyRequestExecutor.java
rename to
test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/executor/ProxyRequestExecutor.java
index 6ae84d9a6c4..d801ed873df 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/request/ProxyRequestExecutor.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/executor/ProxyRequestExecutor.java
@@ -15,8 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.e2e.agent.common.fixture.request;
+package org.apache.shardingsphere.test.e2e.agent.common.fixture.executor;
+import lombok.SneakyThrows;
import
org.apache.shardingsphere.test.e2e.agent.common.fixture.repository.AgentTestJDBCRepository;
import
org.apache.shardingsphere.test.e2e.agent.common.fixture.entity.OrderEntity;
import org.testcontainers.shaded.org.awaitility.Awaitility;
@@ -53,11 +54,9 @@ public final class ProxyRequestExecutor implements Runnable {
/**
* Stop.
*/
+ @SneakyThrows(SecurityException.class)
public void stop() {
- try {
- executor.shutdownNow();
- } catch (final SecurityException ignored) {
- }
+ executor.shutdownNow();
}
@Override
@@ -78,10 +77,10 @@ public final class ProxyRequestExecutor implements Runnable
{
OrderEntity orderEntity = new OrderEntity(1000L, 1000, "ROLL_BACK");
repository.insertOrderAndRollback(orderEntity);
repository.updateOrder(orderEntity);
- repository.selectAllOrders();
+ repository.queryAllOrders();
for (Long each : results) {
repository.deleteOrder(each);
}
- repository.createExecuteError();
+ repository.queryFailed();
}
}
diff --git
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/repository/AgentTestJDBCRepository.java
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/repository/AgentTestJDBCRepository.java
index 35230fe6f40..72df329758e 100644
---
a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/repository/AgentTestJDBCRepository.java
+++
b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/fixture/repository/AgentTestJDBCRepository.java
@@ -105,12 +105,12 @@ public final class AgentTestJDBCRepository {
}
/**
- * Select all orders.
+ * Query all orders.
*
* @return all orders
*/
@SneakyThrows(SQLException.class)
- public Collection<OrderEntity> selectAllOrders() {
+ public Collection<OrderEntity> queryAllOrders() {
String sql = "SELECT * FROM t_order";
Collection<OrderEntity> result = new LinkedList<>();
try (
@@ -124,10 +124,10 @@ public final class AgentTestJDBCRepository {
}
/**
- * Create execute error.
+ * Query failed.
*/
@SneakyThrows(SQLException.class)
- public void createExecuteError() {
+ public void queryFailed() {
String sql = "SELECT * FROM non_existent_table";
try (Statement statement = connection.createStatement()) {
statement.executeQuery(sql);
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 a797aa0cc67..4705e9429b7 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
@@ -19,7 +19,7 @@ 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.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
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;
@@ -42,19 +42,19 @@ class FilePluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final LogTestCase testCase) {
-
assertFalse(E2ETestEnvironment.getInstance().getActualLogs().isEmpty(), "The
actual log is empty");
-
ContentAssert.assertIs(E2ETestEnvironment.getInstance().getActualLogs(),
testCase.getLogRegex());
+
assertFalse(AgentE2ETestEnvironment.getInstance().getActualLogs().isEmpty(),
"The actual log is empty");
+
ContentAssert.assertIs(AgentE2ETestEnvironment.getInstance().getActualLogs(),
testCase.getLogRegex());
}
private static boolean isEnabled() {
- return E2ETestEnvironment.getInstance().containsTestParameter();
+ return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(LogE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(LogE2ETestCases.class).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/cases/LogTestCase.java
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogTestCase.java
index d21de04e347..1ec5a172d34 100644
---
a/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogTestCase.java
+++
b/test/e2e/agent/plugins/logging/file/src/test/java/org/apache/shardingsphere/test/e2e/agent/file/cases/LogTestCase.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.agent.file.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -39,6 +39,6 @@ public final class LogTestCase implements AgentE2ETestCase {
@Override
public String toString() {
- return String.format("%s -> `%s`",
E2ETestEnvironment.getInstance().getAdapter(), logRegex);
+ return String.format("%s -> `%s`",
AgentE2ETestEnvironment.getInstance().getAdapter(), logRegex);
}
}
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 30fa26f38f2..1fc7ad9ed5a 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
@@ -21,7 +21,7 @@ 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.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
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;
@@ -50,8 +50,8 @@ class MetricsPluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final MetricTestCase metricTestCase) {
- String metaDataURL =
E2ETestEnvironment.getInstance().getPrometheusHttpUrl() + "/api/v1/metadata";
- String queryURL =
E2ETestEnvironment.getInstance().getPrometheusHttpUrl() + "/api/v1/query";
+ String metaDataURL =
AgentE2ETestEnvironment.getInstance().getPrometheusHttpUrl() +
"/api/v1/metadata";
+ String queryURL =
AgentE2ETestEnvironment.getInstance().getPrometheusHttpUrl() + "/api/v1/query";
assertMetadata(metaDataURL, metricTestCase);
assertQuery(queryURL, metricTestCase);
}
@@ -80,14 +80,14 @@ class MetricsPluginE2EIT {
}
private static boolean isEnabled() {
- return E2ETestEnvironment.getInstance().containsTestParameter();
+ return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(MetricE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(MetricE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.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/MetricTestCase.java
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricTestCase.java
index 43d44e0a705..725a2752487 100644
---
a/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricTestCase.java
+++
b/test/e2e/agent/plugins/metrics/prometheus/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/cases/MetricTestCase.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.agent.metrics.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -48,6 +48,6 @@ public final class MetricTestCase implements AgentE2ETestCase
{
@Override
public String toString() {
- return String.format("%s -> %s",
E2ETestEnvironment.getInstance().getAdapter(), metricName);
+ return String.format("%s -> %s",
AgentE2ETestEnvironment.getInstance().getAdapter(), metricName);
}
}
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 20f1b1c5da6..4f2ab4fcbfc 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
@@ -19,7 +19,7 @@ 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.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
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;
@@ -40,18 +40,18 @@ class JaegerPluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final SpanTestCase spanTestCase) {
-
SpanAssert.assertIs(E2ETestEnvironment.getInstance().getJaegerHttpUrl(),
spanTestCase);
+
SpanAssert.assertIs(AgentE2ETestEnvironment.getInstance().getJaegerHttpUrl(),
spanTestCase);
}
private static boolean isEnabled() {
- return E2ETestEnvironment.getInstance().containsTestParameter();
+ return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(JaegerE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(JaegerE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.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/SpanTestCase.java
b/test/e2e/agent/plugins/tracing/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/cases/SpanTestCase.java
index cd6598caf0e..8273c3895bb 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.agent.jaeger.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -47,6 +47,6 @@ public final class SpanTestCase implements AgentE2ETestCase {
@Override
public String toString() {
- return String.format("%s -> %s -> %s",
E2ETestEnvironment.getInstance().getAdapter(), spanName,
tagCases.iterator().next().toString());
+ return String.format("%s -> %s -> %s",
AgentE2ETestEnvironment.getInstance().getAdapter(), spanName,
tagCases.iterator().next().toString());
}
}
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 71c180a4b18..8be01da677a 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
@@ -19,7 +19,7 @@ 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.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
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;
@@ -40,18 +40,18 @@ class ZipkinPluginE2EIT {
@ParameterizedTest
@ArgumentsSource(TestCaseArgumentsProvider.class)
void assertWithAgent(final SpanTestCase spanTestCase) {
-
SpanAssert.assertIs(E2ETestEnvironment.getInstance().getZipKinHttpUrl(),
spanTestCase);
+
SpanAssert.assertIs(AgentE2ETestEnvironment.getInstance().getZipKinHttpUrl(),
spanTestCase);
}
private static boolean isEnabled() {
- return E2ETestEnvironment.getInstance().containsTestParameter();
+ return AgentE2ETestEnvironment.getInstance().containsTestParameter();
}
private static class TestCaseArgumentsProvider implements
ArgumentsProvider {
@Override
public Stream<? extends Arguments> provideArguments(final
ExtensionContext extensionContext) {
- return new
AgentE2ETestCasesLoader(ZipkinE2ETestCases.class).loadTestCases(E2ETestEnvironment.getInstance().getAdapter()).stream().map(Arguments::of);
+ return new
AgentE2ETestCasesLoader(ZipkinE2ETestCases.class).loadTestCases(AgentE2ETestEnvironment.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/SpanTestCase.java
b/test/e2e/agent/plugins/tracing/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/cases/SpanTestCase.java
index 30a12e06e6e..904cb12869a 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
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.test.e2e.agent.zipkin.cases;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.test.e2e.agent.common.cases.AgentE2ETestCase;
-import org.apache.shardingsphere.test.e2e.agent.common.env.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.agent.common.env.AgentE2ETestEnvironment;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -47,6 +47,6 @@ public final class SpanTestCase implements AgentE2ETestCase {
@Override
public String toString() {
- return String.format("%s -> %s -> %s",
E2ETestEnvironment.getInstance().getAdapter(), spanName,
tagCases.iterator().next().toString());
+ return String.format("%s -> %s -> %s",
AgentE2ETestEnvironment.getInstance().getAdapter(), spanName,
tagCases.iterator().next().toString());
}
}
