You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2022/11/04 11:20:32 UTC
[shardingsphere] branch master updated: Refactor : move the dynamic parser test to IT (#21963)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 42050ce8098 Refactor : move the dynamic parser test to IT (#21963)
42050ce8098 is described below
commit 42050ce80985fe896f2fecce36524e524a7c9b10
Author: 孙念君 Nianjun Sun <su...@apache.org>
AuthorDate: Fri Nov 4 19:20:23 2022 +0800
Refactor : move the dynamic parser test to IT (#21963)
---
test/integration-test/pom.xml | 1 +
test/integration-test/{ => sql-parser}/pom.xml | 46 ++++++----------------
...DynamicLoadingMySQLParserParameterizedTest.java | 21 +++++-----
...icLoadingPostgreSQLParserParameterizedTest.java | 25 ++++++------
4 files changed, 39 insertions(+), 54 deletions(-)
diff --git a/test/integration-test/pom.xml b/test/integration-test/pom.xml
index 3c2e78d8edf..556dba6d8f5 100644
--- a/test/integration-test/pom.xml
+++ b/test/integration-test/pom.xml
@@ -36,6 +36,7 @@
<module>transaction</module>
<module>ha</module>
<module>showprocesslist</module>
+ <module>sql-parser</module>
</modules>
<properties>
diff --git a/test/integration-test/pom.xml b/test/integration-test/sql-parser/pom.xml
similarity index 55%
copy from test/integration-test/pom.xml
copy to test/integration-test/sql-parser/pom.xml
index 3c2e78d8edf..c727bb21978 100644
--- a/test/integration-test/pom.xml
+++ b/test/integration-test/sql-parser/pom.xml
@@ -21,41 +21,21 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.shardingsphere</groupId>
- <artifactId>shardingsphere-test</artifactId>
+ <artifactId>shardingsphere-integration-test</artifactId>
<version>5.2.2-SNAPSHOT</version>
</parent>
- <artifactId>shardingsphere-integration-test</artifactId>
- <packaging>pom</packaging>
+ <artifactId>shardingsphere-integration-test-sql-parser</artifactId>
<name>${project.artifactId}</name>
- <modules>
- <module>fixture</module>
- <module>env</module>
- <module>test-suite</module>
- <module>scaling</module>
- <module>transaction</module>
- <module>ha</module>
- <module>showprocesslist</module>
- </modules>
-
- <properties>
- <maven.deploy.skip>true</maven.deploy.skip>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <id>integration-tests</id>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shardingsphere</groupId>
+ <artifactId>shardingsphere-parser-test</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
</project>
diff --git a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedTest.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedTest.java
similarity index 64%
rename from sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedTest.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedTest.java
index e3ef7dfb4ff..4034fb003c3 100644
--- a/sql-parser/dialect/mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedTest.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/mysql/DynamicLoadingMySQLParserParameterizedTest.java
@@ -17,23 +17,26 @@
package org.apache.shardingsphere.sql.parser.mysql;
-import org.apache.shardingsphere.test.sql.parser.parameterized.engine.DynamicLoadingSQLParserParameterizedTest;
-import org.junit.runners.Parameterized.Parameters;
-
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
//@RunWith(ShardingSphereParallelTestParameterized.class)
-public final class DynamicLoadingMySQLParserParameterizedTest extends DynamicLoadingSQLParserParameterizedTest {
+public final class DynamicLoadingMySQLParserParameterizedTest {
- public DynamicLoadingMySQLParserParameterizedTest(final String sqlCaseId, final String sqlCaseValue) {
- super(sqlCaseId, sqlCaseValue, "MySQL");
- }
+ // public DynamicLoadingMySQLParserParameterizedTest(final String sqlCaseId, final String sqlCaseValue) {
+ // super(sqlCaseId, sqlCaseValue, "MySQL");
+ // }
- @Parameters(name = "{0} (MySQL) -> {1}")
+ /**
+ * Get test parameters.
+ *
+ * @return Test cases from github.
+ * @throws IOException IOException
+ */
+ // @Parameters(name = "{0} (MySQL) -> {1}")
public static Collection<Object[]> getTestParameters() throws IOException {
return Collections.emptyList();
-// return DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://github.com/mysql/mysql-server/tree/8.0/mysql-test/t");
+ // return DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://github.com/mysql/mysql-server/tree/8.0/mysql-test/t");
}
}
diff --git a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedTest.java b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedTest.java
similarity index 60%
rename from sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedTest.java
rename to test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedTest.java
index ef121d3753c..ef9586d5299 100644
--- a/sql-parser/dialect/postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedTest.java
+++ b/test/integration-test/sql-parser/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/DynamicLoadingPostgreSQLParserParameterizedTest.java
@@ -17,25 +17,26 @@
package org.apache.shardingsphere.sql.parser.postgresql;
-import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
-import org.apache.shardingsphere.test.sql.parser.parameterized.engine.DynamicLoadingSQLParserParameterizedTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized.Parameters;
-
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
-@RunWith(ShardingSphereParallelTestParameterized.class)
-public final class DynamicLoadingPostgreSQLParserParameterizedTest extends DynamicLoadingSQLParserParameterizedTest {
+//@RunWith(ShardingSphereParallelTestParameterized.class)
+public final class DynamicLoadingPostgreSQLParserParameterizedTest {
- public DynamicLoadingPostgreSQLParserParameterizedTest(final String sqlCaseId, final String sqlCaseValue) {
- super(sqlCaseId, sqlCaseValue, "PostgreSQL");
- }
+ // public DynamicLoadingPostgreSQLParserParameterizedTest(final String sqlCaseId, final String sqlCaseValue) {
+ // super(sqlCaseId, sqlCaseValue, "PostgreSQL");
+ // }
- @Parameters(name = "{0} (PostgreSQL) -> {1}")
+ /**
+ * Get test parameters.
+ *
+ * @return Test cases from github.
+ * @throws IOException IOException
+ **/
+ // @Parameters(name = "{0} (PostgreSQL) -> {1}")
public static Collection<Object[]> getTestParameters() throws IOException {
return Collections.emptyList();
-// return DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://github.com/postgres/postgres/tree/master/src/test/regress/sql");
+ // return DynamicLoadingSQLParserParameterizedTest.getTestParameters("https://github.com/postgres/postgres/tree/master/src/test/regress/sql");
}
}