You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/11/25 11:33:48 UTC
[shardingsphere] branch master updated: Rename SQLCases.generateTestParameters() (#22420)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 d8cc1476177 Rename SQLCases.generateTestParameters() (#22420)
d8cc1476177 is described below
commit d8cc1476177223f0b5c0beb689cf146373cd8d73
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Nov 25 19:33:40 2022 +0800
Rename SQLCases.generateTestParameters() (#22420)
---
.../SQLNodeConverterEngineParameterizedTest.java | 2 +-
.../sql/parser/internal/cases/sql/SQLCases.java | 24 +++++++++++-----------
.../engine/InternalSQLParserParameterizedIT.java | 2 +-
...nternalUnsupportedSQLParserParameterizedIT.java | 2 +-
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
index b967f5e3444..d5407d0eb10 100644
--- a/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
+++ b/test/optimize/src/test/java/org/apache/shardingsphere/infra/federation/converter/parameterized/engine/SQLNodeConverterEngineParameterizedTest.java
@@ -156,7 +156,7 @@ public final class SQLNodeConverterEngineParameterizedTest {
private static Collection<Object[]> getTestParameters(final String... databaseTypes) {
Collection<Object[]> result = new LinkedList<>();
- for (Object[] each : SQL_CASES.getTestParameters(Arrays.asList(databaseTypes))) {
+ for (Object[] each : SQL_CASES.generateTestParameters(Arrays.asList(databaseTypes))) {
if (!isPlaceholderWithoutParameter(each) && isSupportedSQLCase(each)) {
result.add(each);
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
index a866ef0d724..f6584f35fb7 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/cases/sql/SQLCases.java
@@ -43,28 +43,28 @@ public final class SQLCases {
private final Map<String, SQLCase> cases;
/**
- * Get test parameters.
+ * Generate test parameters.
*
- * @param databaseTypes database types
- * @return test parameters
+ * @param databaseTypes database types to be generated
+ * @return generated test parameters
*/
- public Collection<Object[]> getTestParameters(final Collection<String> databaseTypes) {
+ public Collection<Object[]> generateTestParameters(final Collection<String> databaseTypes) {
Collection<Object[]> result = new LinkedList<>();
for (SQLCase each : cases.values()) {
- result.addAll(getSQLTestParameters(databaseTypes, each));
+ result.addAll(generateTestParameters(databaseTypes, each));
}
return result;
}
- private Collection<Object[]> getSQLTestParameters(final Collection<String> databaseTypes, final SQLCase sqlCase) {
+ private Collection<Object[]> generateTestParameters(final Collection<String> databaseTypes, final SQLCase sqlCase) {
Collection<Object[]> result = new LinkedList<>();
for (SQLCaseType each : SQLCaseType.values()) {
- result.addAll(getSQLTestParameters(databaseTypes, sqlCase, each));
+ result.addAll(generateTestParameters(databaseTypes, sqlCase, each));
}
return result;
}
- private static Collection<Object[]> getSQLTestParameters(final Collection<String> databaseTypes, final SQLCase sqlCase, final SQLCaseType caseType) {
+ private Collection<Object[]> generateTestParameters(final Collection<String> databaseTypes, final SQLCase sqlCase, final SQLCaseType caseType) {
Collection<Object[]> result = new LinkedList<>();
for (String each : getDatabaseTypes(sqlCase.getDatabaseTypes())) {
if (databaseTypes.contains(each)) {
@@ -78,11 +78,11 @@ public final class SQLCases {
return result;
}
- private static Collection<String> getDatabaseTypes(final String databaseTypes) {
+ private Collection<String> getDatabaseTypes(final String databaseTypes) {
return Strings.isNullOrEmpty(databaseTypes) ? getAllDatabaseTypes() : Splitter.on(',').trimResults().splitToList(databaseTypes);
}
- private static Collection<String> getAllDatabaseTypes() {
+ private Collection<String> getAllDatabaseTypes() {
return Arrays.asList("H2", "MySQL", "PostgreSQL", "Oracle", "SQLServer", "SQL92", "openGauss");
}
@@ -115,7 +115,7 @@ public final class SQLCases {
return params.isEmpty() ? sql : replace(sql, params);
}
- private static String replace(final String sql, final List<?> params) {
+ private String replace(final String sql, final List<?> params) {
Matcher matcher = PARAMETER_MARKER.matcher(sql);
int found = 0;
StringBuffer result = new StringBuffer();
@@ -132,7 +132,7 @@ public final class SQLCases {
return result.toString();
}
- private static void appendReplacement(final int markerIndex, final List<?> params, final Matcher matcher, final StringBuffer buffer) {
+ private void appendReplacement(final int markerIndex, final List<?> params, final Matcher matcher, final StringBuffer buffer) {
Preconditions.checkArgument(markerIndex <= params.size(), "Missing replacement for `%s` at index `%s`.", PARAMETER_MARKER.pattern(), markerIndex);
matcher.appendReplacement(buffer, Matcher.quoteReplacement(params.get(markerIndex - 1).toString()));
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java
index 58bf70e0217..255861e9ff7 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalSQLParserParameterizedIT.java
@@ -53,7 +53,7 @@ public abstract class InternalSQLParserParameterizedIT {
protected static Collection<Object[]> getTestParameters(final String... databaseTypes) {
Collection<Object[]> result = new LinkedList<>();
- for (Object[] each : SQL_CASES.getTestParameters(Arrays.asList(databaseTypes))) {
+ for (Object[] each : SQL_CASES.generateTestParameters(Arrays.asList(databaseTypes))) {
if (!isPlaceholderWithoutParameter(each)) {
result.add(each);
}
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java
index 0e4aa30bc87..4fdf0111b9c 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/InternalUnsupportedSQLParserParameterizedIT.java
@@ -44,7 +44,7 @@ public abstract class InternalUnsupportedSQLParserParameterizedIT {
private final SQLCaseType sqlCaseType;
protected static Collection<Object[]> getTestParameters(final String databaseType) {
- return SQL_CASES.getTestParameters(Collections.singleton(databaseType));
+ return SQL_CASES.generateTestParameters(Collections.singleton(databaseType));
}
@Test(expected = Exception.class)