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 5889b849926 Move AbstractTestParameterLoader to
shardingsphere-it-parser module (#28092)
5889b849926 is described below
commit 5889b84992645ecae7a0e6e317b48e0e38b1d879
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Aug 15 15:35:41 2023 +0800
Move AbstractTestParameterLoader to shardingsphere-it-parser module (#28092)
---
.../it/mysql/external/ExternalMySQLParserIT.java | 2 +-
.../external/ExternalPostgreSQLParserIT.java | 2 +-
.../it/sql/parser/external/ExternalSQLParserIT.java | 10 +++++-----
.../loader/DefaultExternalTestParameterLoader.java | 6 +++---
.../loader/MySQLExternalTestParameterLoader.java | 6 +++---
.../parser}/loader/AbstractTestParameterLoader.java | 6 +++---
.../it/sql/parser}/loader/ExternalCaseSettings.java | 2 +-
.../loader/ExternalSQLParserTestParameter.java | 2 +-
.../loader/strategy/TestParameterLoadStrategy.java | 4 ++--
.../loader/strategy/impl/GitHubEnvironment.java} | 20 ++++++++++----------
.../impl/GitHubTestParameterLoadStrategy.java | 11 +++++------
.../impl/LocalFileTestParameterLoadStrategy.java | 6 +++---
.../loader/summary/AssertableFileSummary.java | 2 +-
.../it/sql/parser}/loader/summary/FileSummary.java | 2 +-
.../src/main/resources/env/github-env.properties} | 2 +-
15 files changed, 41 insertions(+), 42 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 5e260c41194..48503ede2b6 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
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.it.mysql.external;
import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT;
import
org.apache.shardingsphere.test.it.sql.parser.external.loader.MySQLExternalTestParameterLoader;
-import org.apache.shardingsphere.test.loader.ExternalCaseSettings;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
@ExternalCaseSettings(value = "MySQL", caseURL =
ExternalMySQLParserIT.CASE_URL, resultURL = ExternalMySQLParserIT.RESULT_URL,
caseLoader = MySQLExternalTestParameterLoader.class)
class ExternalMySQLParserIT extends ExternalSQLParserIT {
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 892e124c2ac..38d6e5be165 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
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.it.sql.parser.it.postgresql.external;
import
org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT;
import
org.apache.shardingsphere.test.it.sql.parser.external.loader.DefaultExternalTestParameterLoader;
-import org.apache.shardingsphere.test.loader.ExternalCaseSettings;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
@ExternalCaseSettings(value = "PostgreSQL", caseURL =
ExternalPostgreSQLParserIT.CASE_URL, resultURL =
ExternalPostgreSQLParserIT.RESULT_URL, caseLoader =
DefaultExternalTestParameterLoader.class)
class ExternalPostgreSQLParserIT extends ExternalSQLParserIT {
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 17a5313a662..505ae7298b5 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
@@ -28,11 +28,11 @@ 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.result.SQLParseResultReporter;
import
org.apache.shardingsphere.test.it.sql.parser.external.result.SQLParseResultReporterCreator;
-import org.apache.shardingsphere.test.loader.AbstractTestParameterLoader;
-import org.apache.shardingsphere.test.loader.ExternalCaseSettings;
-import org.apache.shardingsphere.test.loader.ExternalSQLParserTestParameter;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import
org.apache.shardingsphere.test.loader.strategy.impl.GitHubTestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.AbstractTestParameterLoader;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalCaseSettings;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalSQLParserTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.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/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
index c6113349cb4..19019768739 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/DefaultExternalTestParameterLoader.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.it.sql.parser.external.loader;
-import org.apache.shardingsphere.test.loader.ExternalSQLParserTestParameter;
-import org.apache.shardingsphere.test.loader.AbstractTestParameterLoader;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalSQLParserTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.AbstractTestParameterLoader;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
import java.util.Collection;
import java.util.LinkedList;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
index b644705f4b8..868b8911f15 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoader.java
@@ -17,9 +17,9 @@
package org.apache.shardingsphere.test.it.sql.parser.external.loader;
-import org.apache.shardingsphere.test.loader.ExternalSQLParserTestParameter;
-import org.apache.shardingsphere.test.loader.AbstractTestParameterLoader;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalSQLParserTestParameter;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.AbstractTestParameterLoader;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
import java.util.ArrayList;
import java.util.Collection;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/AbstractTestParameterLoader.java
similarity index 95%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/AbstractTestParameterLoader.java
index 683345e8a41..61299b8e78b 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/AbstractTestParameterLoader.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/AbstractTestParameterLoader.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.loader;
import com.google.common.collect.Lists;
import lombok.AccessLevel;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
import java.io.BufferedReader;
import java.io.IOException;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalCaseSettings.java
similarity index 96%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalCaseSettings.java
index 97217bb49e5..232df1a81b9 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalCaseSettings.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.loader;
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLParserTestParameter.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalSQLParserTestParameter.java
similarity index 95%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLParserTestParameter.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalSQLParserTestParameter.java
index 051e7aef64a..3cf1ca4e772 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLParserTestParameter.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalSQLParserTestParameter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader;
+package org.apache.shardingsphere.test.it.sql.parser.loader;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
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/loader/strategy/TestParameterLoadStrategy.java
similarity index 88%
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/loader/strategy/TestParameterLoadStrategy.java
index 7f9282bf0e9..62ece0e0710 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/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.loader.strategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
import java.net.URI;
import java.util.Collection;
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/env/env/TestUtilEnvironment.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubEnvironment.java
similarity index 73%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/env/env/TestUtilEnvironment.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubEnvironment.java
index 2c96a17aa4a..961da217da1 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/env/env/TestUtilEnvironment.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.env.env;
+package org.apache.shardingsphere.test.it.sql.parser.loader.strategy.impl;
import lombok.Getter;
import lombok.SneakyThrows;
@@ -25,35 +25,35 @@ import java.io.InputStream;
import java.util.Properties;
/**
- * Test util environment.
+ * GitHub environment.
*/
@Getter
-public final class TestUtilEnvironment {
+public final class GitHubEnvironment {
- private static final String SQL_PARSER_EXTERNAL_IT_GITHUB_TOKEN =
"test.util.github.token";
+ private static final String TOKEN_KEY = "it.github.token";
- private static final TestUtilEnvironment INSTANCE = new
TestUtilEnvironment();
+ private static final GitHubEnvironment INSTANCE = new GitHubEnvironment();
private final String githubToken;
- private TestUtilEnvironment() {
+ private GitHubEnvironment() {
Properties props = loadProperties();
- githubToken = props.getProperty(SQL_PARSER_EXTERNAL_IT_GITHUB_TOKEN);
+ githubToken = props.getProperty(TOKEN_KEY);
}
/**
- * Get instance.
+ * Get GitHub environment instance.
*
* @return got instance
*/
- public static TestUtilEnvironment getInstance() {
+ public static GitHubEnvironment getInstance() {
return INSTANCE;
}
@SneakyThrows(IOException.class)
private Properties loadProperties() {
Properties result = new Properties();
- try (InputStream inputStream =
Thread.currentThread().getContextClassLoader().getResourceAsStream("env/test-util-env.properties"))
{
+ try (InputStream inputStream =
Thread.currentThread().getContextClassLoader().getResourceAsStream("env/github-env.properties"))
{
result.load(inputStream);
}
for (String each : System.getProperties().stringPropertyNames()) {
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/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
similarity index 89%
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/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
index 9f081999f8a..ccd53a7b032 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/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
@@ -15,15 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader.strategy.impl;
+package org.apache.shardingsphere.test.it.sql.parser.loader.strategy.impl;
import com.jayway.jsonpath.DocumentContext;
import com.jayway.jsonpath.JsonPath;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.apache.shardingsphere.test.env.env.TestUtilEnvironment;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
import java.io.BufferedReader;
import java.io.IOException;
@@ -83,8 +82,8 @@ public final class GitHubTestParameterLoadStrategy implements
TestParameterLoadS
private String loadContent(final URI casesURI) {
try {
URLConnection urlConnection = casesURI.toURL().openConnection();
- if
(StringUtils.isNotBlank(TestUtilEnvironment.getInstance().getGithubToken())) {
- urlConnection.setRequestProperty("Authorization", "Bearer " +
TestUtilEnvironment.getInstance().getGithubToken());
+ if
(StringUtils.isNotBlank(GitHubEnvironment.getInstance().getGithubToken())) {
+ urlConnection.setRequestProperty("Authorization", "Bearer " +
GitHubEnvironment.getInstance().getGithubToken());
}
try (BufferedReader reader = new BufferedReader(new
InputStreamReader(urlConnection.getInputStream()))) {
return
reader.lines().collect(Collectors.joining(System.lineSeparator()));
diff --git
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
similarity index 86%
rename from
test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
rename to
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
index 774a711679d..e2d56e532f3 100644
---
a/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/LocalFileTestParameterLoadStrategy.java
@@ -15,11 +15,11 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.loader.strategy.impl;
+package org.apache.shardingsphere.test.it.sql.parser.loader.strategy.impl;
import lombok.SneakyThrows;
-import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
import java.net.URI;
import java.nio.file.Files;
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/loader/summary/AssertableFileSummary.java
similarity index 94%
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/loader/summary/AssertableFileSummary.java
index c8425904dfb..28f467d6c55 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/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.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/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/loader/summary/FileSummary.java
index b07a2a53273..963ca042a18 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/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.loader.summary;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/test/util/src/main/resources/env/test-util-env.properties
b/test/it/parser/src/main/resources/env/github-env.properties
similarity index 97%
rename from test/util/src/main/resources/env/test-util-env.properties
rename to test/it/parser/src/main/resources/env/github-env.properties
index 93f8f4d9078..42c54031a47 100644
--- a/test/util/src/main/resources/env/test-util-env.properties
+++ b/test/it/parser/src/main/resources/env/github-env.properties
@@ -14,4 +14,4 @@
# limitations under the License.
#
-test.util.github.token=
+it.github.token=
