This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 29b016ae17b Move test parameter loader to package
shardingsphere-test-util. (#28253)
29b016ae17b is described below
commit 29b016ae17b9d7cd2b6342b92335080da2e06d05
Author: Cong Hu <[email protected]>
AuthorDate: Fri Aug 25 14:57:13 2023 +0800
Move test parameter loader to package shardingsphere-test-util. (#28253)
---
.../test/it/sql/parser/external/ExternalSQLParserIT.java | 12 ++++++------
.../loader/MySQLExternalTestParameterLoadTemplate.java | 12 ++++++------
.../loader/StandardExternalTestParameterLoadTemplate.java | 12 ++++++------
.../test/it/sql/parser/loader/ExternalCaseSettings.java | 2 ++
.../test/loader/ExternalSQLTestParameter.java} | 4 ++--
.../test}/loader/TestParameterLoadTemplate.java | 4 ++--
.../shardingsphere/test}/loader/TestParameterLoader.java | 10 +++++-----
.../test}/loader/strategy/TestParameterLoadStrategy.java | 4 ++--
.../test}/loader/strategy/impl/GitHubEnvironment.java | 2 +-
.../strategy/impl/GitHubTestParameterLoadStrategy.java | 6 +++---
.../test}/loader/summary/AssertableFileSummary.java | 2 +-
.../shardingsphere/test}/loader/summary/FileSummary.java | 2 +-
.../src/main/resources/env/github-env.properties | 0
13 files changed, 37 insertions(+), 35 deletions(-)
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 dc954912f3d..8c385587553 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.test.it.sql.parser.external.env.SQLParserExtern
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.it.sql.parser.loader.ExternalSQLParserTestParameter;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.TestParameterLoadTemplate;
-import org.apache.shardingsphere.test.it.sql.parser.loader.TestParameterLoader;
-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.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
+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;
@@ -82,7 +82,7 @@ public abstract class ExternalSQLParserIT {
return getTestParameters(settings).stream().map(each ->
Arguments.of(each.getSqlCaseId(), each.getDatabaseType(), each.getSql(),
each.getReportType()));
}
- private Collection<ExternalSQLParserTestParameter>
getTestParameters(final ExternalCaseSettings settings) throws
ReflectiveOperationException {
+ private Collection<ExternalSQLTestParameter> getTestParameters(final
ExternalCaseSettings settings) throws ReflectiveOperationException {
TestParameterLoadStrategy loadStrategy = new
GitHubTestParameterLoadStrategy();
URI sqlCaseURI = URI.create(settings.caseURL());
URI resultURI = URI.create(settings.resultURL());
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoadTemplate.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoadTemplate.java
index 99b9faa1454..430b0c6c524 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoadTemplate.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/external/loader/MySQLExternalTestParameterLoadTemplate.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.test.it.sql.parser.external.loader;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.TestParameterLoadTemplate;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalSQLParserTestParameter;
+import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
import java.util.ArrayList;
import java.util.Collection;
@@ -34,9 +34,9 @@ public final class MySQLExternalTestParameterLoadTemplate
implements TestParamet
private static final int DELIMITER_COMMAND_LENGTH = "DELIMITER".length();
@Override
- public Collection<ExternalSQLParserTestParameter> load(final String
sqlCaseFileName, final List<String> sqlCaseFileContent,
- final List<String>
resultFileContent, final String databaseType, final String reportType) {
- Collection<ExternalSQLParserTestParameter> result = new LinkedList<>();
+ public Collection<ExternalSQLTestParameter> load(final String
sqlCaseFileName, final List<String> sqlCaseFileContent,
+ final List<String>
resultFileContent, final String databaseType, final String reportType) {
+ Collection<ExternalSQLTestParameter> result = new LinkedList<>();
List<String> lines = new ArrayList<>();
int sqlCaseIndex = 1;
String delimiter = ";";
@@ -55,7 +55,7 @@ public final class MySQLExternalTestParameterLoadTemplate
implements TestParamet
String sqlCaseId = sqlCaseFileName + sqlCaseIndex++;
String sql = String.join("\n", lines);
sql = sql.substring(0, sql.length() - delimiter.length());
- result.add(new ExternalSQLParserTestParameter(sqlCaseId,
databaseType, sql, reportType));
+ result.add(new ExternalSQLTestParameter(sqlCaseId,
databaseType, sql, reportType));
}
lines.clear();
}
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/StandardExternalTestParameterLoadTemplate.java
index 370f9b22bbd..6c3911dbbb8 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/StandardExternalTestParameterLoadTemplate.java
@@ -17,8 +17,8 @@
package org.apache.shardingsphere.test.it.sql.parser.external.loader;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.TestParameterLoadTemplate;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.ExternalSQLParserTestParameter;
+import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+import org.apache.shardingsphere.test.loader.ExternalSQLTestParameter;
import java.util.Collection;
import java.util.LinkedList;
@@ -30,9 +30,9 @@ import java.util.List;
public final class StandardExternalTestParameterLoadTemplate implements
TestParameterLoadTemplate {
@Override
- public Collection<ExternalSQLParserTestParameter> load(final String
sqlCaseFileName, final List<String> sqlCaseFileContent,
- final List<String>
resultFileContent, final String databaseType, final String reportType) {
- Collection<ExternalSQLParserTestParameter> result = new LinkedList<>();
+ public Collection<ExternalSQLTestParameter> load(final String
sqlCaseFileName, final List<String> sqlCaseFileContent,
+ final List<String>
resultFileContent, final String databaseType, final String reportType) {
+ Collection<ExternalSQLTestParameter> result = new LinkedList<>();
String completedSQL = "";
int sqlCaseEnum = 1;
int statementLines = 0;
@@ -46,7 +46,7 @@ public final class StandardExternalTestParameterLoadTemplate
implements TestPara
resultIndex = searchInResultContent(resultIndex,
resultFileContent, completedSQL, statementLines);
if (resultIndex >= resultFileContent.size() ||
!resultFileContent.get(resultIndex).contains("ERROR")) {
String sqlCaseId = sqlCaseFileName + sqlCaseEnum;
- result.add(new ExternalSQLParserTestParameter(sqlCaseId,
databaseType, completedSQL, reportType));
+ result.add(new ExternalSQLTestParameter(sqlCaseId,
databaseType, completedSQL, reportType));
sqlCaseEnum++;
}
completedSQL = "";
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/loader/ExternalCaseSettings.java
index 156d6f49008..fd09116edbc 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/loader/ExternalCaseSettings.java
@@ -17,6 +17,8 @@
package org.apache.shardingsphere.test.it.sql.parser.loader;
+import org.apache.shardingsphere.test.loader.TestParameterLoadTemplate;
+
import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalSQLParserTestParameter.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLTestParameter.java
similarity index 90%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalSQLParserTestParameter.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLTestParameter.java
index 3cf1ca4e772..f4d4ddb9e14 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/ExternalSQLParserTestParameter.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalSQLTestParameter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader;
+package org.apache.shardingsphere.test.loader;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@@ -25,7 +25,7 @@ import lombok.RequiredArgsConstructor;
*/
@RequiredArgsConstructor
@Getter
-public final class ExternalSQLParserTestParameter {
+public final class ExternalSQLTestParameter {
private final String sqlCaseId;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/TestParameterLoadTemplate.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoadTemplate.java
similarity index 83%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/TestParameterLoadTemplate.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoadTemplate.java
index 056a2183a5f..5e44ae9b191 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/TestParameterLoadTemplate.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoadTemplate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader;
+package org.apache.shardingsphere.test.loader;
import java.util.Collection;
import java.util.List;
@@ -35,5 +35,5 @@ public interface TestParameterLoadTemplate {
* @param reportType report type
* @return loaded test parameters
*/
- Collection<ExternalSQLParserTestParameter> load(String sqlCaseFileName,
List<String> sqlCaseFileContent, List<String> resultFileContent, String
databaseType, String reportType);
+ Collection<ExternalSQLTestParameter> load(String sqlCaseFileName,
List<String> sqlCaseFileContent, List<String> resultFileContent, String
databaseType, String reportType);
}
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/TestParameterLoader.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoader.java
similarity index 88%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/TestParameterLoader.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoader.java
index f754698d352..46a579eed40 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/TestParameterLoader.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/TestParameterLoader.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader;
+package org.apache.shardingsphere.test.loader;
import com.google.common.collect.Lists;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
-import
org.apache.shardingsphere.test.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.loader.summary.FileSummary;
import java.io.BufferedReader;
import java.io.IOException;
@@ -64,8 +64,8 @@ public final class TestParameterLoader {
* @return loaded test parameters
*/
@SneakyThrows
- public Collection<ExternalSQLParserTestParameter> load(final URI
sqlCaseURI, final URI resultURI, final String databaseType, final String
reportType) {
- Collection<ExternalSQLParserTestParameter> result = new LinkedList<>();
+ public Collection<ExternalSQLTestParameter> load(final URI sqlCaseURI,
final URI resultURI, final String databaseType, final String reportType) {
+ Collection<ExternalSQLTestParameter> result = new LinkedList<>();
Map<String, List<String>> sqlCaseFileContents =
downloadAllBySummary(sqlCaseURI);
Map<String, List<String>> resultFileContents =
downloadAllBySummary(resultURI);
for (Entry<String, List<String>> each :
sqlCaseFileContents.entrySet()) {
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/TestParameterLoadStrategy.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/TestParameterLoadStrategy.java
similarity index 88%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/TestParameterLoadStrategy.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/TestParameterLoadStrategy.java
index 62ece0e0710..7f9282bf0e9 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/TestParameterLoadStrategy.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/TestParameterLoadStrategy.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader.strategy;
+package org.apache.shardingsphere.test.loader.strategy;
-import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
+import org.apache.shardingsphere.test.loader.summary.FileSummary;
import java.net.URI;
import java.util.Collection;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubEnvironment.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubEnvironment.java
similarity index 96%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubEnvironment.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubEnvironment.java
index 961da217da1..9b8ec31d3d8 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubEnvironment.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubEnvironment.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader.strategy.impl;
+package org.apache.shardingsphere.test.loader.strategy.impl;
import lombok.Getter;
import lombok.SneakyThrows;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
similarity index 93%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
index ccd53a7b032..6d50e5377c2 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/strategy/impl/GitHubTestParameterLoadStrategy.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader.strategy.impl;
+package org.apache.shardingsphere.test.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.it.sql.parser.loader.strategy.TestParameterLoadStrategy;
-import org.apache.shardingsphere.test.it.sql.parser.loader.summary.FileSummary;
+import
org.apache.shardingsphere.test.loader.strategy.TestParameterLoadStrategy;
+import org.apache.shardingsphere.test.loader.summary.FileSummary;
import java.io.BufferedReader;
import java.io.IOException;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/summary/AssertableFileSummary.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/AssertableFileSummary.java
similarity index 94%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/summary/AssertableFileSummary.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/AssertableFileSummary.java
index 28f467d6c55..c8425904dfb 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/summary/AssertableFileSummary.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/AssertableFileSummary.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader.summary;
+package org.apache.shardingsphere.test.loader.summary;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/summary/FileSummary.java
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/FileSummary.java
similarity index 93%
rename from
test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/summary/FileSummary.java
rename to
test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/FileSummary.java
index 963ca042a18..b07a2a53273 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/loader/summary/FileSummary.java
+++
b/test/util/src/main/java/org/apache/shardingsphere/test/loader/summary/FileSummary.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.test.it.sql.parser.loader.summary;
+package org.apache.shardingsphere.test.loader.summary;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
diff --git a/test/it/parser/src/main/resources/env/github-env.properties
b/test/util/src/main/resources/env/github-env.properties
similarity index 100%
rename from test/it/parser/src/main/resources/env/github-env.properties
rename to test/util/src/main/resources/env/github-env.properties
