You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/12/04 15:23:26 UTC
[shardingsphere] branch master updated: Remove DropRuleStatementTestCase (#22646)
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 cf937e01a90 Remove DropRuleStatementTestCase (#22646)
cf937e01a90 is described below
commit cf937e01a904f1f729e403c5ef792a8a73dc4b12
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Dec 4 23:23:20 2022 +0800
Remove DropRuleStatementTestCase (#22646)
* Move parser internal test packages
* Remove DropRuleStatementTestCase
* Rename package name of agent test
---
.../e2e/agent/common/BasePluginE2EIT.java} | 14 ++++-----
.../e2e/agent}/common/entity/OrderEntity.java | 2 +-
.../e2e/agent/common/env/E2ETestEnvironment.java} | 10 +++----
.../agent}/common/env/EnvironmentProperties.java | 2 +-
.../e2e/agent}/common/util/JDBCAgentTestUtils.java | 4 +--
.../e2e/agent}/common/util/OkHttpUtils.java | 2 +-
.../e2e/agent/jaeger/JaegerPluginE2EIT.java} | 6 ++--
.../e2e/agent/metrics/MetricsPluginE2EIT.java} | 14 ++++-----
.../e2e/agent}/metrics/result/MetricResult.java | 2 +-
.../opentelemetry/OpenTelemetryPluginE2EIT.java} | 14 ++++-----
.../agent}/opentelemetry/result/TracingResult.java | 2 +-
.../e2e/agent/zipkin/ZipkinPluginE2EIT.java} | 6 ++--
.../impl/LocalFileTestParameterLoadStrategy.java | 3 +-
.../jaxb/statement/DropRuleStatementTestCase.java | 34 ----------------------
...ropReadwriteSplittingRuleStatementTestCase.java | 10 +++++--
.../DropBroadcastTableRuleStatementTestCase.java | 10 +++++--
...opDefaultShardingStrategyStatementTestCase.java | 7 +++--
.../DropShardingAlgorithmStatementTestCase.java | 10 +++++--
.../DropShardingAuditorStatementTestCase.java | 10 +++++--
.../DropShardingKeyGeneratorStatementTestCase.java | 10 +++++--
...hardingTableReferenceRuleStatementTestCase.java | 10 +++++--
.../DropShardingTableRuleStatementTestCase.java | 10 +++++--
22 files changed, 101 insertions(+), 91 deletions(-)
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/BasePluginIT.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
similarity index 77%
rename from test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/BasePluginIT.java
rename to test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
index 6083265dcc6..c7c6a1912c0 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/BasePluginIT.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/BasePluginE2EIT.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.common;
+package org.apache.shardingsphere.test.e2e.agent.common;
-import org.apache.shardingsphere.integration.agent.test.common.entity.OrderEntity;
-import org.apache.shardingsphere.integration.agent.test.common.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.integration.agent.test.common.util.JDBCAgentTestUtils;
+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;
@@ -34,16 +34,16 @@ import static org.hamcrest.CoreMatchers.is;
/**
* Basic integration test.
*/
-public abstract class BasePluginIT {
+public abstract class BasePluginE2EIT {
@Before
public void check() {
- Assume.assumeThat(IntegrationTestEnvironment.getInstance().isEnvironmentPrepared(), is(true));
+ Assume.assumeThat(E2ETestEnvironment.getInstance().isEnvironmentPrepared(), is(true));
}
@Test
public void assertProxyWithAgent() throws IOException {
- DataSource dataSource = IntegrationTestEnvironment.getInstance().getDataSource();
+ DataSource dataSource = E2ETestEnvironment.getInstance().getDataSource();
List<Long> results = new ArrayList<>(10);
for (int i = 1; i <= 10; i++) {
OrderEntity orderEntity = new OrderEntity(i, i, "INSERT_TEST");
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/entity/OrderEntity.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/entity/OrderEntity.java
similarity index 93%
rename from test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/entity/OrderEntity.java
rename to test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/entity/OrderEntity.java
index 2bda81edd6d..74a5ec2d4c9 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/entity/OrderEntity.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/entity/OrderEntity.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.common.entity;
+package org.apache.shardingsphere.test.e2e.agent.common.entity;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/env/IntegrationTestEnvironment.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
similarity index 91%
rename from test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/env/IntegrationTestEnvironment.java
rename to test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
index b3be9dc86db..343875957d2 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/env/IntegrationTestEnvironment.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/E2ETestEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.common.env;
+package org.apache.shardingsphere.test.e2e.agent.common.env;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
@@ -31,9 +31,9 @@ import java.util.Properties;
@Getter
@Slf4j
-public final class IntegrationTestEnvironment {
+public final class E2ETestEnvironment {
- private static final IntegrationTestEnvironment INSTANCE = new IntegrationTestEnvironment();
+ private static final E2ETestEnvironment INSTANCE = new E2ETestEnvironment();
private final Properties props;
@@ -41,7 +41,7 @@ public final class IntegrationTestEnvironment {
private DataSource dataSource;
- private IntegrationTestEnvironment() {
+ private E2ETestEnvironment() {
props = EnvironmentProperties.loadProperties("env/engine-env.properties");
isEnvironmentPrepared = props.getProperty("it.env.value").equals(props.getProperty("it.env.type"));
if (isEnvironmentPrepared) {
@@ -93,7 +93,7 @@ public final class IntegrationTestEnvironment {
*
* @return singleton instance
*/
- public static IntegrationTestEnvironment getInstance() {
+ public static E2ETestEnvironment getInstance() {
return INSTANCE;
}
}
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/env/EnvironmentProperties.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/EnvironmentProperties.java
similarity index 96%
rename from test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/env/EnvironmentProperties.java
rename to test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/EnvironmentProperties.java
index 04f2760bbf6..ea2c6c42879 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/env/EnvironmentProperties.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/env/EnvironmentProperties.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.common.env;
+package org.apache.shardingsphere.test.e2e.agent.common.env;
import java.io.IOException;
import java.io.InputStream;
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JDBCAgentTestUtils.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/util/JDBCAgentTestUtils.java
similarity index 97%
rename from test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JDBCAgentTestUtils.java
rename to test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/util/JDBCAgentTestUtils.java
index 6a0f3b87cc4..1afc619e525 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/JDBCAgentTestUtils.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/util/JDBCAgentTestUtils.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.common.util;
+package org.apache.shardingsphere.test.e2e.agent.common.util;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.integration.agent.test.common.entity.OrderEntity;
+import org.apache.shardingsphere.test.e2e.agent.common.entity.OrderEntity;
import javax.sql.DataSource;
import java.sql.Connection;
diff --git a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/util/OkHttpUtils.java
similarity index 97%
rename from test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java
rename to test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/util/OkHttpUtils.java
index cc1991aca54..dafced616d5 100644
--- a/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/integration/agent/test/common/util/OkHttpUtils.java
+++ b/test/e2e/agent/plugins/common/src/test/java/org/apache/shardingsphere/test/e2e/agent/common/util/OkHttpUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.common.util;
+package org.apache.shardingsphere.test.e2e.agent.common.util;
import com.google.gson.Gson;
import okhttp3.OkHttpClient;
diff --git a/test/e2e/agent/plugins/jaeger/src/test/java/org/apache/shardingsphere/integration/agent/test/jaeger/JaegerPluginIT.java b/test/e2e/agent/plugins/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
similarity index 83%
rename from test/e2e/agent/plugins/jaeger/src/test/java/org/apache/shardingsphere/integration/agent/test/jaeger/JaegerPluginIT.java
rename to test/e2e/agent/plugins/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
index 235be0065ac..4e77620b2ff 100644
--- a/test/e2e/agent/plugins/jaeger/src/test/java/org/apache/shardingsphere/integration/agent/test/jaeger/JaegerPluginIT.java
+++ b/test/e2e/agent/plugins/jaeger/src/test/java/org/apache/shardingsphere/test/e2e/agent/jaeger/JaegerPluginE2EIT.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.jaeger;
+package org.apache.shardingsphere.test.e2e.agent.jaeger;
-import org.apache.shardingsphere.integration.agent.test.common.BasePluginIT;
+import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
-public final class JaegerPluginIT extends BasePluginIT {
+public final class JaegerPluginE2EIT extends BasePluginE2EIT {
@Test
@Ignore
diff --git a/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java b/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
similarity index 87%
rename from test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java
rename to test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
index 9618667915b..ddb4317a31a 100644
--- a/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/MetricsPluginIT.java
+++ b/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/MetricsPluginE2EIT.java
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.metrics;
+package org.apache.shardingsphere.test.e2e.agent.metrics;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.integration.agent.test.common.BasePluginIT;
-import org.apache.shardingsphere.integration.agent.test.common.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.integration.agent.test.common.util.OkHttpUtils;
-import org.apache.shardingsphere.integration.agent.test.metrics.result.MetricResult;
+import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
+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.result.MetricResult;
import org.junit.Test;
import java.io.IOException;
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull;
import static org.hamcrest.MatcherAssert.assertThat;
@Slf4j
-public final class MetricsPluginIT extends BasePluginIT {
+public final class MetricsPluginE2EIT extends BasePluginE2EIT {
public static final String PROXY_REQUEST = "proxy_request_total";
@@ -63,7 +63,7 @@ public final class MetricsPluginIT extends BasePluginIT {
@Test
public void assertProxyWithAgent() throws IOException {
super.assertProxyWithAgent();
- Properties props = IntegrationTestEnvironment.getInstance().getProps();
+ Properties props = E2ETestEnvironment.getInstance().getProps();
try {
Thread.sleep(Long.parseLong(props.getProperty("prometheus.waitMs", "60000")));
} catch (final InterruptedException ignore) {
diff --git a/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java b/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/result/MetricResult.java
similarity index 94%
rename from test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java
rename to test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/result/MetricResult.java
index 42f62975bc6..29001729d5a 100644
--- a/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/integration/agent/test/metrics/result/MetricResult.java
+++ b/test/e2e/agent/plugins/metrics/src/test/java/org/apache/shardingsphere/test/e2e/agent/metrics/result/MetricResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.metrics.result;
+package org.apache.shardingsphere.test.e2e.agent.metrics.result;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java b/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/test/e2e/agent/opentelemetry/OpenTelemetryPluginE2EIT.java
similarity index 88%
rename from test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java
rename to test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/test/e2e/agent/opentelemetry/OpenTelemetryPluginE2EIT.java
index 1fd72e9cf54..79b654d40ad 100644
--- a/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/OpenTelemetryPluginIT.java
+++ b/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/test/e2e/agent/opentelemetry/OpenTelemetryPluginE2EIT.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.opentelemetry;
+package org.apache.shardingsphere.test.e2e.agent.opentelemetry;
import com.google.gson.Gson;
import com.google.gson.JsonArray;
import com.google.gson.JsonParser;
-import org.apache.shardingsphere.integration.agent.test.common.BasePluginIT;
-import org.apache.shardingsphere.integration.agent.test.common.env.IntegrationTestEnvironment;
-import org.apache.shardingsphere.integration.agent.test.common.util.OkHttpUtils;
-import org.apache.shardingsphere.integration.agent.test.opentelemetry.result.TracingResult;
+import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
+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.opentelemetry.result.TracingResult;
import org.junit.Test;
import java.io.IOException;
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertNotNull;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.fail;
-public final class OpenTelemetryPluginIT extends BasePluginIT {
+public final class OpenTelemetryPluginE2EIT extends BasePluginE2EIT {
private static final String ROOT_INVOKE = "/shardingsphere/rootinvoke/";
@@ -48,7 +48,7 @@ public final class OpenTelemetryPluginIT extends BasePluginIT {
@Test
public void assertProxyWithAgent() throws IOException {
super.assertProxyWithAgent();
- Properties props = IntegrationTestEnvironment.getInstance().getProps();
+ Properties props = E2ETestEnvironment.getInstance().getProps();
try {
Thread.sleep(Long.parseLong(props.getProperty("opentelemetry.waitMs", "60000")));
} catch (final InterruptedException ignore) {
diff --git a/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java b/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/test/e2e/agent/opentelemetry/result/TracingResult.java
similarity index 93%
rename from test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java
rename to test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/test/e2e/agent/opentelemetry/result/TracingResult.java
index fbeb0631780..1c17c4ce811 100644
--- a/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/integration/agent/test/opentelemetry/result/TracingResult.java
+++ b/test/e2e/agent/plugins/opentelemetry/src/test/java/org/apache/shardingsphere/test/e2e/agent/opentelemetry/result/TracingResult.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.opentelemetry.result;
+package org.apache.shardingsphere.test.e2e.agent.opentelemetry.result;
import lombok.Getter;
import lombok.Setter;
diff --git a/test/e2e/agent/plugins/zipkin/src/test/java/org/apache/shardingsphere/integration/agent/test/zipkin/ZipkinPluginIT.java b/test/e2e/agent/plugins/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
similarity index 83%
rename from test/e2e/agent/plugins/zipkin/src/test/java/org/apache/shardingsphere/integration/agent/test/zipkin/ZipkinPluginIT.java
rename to test/e2e/agent/plugins/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
index 19234b94da3..2891e4e8e6b 100644
--- a/test/e2e/agent/plugins/zipkin/src/test/java/org/apache/shardingsphere/integration/agent/test/zipkin/ZipkinPluginIT.java
+++ b/test/e2e/agent/plugins/zipkin/src/test/java/org/apache/shardingsphere/test/e2e/agent/zipkin/ZipkinPluginE2EIT.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.integration.agent.test.zipkin;
+package org.apache.shardingsphere.test.e2e.agent.zipkin;
-import org.apache.shardingsphere.integration.agent.test.common.BasePluginIT;
+import org.apache.shardingsphere.test.e2e.agent.common.BasePluginE2EIT;
import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
-public final class ZipkinPluginIT extends BasePluginIT {
+public final class ZipkinPluginE2EIT extends BasePluginE2EIT {
@Test
@Ignore
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
index a6e87924119..0f05d118292 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
@@ -39,8 +39,7 @@ public final class LocalFileTestParameterLoadStrategy implements TestParameterLo
public Collection<FileSummary> loadSQLCaseFileSummaries(final URI uri) {
final Collection<FileSummary> result = new LinkedList<>();
try (Stream<Path> stream = Files.walk(Paths.get(uri))) {
- stream.filter(each -> each.toString().endsWith(".sql"))
- .forEach(each -> result.add(new FileSummary(each.getFileName().toString(), each.toUri().toString())));
+ stream.filter(each -> each.toString().endsWith(".sql")).forEach(each -> result.add(new FileSummary(each.getFileName().toString(), each.toUri().toString())));
}
return result;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/DropRuleStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/DropRuleStatementTestCase.java
deleted file mode 100644
index ed804760ffc..00000000000
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/DropRuleStatementTestCase.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-@Getter
-@Setter
-@XmlType(name = "distsql")
-public abstract class DropRuleStatementTestCase extends SQLParserTestCase {
-
- @XmlAttribute(name = "if-exists")
- private boolean ifExists;
-}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/readwritesplitting/DropReadwriteSplittingRuleStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/readwritesplitting/DropReadwriteSplittingRuleStatementTestCase.java
index 78907c74ec2..2e94c59f941 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/readwritesplitting/DropReadwriteSplittingRuleStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/readwritesplitting/DropReadwriteSplittingRuleStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.readwritesplitting;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop readwrite-splitting rule statement test case.
*/
@Getter
-public final class DropReadwriteSplittingRuleStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropReadwriteSplittingRuleStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "name")
private final List<String> names = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropBroadcastTableRuleStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropBroadcastTableRuleStatementTestCase.java
index 6b5188b8931..e0d00d8d4a9 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropBroadcastTableRuleStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropBroadcastTableRuleStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop broadcast table rule statement test cast.
*/
@Getter
-public final class DropBroadcastTableRuleStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropBroadcastTableRuleStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "table")
private final List<String> tables = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropDefaultShardingStrategyStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropDefaultShardingStrategyStatementTestCase.java
index 9ecb871ca4b..b07c48b8be3 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropDefaultShardingStrategyStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropDefaultShardingStrategyStatementTestCase.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.
import lombok.Getter;
import lombok.Setter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
import javax.xml.bind.annotation.XmlAttribute;
@@ -28,8 +28,11 @@ import javax.xml.bind.annotation.XmlAttribute;
*/
@Getter
@Setter
-public final class DropDefaultShardingStrategyStatementTestCase extends DropRuleStatementTestCase {
+public final class DropDefaultShardingStrategyStatementTestCase extends SQLParserTestCase {
@XmlAttribute(name = "type")
private String defaultType;
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAlgorithmStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAlgorithmStatementTestCase.java
index 137ee68d08b..d660305f517 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAlgorithmStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAlgorithmStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop sharding algorithm statement test case.
*/
@Getter
-public final class DropShardingAlgorithmStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropShardingAlgorithmStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "name")
private final List<String> names = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAuditorStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAuditorStatementTestCase.java
index 0044a49cd78..a1edfe84014 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAuditorStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingAuditorStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop sharding auditor statement test case.
*/
@Getter
-public final class DropShardingAuditorStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropShardingAuditorStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "name")
private final List<String> names = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingKeyGeneratorStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingKeyGeneratorStatementTestCase.java
index c0269288cc0..d2fa23403fb 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingKeyGeneratorStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingKeyGeneratorStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop sharding key generator statement test case.
*/
@Getter
-public final class DropShardingKeyGeneratorStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropShardingKeyGeneratorStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "name")
private final List<String> names = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableReferenceRuleStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableReferenceRuleStatementTestCase.java
index c7cb9f553d2..a7a34abbef9 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableReferenceRuleStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableReferenceRuleStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop sharding table reference rule statement test case.
*/
@Getter
-public final class DropShardingTableReferenceRuleStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropShardingTableReferenceRuleStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "name")
private final List<String> names = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}
diff --git a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableRuleStatementTestCase.java b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableRuleStatementTestCase.java
index 65f2ca47b92..0d2993e12c0 100644
--- a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableRuleStatementTestCase.java
+++ b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/statement/rdl/rule/sharding/DropShardingTableRuleStatementTestCase.java
@@ -18,8 +18,10 @@
package org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.rdl.rule.sharding;
import lombok.Getter;
-import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.statement.DropRuleStatementTestCase;
+import lombok.Setter;
+import org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.SQLParserTestCase;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import java.util.LinkedList;
import java.util.List;
@@ -28,8 +30,12 @@ import java.util.List;
* Drop sharding table rule statement test case.
*/
@Getter
-public final class DropShardingTableRuleStatementTestCase extends DropRuleStatementTestCase {
+@Setter
+public final class DropShardingTableRuleStatementTestCase extends SQLParserTestCase {
@XmlElement(name = "table")
private final List<String> tables = new LinkedList<>();
+
+ @XmlAttribute(name = "if-exists")
+ private boolean ifExists;
}