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 b3190dbc637 Move TestParameterLoader to shardingsphere-test-it-parser
module (#36232)
b3190dbc637 is described below
commit b3190dbc637daa97ca07322c3343190fbf667074
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun Aug 10 13:38:01 2025 +0800
Move TestParameterLoader to shardingsphere-test-it-parser module (#36232)
* Move TestParameterLoader to shardingsphere-test-it-parser module
* Move TestParameterLoader to shardingsphere-test-it-parser module
---
.../sql/parser/it/mysql/external/ExternalMySQLParserIT.java | 3 +--
.../external}/MySQLExternalTestParameterLoadTemplate.java | 6 +++++-
.../it/postgresql/external/ExternalPostgreSQLParserIT.java | 4 ++--
.../sql/parser/it/presto/external/ExternalPrestoParserIT.java | 4 ++--
test/it/parser/pom.xml | 11 ++++-------
.../sql/parser/{loader => external}/ExternalCaseSettings.java | 4 ++--
.../test/it/sql/parser/external/ExternalSQLParserIT.java | 10 ++++------
.../it/sql/parser/external}/ExternalSQLTestParameter.java | 2 +-
.../test/it/sql/parser/external}/env/EnvironmentContext.java | 2 +-
.../test/it/sql/parser/external}/loader/SQLLineComment.java | 2 +-
.../it/sql/parser/external}/loader/TestParameterLoader.java | 10 ++++++----
.../external}/loader/strategy/TestParameterLoadStrategy.java | 4 ++--
.../loader/strategy/impl/GitHubTestParameterLoadStrategy.java | 8 ++++----
.../external}/loader/summary/AssertableFileSummary.java | 2 +-
.../it/sql/parser/external}/loader/summary/FileSummary.java | 2 +-
.../external/loader/template}/TestParameterLoadTemplate.java | 4 +++-
.../OneCasePerFileExternalTestParameterLoadTemplate.java | 9 +++++----
.../type}/PrestoExternalTestParameterLoadTemplate.java | 6 +++---
.../type}/StandardExternalTestParameterLoadTemplate.java | 8 ++++----
.../{util => it/parser}/src/main/resources/env/env.properties | 0
test/util/pom.xml | 4 ----
21 files changed, 52 insertions(+), 53 deletions(-)
diff --git
a/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
b/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
index bb5abec91b5..96cba61ca30 100644
---
a/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
+++
b/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java
@@ -17,9 +17,8 @@
package org.apache.shardingsphere.test.it.sql.parser.it.mysql.external;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalCaseSettings;
import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
-import
org.apache.shardingsphere.test.loader.MySQLExternalTestParameterLoadTemplate;
@ExternalCaseSettings(value = "MySQL", caseURL =
ExternalMySQLParserIT.CASE_URL, resultURL = ExternalMySQLParserIT.RESULT_URL,
template = MySQLExternalTestParameterLoadTemplate.class)
class ExternalMySQLParserIT extends ExternalSQLParserIT {
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/MySQLExternalTestParameterLoadTemplate.java
b/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/MySQLExternalTestParameterLoadTemplate.java
similarity index 92%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/MySQLExternalTestParameterLoadTemplate.java
rename to
parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/MySQLExternalTestParameterLoadTemplate.java
index a4ee133f331..66b4bc90459 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/MySQLExternalTestParameterLoadTemplate.java
+++
b/parser/sql/dialect/mysql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/mysql/external/MySQLExternalTestParameterLoadTemplate.java
@@ -15,7 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.it.mysql.external;
+
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.SQLLineComment;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/parser/sql/dialect/postgresql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/postgresql/external/ExternalPostgreSQLParserIT.java
b/parser/sql/dialect/postgresql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/postgresql/external/ExternalPostgreSQLParserIT.java
index a3e0dbd070c..3843498816a 100644
---
a/parser/sql/dialect/postgresql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/postgresql/external/ExternalPostgreSQLParserIT.java
+++
b/parser/sql/dialect/postgresql/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/postgresql/external/ExternalPostgreSQLParserIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.it.sql.parser.it.postgresql.external;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalCaseSettings;
import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT;
-import
org.apache.shardingsphere.test.it.sql.parser.external.loader.StandardExternalTestParameterLoadTemplate;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type.StandardExternalTestParameterLoadTemplate;
@ExternalCaseSettings(value = "PostgreSQL", caseURL =
ExternalPostgreSQLParserIT.CASE_URL, resultURL =
ExternalPostgreSQLParserIT.RESULT_URL,
template = StandardExternalTestParameterLoadTemplate.class)
diff --git
a/parser/sql/dialect/presto/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/presto/external/ExternalPrestoParserIT.java
b/parser/sql/dialect/presto/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/presto/external/ExternalPrestoParserIT.java
index cf16887cd59..ee6a50f631c 100644
---
a/parser/sql/dialect/presto/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/presto/external/ExternalPrestoParserIT.java
+++
b/parser/sql/dialect/presto/src/test/java/org/apache/shardingsphere/test/it/sql/parser/it/presto/external/ExternalPrestoParserIT.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.it.sql.parser.it.presto.external;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalCaseSettings;
import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT;
-import
org.apache.shardingsphere.test.it.sql.parser.external.loader.PrestoExternalTestParameterLoadTemplate;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type.PrestoExternalTestParameterLoadTemplate;
@ExternalCaseSettings(value = "Presto", caseURL =
ExternalPrestoParserIT.CASE_URL, resultURL = "", template =
PrestoExternalTestParameterLoadTemplate.class)
class ExternalPrestoParserIT extends ExternalSQLParserIT {
diff --git a/test/it/parser/pom.xml b/test/it/parser/pom.xml
index dc85d562df6..d9d0b884555 100644
--- a/test/it/parser/pom.xml
+++ b/test/it/parser/pom.xml
@@ -128,13 +128,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test-util</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
@@ -170,5 +163,9 @@
<artifactId>commons-csv</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalCaseSettings.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java
similarity index 91%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalCaseSettings.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java
index 3bd3e8bfe97..59931c91f68 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalCaseSettings.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalCaseSettings.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader;
+package org.apache.shardingsphere.test.it.sql.parser.external;
-import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
index 6c6aae0f1eb..7422472cbd6 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLParserIT.java
@@ -25,14 +25,12 @@ import
org.apache.shardingsphere.sql.parser.api.SQLParserEngine;
import org.apache.shardingsphere.sql.parser.api.SQLStatementVisitorEngine;
import org.apache.shardingsphere.sql.parser.core.ParseASTNode;
import
org.apache.shardingsphere.test.it.sql.parser.external.env.SQLParserExternalITEnvironment;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.TestParameterLoader;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.TestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.impl.GitHubTestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import
org.apache.shardingsphere.test.it.sql.parser.external.result.SQLParseResultReporter;
import
org.apache.shardingsphere.test.it.sql.parser.external.result.SQLParseResultReporterCreator;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
-import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
-import org.apache.shardingsphere.test.loader.TestParameterLoader;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import
org.apache.shardingsphere.test.loader.strategy.impl.GitHubTestParameterLoadStrategy;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.junit.jupiter.api.parallel.Execution;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLTestParameter.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLTestParameter.java
similarity index 94%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLTestParameter.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLTestParameter.java
index f4d4ddb9e14..268af838158 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLTestParameter.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/ExternalSQLTestParameter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.external;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/env/EnvironmentContext.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/EnvironmentContext.java
similarity index 96%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/env/EnvironmentContext.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/EnvironmentContext.java
index 28054d28bd1..4e1d94c4785 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/env/EnvironmentContext.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/env/EnvironmentContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.env;
+package org.apache.shardingsphere.test.it.sql.parser.external.env;
import lombok.SneakyThrows;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/SQLLineComment.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/SQLLineComment.java
similarity index 95%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/SQLLineComment.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/SQLLineComment.java
index 9d720cebb2c..5745f11abdd 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/SQLLineComment.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/SQLLineComment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/TestParameterLoader.java
similarity index 89%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoader.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/TestParameterLoader.java
index daa27dcc5c7..6a37aa141bd 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/TestParameterLoader.java
@@ -15,16 +15,18 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader;
import com.google.common.base.Strings;
import com.google.common.io.Files;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shardingsphere.test.env.EnvironmentContext;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.external.env.EnvironmentContext;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.TestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import java.io.BufferedReader;
import java.io.IOException;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/TestParameterLoadStrategy.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/TestParameterLoadStrategy.java
similarity index 87%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/TestParameterLoadStrategy.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/TestParameterLoadStrategy.java
index 019bb3fd1bc..de6ed2b16fa 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/TestParameterLoadStrategy.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/TestParameterLoadStrategy.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader.strategy;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.summary.FileSummary;
import java.net.URI;
import java.util.Collection;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
similarity index 92%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
index f5c67fe46d7..1f8b5d9c5ef 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader.strategy.impl;
+package
org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.impl;
import com.google.common.base.Strings;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.test.env.EnvironmentContext;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.external.env.EnvironmentContext;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.strategy.TestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.summary.FileSummary;
import java.io.BufferedReader;
import java.io.IOException;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/AssertableFileSummary.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/summary/AssertableFileSummary.java
similarity index 93%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/AssertableFileSummary.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/summary/AssertableFileSummary.java
index c8425904dfb..4368d61f8e1 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/AssertableFileSummary.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/summary/AssertableFileSummary.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader.summary;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader.summary;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/FileSummary.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/summary/FileSummary.java
similarity index 93%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/FileSummary.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/summary/FileSummary.java
index b07a2a53273..9774f6fbfb2 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/FileSummary.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/summary/FileSummary.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader.summary;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader.summary;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoadTemplate.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/TestParameterLoadTemplate.java
similarity index 89%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoadTemplate.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/TestParameterLoadTemplate.java
index 7498e1757e9..065eaa4b279 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoadTemplate.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/TestParameterLoadTemplate.java
@@ -15,7 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.external.loader.template;
+
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
import java.util.Collection;
import java.util.List;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/OneCasePerFileExternalTestParameterLoadTemplate.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java
similarity index 85%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/OneCasePerFileExternalTestParameterLoadTemplate.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java
index af4fdade6ee..f9210a5c805 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/OneCasePerFileExternalTestParameterLoadTemplate.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/OneCasePerFileExternalTestParameterLoadTemplate.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.external.loader;
+package
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type;
-import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import java.util.Collection;
import java.util.Collections;
@@ -39,7 +39,8 @@ public final class
OneCasePerFileExternalTestParameterLoadTemplate implements Te
}
private void removePrefixedComments(final List<String> sqlCaseFileContent)
{
- for (Iterator<String> iterator = sqlCaseFileContent.iterator();
iterator.hasNext();) {
+ Iterator<String> iterator = sqlCaseFileContent.iterator();
+ while (iterator.hasNext()) {
if (!iterator.next().startsWith("--")) {
return;
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/PrestoExternalTestParameterLoadTemplate.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java
similarity index 93%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/PrestoExternalTestParameterLoadTemplate.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java
index 86aa5f1e78b..1091bc22ff6 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/PrestoExternalTestParameterLoadTemplate.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/PrestoExternalTestParameterLoadTemplate.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.external.loader;
+package
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type;
-import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import java.util.Collection;
import java.util.Collections;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/StandardExternalTestParameterLoadTemplate.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java
similarity index 92%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/StandardExternalTestParameterLoadTemplate.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java
index 19529b1d633..7c96224cc59 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/StandardExternalTestParameterLoadTemplate.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/template/type/StandardExternalTestParameterLoadTemplate.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.external.loader;
+package
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.type;
-import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
-import org.apache.shardingsphere.test.loader.SQLLineComment;
-import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.SQLLineComment;
+import
org.apache.shardingsphere.test.it.sql.parser.external.loader.template.TestParameterLoadTemplate;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/test/util/src/main/resources/env/env.properties
b/test/it/parser/src/main/resources/env/env.properties
similarity index 100%
rename from test/util/src/main/resources/env/env.properties
rename to test/it/parser/src/main/resources/env/env.properties
diff --git a/test/util/pom.xml b/test/util/pom.xml
index f2ea7d45af6..103aee581f6 100644
--- a/test/util/pom.xml
+++ b/test/util/pom.xml
@@ -57,9 +57,5 @@
<artifactId>mockito-junit-jupiter</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
- </dependency>
</dependencies>
</project>
