You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by su...@apache.org on 2022/11/10 07:47:44 UTC
[shardingsphere] branch master updated: Replace cases with results while dynamic loading SQL cases (#22055)
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 1e3303fbf9f Replace cases with results while dynamic loading SQL cases (#22055)
1e3303fbf9f is described below
commit 1e3303fbf9f24209fe44879840528513f677041e
Author: Junfeng <i...@jacob953.com>
AuthorDate: Thu Nov 10 15:47:37 2022 +0800
Replace cases with results while dynamic loading SQL cases (#22055)
* feat: check case with type
* feat: getTestParameters with result of cases
* fix: modify code style on string equals
Co-authored-by: Jacob953 <ja...@csu.edu.cn>
---
.../sql/parser/base/DynamicLoadingSQLParserParameterizedTest.java | 8 ++++----
.../parser/mysql/DynamicLoadingMySQLParserParameterizedIT.java | 2 +-
.../postgresql/DynamicLoadingPostgreSQLParserParameterizedIT.java | 2 +-
3 files changed, 6 insertions(+), 6 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 f0a9d4df11d..c736a0c7a57 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
@@ -81,12 +81,12 @@ public abstract class DynamicLoadingSQLParserParameterizedTest {
List<String> casesName = JsonPath.parse(caseContent).read("$..name");
List<String> casesDownloadURL = JsonPath.parse(caseContent).read("$..download_url");
List<String> casesHtmlURL = JsonPath.parse(caseContent).read("$..html_url");
+ List<String> casesType = JsonPath.parse(caseContent).read("$..type");
IntStream.range(0, JsonPath.parse(caseContent).read("$.length()"))
.forEach(each -> {
- String eachName = casesName.get(each);
- if (eachName.endsWith(".sql") || eachName.endsWith(".test")) {
- result.add(ImmutableMap.of("name", eachName, "download_url", casesDownloadURL.get(each)));
- } else if (!eachName.contains(".")) {
+ if ("file".equals(casesType.get(each))) {
+ result.add(ImmutableMap.of("name", casesName.get(each), "download_url", casesDownloadURL.get(each)));
+ } else if ("dir".equals(casesType.get(each))) {
result.addAll(getResponse(sqlCaseAPI, URI.create(casesHtmlURL.get(each))));
}
});
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 6c345fdd983..7f1d0d31b98 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
@@ -43,7 +43,7 @@ public final class DynamicLoadingMySQLParserParameterizedIT extends DynamicLoadi
@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"))
+ ? DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://api.github.com/repos/", URI.create("https://github.com/mysql/mysql-server/tree/8.0/mysql-test/r"))
: 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 7185c290090..6c7e1bd1632 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
@@ -44,7 +44,7 @@ public final class DynamicLoadingPostgreSQLParserParameterizedIT extends Dynamic
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"))
+ "https://api.github.com/repos/", URI.create("https://github.com/postgres/postgres/tree/master/src/test/regress/expected"))
: Collections.emptyList();
}
}