You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/05/12 10:08:22 UTC

[shardingsphere] branch master updated: Refactor ExternalCaseSettings (#25613)

This is an automated email from the ASF dual-hosted git repository.

zhangliang 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 ea4ac50599c Refactor ExternalCaseSettings (#25613)
ea4ac50599c is described below

commit ea4ac50599ca657eacff5fdbe1edf5685c8060e2
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri May 12 18:08:07 2023 +0800

    Refactor ExternalCaseSettings (#25613)
---
 .../test/it/sql/parser/it/mysql/external/ExternalMySQLParserIT.java | 2 +-
 .../parser/it/postgresql/external/ExternalPostgreSQLParserIT.java   | 2 +-
 .../test/it/sql/parser/external/ExternalSQLParserIT.java            | 2 +-
 .../org/apache/shardingsphere/test/loader/ExternalCaseSettings.java | 6 +++---
 4 files changed, 6 insertions(+), 6 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 6cb78b13a44..6bab3319a34 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
@@ -21,7 +21,7 @@ import org.apache.shardingsphere.test.it.sql.parser.external.ExternalSQLParserIT
 import org.apache.shardingsphere.test.it.sql.parser.external.loader.ExternalMySQLTestParameterLoader;
 import org.apache.shardingsphere.test.loader.ExternalCaseSettings;
 
-@ExternalCaseSettings(value = "MySQL", caseURL = ExternalMySQLParserIT.CASE_URL, resultURL = ExternalMySQLParserIT.RESULT_URL, testParameterLoader = ExternalMySQLTestParameterLoader.class)
+@ExternalCaseSettings(value = "MySQL", caseURL = ExternalMySQLParserIT.CASE_URL, resultURL = ExternalMySQLParserIT.RESULT_URL, caseLoader = ExternalMySQLTestParameterLoader.class)
 class ExternalMySQLParserIT extends ExternalSQLParserIT {
     
     static final String CASE_URL = "https://github.com/mysql/mysql-server/tree/8.0/mysql-test/t";
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 96a369b7154..892e124c2ac 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
@@ -21,7 +21,7 @@ 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;
 
-@ExternalCaseSettings(value = "PostgreSQL", caseURL = ExternalPostgreSQLParserIT.CASE_URL, resultURL = ExternalPostgreSQLParserIT.RESULT_URL, testParameterLoader = DefaultExternalTestParameterLoader.class)
+@ExternalCaseSettings(value = "PostgreSQL", caseURL = ExternalPostgreSQLParserIT.CASE_URL, resultURL = ExternalPostgreSQLParserIT.RESULT_URL, caseLoader = DefaultExternalTestParameterLoader.class)
 class ExternalPostgreSQLParserIT extends ExternalSQLParserIT {
     
     static final String CASE_URL = "https://github.com/postgres/postgres/tree/master/src/test/regress/sql";
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 e1260fc618d..77441d39d8d 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
@@ -80,7 +80,7 @@ public abstract class ExternalSQLParserIT {
         
         @SneakyThrows
         private Collection<ExternalSQLParserTestParameter> getTestParameters(final ExternalCaseSettings settings) {
-            AbstractTestParameterLoader<ExternalSQLParserTestParameter> loader = settings.testParameterLoader().getConstructor(TestParameterLoadStrategy.class)
+            AbstractTestParameterLoader<ExternalSQLParserTestParameter> loader = settings.caseLoader().getConstructor(TestParameterLoadStrategy.class)
                     .newInstance(new GitHubTestParameterLoadStrategy());
             return loader.load(URI.create(settings.caseURL()), URI.create(settings.resultURL()), settings.value(), settings.reportType());
         }
diff --git a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java b/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
index 6a90ee7724e..3429d693b3a 100644
--- a/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
+++ b/test/util/src/main/java/org/apache/shardingsphere/test/loader/ExternalCaseSettings.java
@@ -57,9 +57,9 @@ public @interface ExternalCaseSettings {
     String reportType() default "CSV";
     
     /**
-     * Get test parameter loader.
+     * Get case loader.
      *
-     * @return test parameter loader
+     * @return case loader
      */
-    Class<? extends AbstractTestParameterLoader<ExternalSQLParserTestParameter>> testParameterLoader();
+    Class<? extends AbstractTestParameterLoader<ExternalSQLParserTestParameter>> caseLoader();
 }