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/12/02 15:46:21 UTC
[shardingsphere] branch master updated: Decouple parser test and test-runner (#22606)
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 4fa98fdbdde Decouple parser test and test-runner (#22606)
4fa98fdbdde is described below
commit 4fa98fdbddefb47e21e0b23603fcb57b36997eaf
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Dec 2 23:46:15 2022 +0800
Decouple parser test and test-runner (#22606)
---
.../mysql/external/ExternalMySQLParserParameterizedIT.java | 4 ++--
.../mysql/internal/InternalMySQLParserParameterizedIT.java | 4 ++--
.../opengauss/InternalOpenGaussParserParameterizedIT.java | 4 ++--
.../parser/oracle/InternalOracleParserParameterizedIT.java | 4 ++--
.../external/ExternalPostgreSQLParserParameterizedIT.java | 4 ++--
.../internal/InternalPostgreSQLParserParameterizedIT.java | 4 ++--
.../sql/parser/sql92/InternalSQL92ParserParameterizedIT.java | 4 ++--
.../sqlserver/InternalSQLServerParserParameterizedIT.java | 4 ++--
.../test/sql/parser/SQLParserParameterizedArray.java | 11 +++++++++--
.../test/sql/parser/internal/cases/sql/SQLCases.java | 2 +-
.../engine/param/InternalSQLParserParameterizedArray.java | 4 ++--
.../parser/internal/InternalDistSQLParserParameterizedIT.java | 4 ++--
12 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/external/ExternalMySQLParserParameterizedIT.java b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/external/ExternalMySQLParserParameterizedIT.java
index a97b349ac2d..407d9272d6c 100644
--- a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/external/ExternalMySQLParserParameterizedIT.java
+++ b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/external/ExternalMySQLParserParameterizedIT.java
@@ -18,18 +18,18 @@
package org.apache.shardingsphere.sql.parser.mysql.external;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.external.engine.ExternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.external.engine.param.ExternalSQLParserParameterizedArray;
import org.apache.shardingsphere.test.sql.parser.external.loader.SQLCaseLoader;
import org.apache.shardingsphere.test.sql.parser.external.loader.strategy.impl.GitHubSQLCaseLoadStrategy;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.net.URI;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class ExternalMySQLParserParameterizedIT extends ExternalSQLParserParameterizedIT {
public ExternalMySQLParserParameterizedIT(final ExternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
index 421cdcff7d6..d2038294d73 100644
--- a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
+++ b/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/internal/InternalMySQLParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.sql.parser.mysql.internal;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalMySQLParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalMySQLParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
index d0a0c4708a2..e8460eb67ff 100644
--- a/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
+++ b/sql-parser/dialect/opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/InternalOpenGaussParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.sql.parser.opengauss;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalOpenGaussParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalOpenGaussParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
index 7ef06572bc8..cf924205891 100644
--- a/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
+++ b/sql-parser/dialect/oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/InternalOracleParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.sql.parser.oracle;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalOracleParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalOracleParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/external/ExternalPostgreSQLParserParameterizedIT.java b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/external/ExternalPostgreSQLParserParameterizedIT.java
index 6f552b5f446..ff167dc6953 100644
--- a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/external/ExternalPostgreSQLParserParameterizedIT.java
+++ b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/external/ExternalPostgreSQLParserParameterizedIT.java
@@ -18,18 +18,18 @@
package org.apache.shardingsphere.sql.parser.postgresql.external;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeFactory;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.external.engine.ExternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.external.engine.param.ExternalSQLParserParameterizedArray;
import org.apache.shardingsphere.test.sql.parser.external.loader.SQLCaseLoader;
import org.apache.shardingsphere.test.sql.parser.external.loader.strategy.impl.GitHubSQLCaseLoadStrategy;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.net.URI;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class ExternalPostgreSQLParserParameterizedIT extends ExternalSQLParserParameterizedIT {
public ExternalPostgreSQLParserParameterizedIT(final ExternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
index b5195835bf9..83ebac4d5e2 100644
--- a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
+++ b/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/internal/InternalPostgreSQLParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.sql.parser.postgresql.internal;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalPostgreSQLParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalPostgreSQLParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
index b162ed5bf7a..7fc59a4d520 100644
--- a/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
+++ b/sql-parser/dialect/sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/InternalSQL92ParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.sql.parser.sql92;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalSQL92ParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalSQL92ParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
index 566173d3f72..6f971a52827 100644
--- a/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
+++ b/sql-parser/dialect/sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/InternalSQLServerParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.sql.parser.sqlserver;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalSQLServerParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalSQLServerParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java
index 4123006b0a1..e13fd0cd330 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/SQLParserParameterizedArray.java
@@ -17,12 +17,12 @@
package org.apache.shardingsphere.test.sql.parser;
-import org.apache.shardingsphere.test.runner.param.ParameterizedArray;
+import org.apache.shardingsphere.infra.database.type.DatabaseType;
/**
* SQL parser parameterized array.
*/
-public interface SQLParserParameterizedArray extends ParameterizedArray {
+public interface SQLParserParameterizedArray {
/**
* Get SQL case ID.
@@ -30,4 +30,11 @@ public interface SQLParserParameterizedArray extends ParameterizedArray {
* @return SQL case ID
*/
String getSqlCaseId();
+
+ /**
+ * Get database type.
+ *
+ * @return database type
+ */
+ DatabaseType getDatabaseType();
}
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 c7148763b81..cba9e5e0351 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
@@ -69,7 +69,7 @@ public final class SQLCases {
Collection<InternalSQLParserParameterizedArray> result = new LinkedList<>();
for (DatabaseType each : getDatabaseTypes(sqlCase.getDatabaseTypes())) {
if (databaseTypes.contains(each) && containsSQLCaseType(sqlCase, caseType)) {
- result.add(new InternalSQLParserParameterizedArray(sqlCase.getId(), each, caseType));
+ result.add(new InternalSQLParserParameterizedArray(sqlCase.getId(), caseType, each));
}
}
return result;
diff --git a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java
index 5134b9dc99c..670f10e3f3b 100644
--- a/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java
+++ b/test/parser/src/main/java/org/apache/shardingsphere/test/sql/parser/internal/engine/param/InternalSQLParserParameterizedArray.java
@@ -32,10 +32,10 @@ public final class InternalSQLParserParameterizedArray implements SQLParserParam
private final String sqlCaseId;
- private final DatabaseType databaseType;
-
private final SQLCaseType sqlCaseType;
+ private final DatabaseType databaseType;
+
@Override
public String toString() {
return String.format("%s (%s) -> %s", sqlCaseId, sqlCaseType, databaseType.getType());
diff --git a/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java b/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
index 945813b70ca..73492519873 100644
--- a/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
+++ b/test/parser/src/test/java/org/apache/shardingsphere/test/sql/parser/internal/InternalDistSQLParserParameterizedIT.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.test.sql.parser.internal;
-import org.apache.shardingsphere.test.runner.ParallelParameterized;
import org.apache.shardingsphere.test.sql.parser.internal.engine.InternalSQLParserParameterizedIT;
import org.apache.shardingsphere.test.sql.parser.internal.engine.param.InternalSQLParserParameterizedArray;
import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
import java.util.Collection;
-@RunWith(ParallelParameterized.class)
+@RunWith(Parameterized.class)
public final class InternalDistSQLParserParameterizedIT extends InternalSQLParserParameterizedIT {
public InternalDistSQLParserParameterizedIT(final InternalSQLParserParameterizedArray parameterizedArray) {