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 f32cac8cc2f Remove databaseType to simplify code style (#22027)
f32cac8cc2f is described below
commit f32cac8cc2fdbbeac7ed3bed321e96f7e99e51f6
Author: Junfeng <[email protected]>
AuthorDate: Wed Nov 9 11:50:19 2022 +0800
Remove databaseType to simplify code style (#22027)
* fix: rm param databaseType & correct empty result
* fix: correct params of getTestParameters
Co-authored-by: Jacob953 <[email protected]>
---
.../base/DynamicLoadingSQLParserParameterizedTest.java | 12 ++++++------
.../mysql/DynamicLoadingMySQLParserParameterizedIT.java | 8 ++++----
.../DynamicLoadingPostgreSQLParserParameterizedIT.java | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/base/DynamicLoadingSQLParserParameterizedTest.java
b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/base/DynamicLoadingSQLParserParameterizedTest.java
index b7c3439b33a..cba54141a21 100644
---
a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/base/DynamicLoadingSQLParserParameterizedTest.java
+++
b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/base/DynamicLoadingSQLParserParameterizedTest.java
@@ -54,19 +54,19 @@ public abstract class
DynamicLoadingSQLParserParameterizedTest {
// TODO this will refactor as an abstract
private final CSVResultGenerator resultGenerator;
- protected static Collection<Object[]> getTestParameters(final String
sqlCaseAPI, final URI sqlCaseURI, final String databaseType) {
+ protected static Collection<Object[]> getTestParameters(final String
sqlCaseAPI, final URI sqlCaseURI) {
Collection<Object[]> result = new LinkedList<>();
if (sqlCaseAPI.isEmpty()) {
- result.addAll(getSQLCases("localFile", getContent(sqlCaseURI),
databaseType));
+ result.addAll(getSQLCases("localFile", getContent(sqlCaseURI)));
} else {
for (Map<String, String> each : getResponse(sqlCaseAPI,
sqlCaseURI)) {
String sqlCaseFileName = each.get("name").split("\\.")[0];
String sqlCaseFileContent =
getContent(URI.create(each.get("download_url")));
- result.addAll(getSQLCases(sqlCaseFileName, sqlCaseFileContent,
databaseType));
+ result.addAll(getSQLCases(sqlCaseFileName,
sqlCaseFileContent));
}
}
if (result.isEmpty()) {
- result.add(new Object[]{null, null, null});
+ result.add(new Object[]{null, null});
}
return result;
}
@@ -112,14 +112,14 @@ public abstract class
DynamicLoadingSQLParserParameterizedTest {
return result;
}
- protected static Collection<Object[]> getSQLCases(final String
sqlCaseFileName, final String sqlCaseFileContent, final String databaseType) {
+ protected static Collection<Object[]> getSQLCases(final String
sqlCaseFileName, final String sqlCaseFileContent) {
Collection<Object[]> result = new LinkedList<>();
String[] lines = sqlCaseFileContent.split("\n");
int sqlCaseEnum = 1;
for (String each : lines) {
if (!each.isEmpty() && Character.isLetter(each.charAt(0)) &&
each.charAt(each.length() - 1) == ';') {
String sqlCaseId = sqlCaseFileName + sqlCaseEnum;
- result.add(new Object[]{sqlCaseId, each, databaseType});
+ result.add(new Object[]{sqlCaseId, each});
sqlCaseEnum++;
}
}
diff --git
a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedIT.java
b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedIT.java
index e89d810a507..ae162d7f8f7 100644
---
a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedIT.java
+++
b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedIT.java
@@ -31,8 +31,8 @@ import java.util.Collections;
@RunWith(ShardingSphereParallelTestParameterized.class)
public final class DynamicLoadingMySQLParserParameterizedIT extends
DynamicLoadingSQLParserParameterizedTest {
- public DynamicLoadingMySQLParserParameterizedIT(final String sqlCaseId,
final String sqlCaseValue, final String databaseType) {
- super(sqlCaseId, sqlCaseValue, databaseType, new
CSVResultGenerator(databaseType));
+ public DynamicLoadingMySQLParserParameterizedIT(final String sqlCaseId,
final String sqlCaseValue) {
+ super(sqlCaseId, sqlCaseValue, "MySQL", new
CSVResultGenerator("MySQL"));
}
/**
@@ -40,10 +40,10 @@ public final class DynamicLoadingMySQLParserParameterizedIT
extends DynamicLoadi
*
* @return Test cases from GitHub.
*/
- @Parameters(name = "{0} ({2}) -> {1}")
+ @Parameters(name = "{0} (MySQL) -> {1}")
public static Collection<Object[]> getTestParameters() {
return IntegrationTestEnvironment.getInstance().isSqlParserITEnabled()
- ?
DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://api.github.com/repos/";,
URI.create("https://github.com/mysql/mysql-server/tree/8.0/mysql-test/t";),
"MySQL")
+ ?
DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://api.github.com/repos/";,
URI.create("https://github.com/mysql/mysql-server/tree/8.0/mysql-test/t";))
: Collections.emptyList();
}
}
diff --git
a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedIT.java
b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedIT.java
index daaa1c9a277..4bdd01cf1f0 100644
---
a/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedIT.java
+++
b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedIT.java
@@ -31,8 +31,8 @@ import java.util.Collections;
@RunWith(ShardingSphereParallelTestParameterized.class)
public final class DynamicLoadingPostgreSQLParserParameterizedIT extends
DynamicLoadingSQLParserParameterizedTest {
- public DynamicLoadingPostgreSQLParserParameterizedIT(final String
sqlCaseId, final String sqlCaseValue, final String databaseType) {
- super(sqlCaseId, sqlCaseValue, databaseType, new
CSVResultGenerator(databaseType));
+ public DynamicLoadingPostgreSQLParserParameterizedIT(final String
sqlCaseId, final String sqlCaseValue) {
+ super(sqlCaseId, sqlCaseValue, "PostgreSQL", new
CSVResultGenerator("PostgreSQL"));
}
/**
@@ -40,11 +40,11 @@ public final class
DynamicLoadingPostgreSQLParserParameterizedIT extends Dynamic
*
* @return Test cases from GitHub.
**/
- @Parameters(name = "{0} ({2}) -> {1}")
+ @Parameters(name = "{0} (PostgreSQL) -> {1}")
public static Collection<Object[]> getTestParameters() {
return IntegrationTestEnvironment.getInstance().isSqlParserITEnabled()
? DynamicLoadingSQLParserParameterizedTest.getTestParameters(
- "https://api.github.com/repos/";,
URI.create("https://github.com/postgres/postgres/tree/master/src/test/regress/sql";),
"PostgreSQL")
+ "https://api.github.com/repos/";,
URI.create("https://github.com/postgres/postgres/tree/master/src/test/regress/sql";))
: Collections.emptyList();
}
}
