Skip to content

Commit 541a528

Browse files
tianhao960tianhao960
authored
refactor parallel executor framework for junit (#20910)
* add support for test parallel run * refactor parallel test framework #2 * refactor parallel test framework #3 * refactor parallel test framework #4 * refactor parallel test framework #5 * refactor parallel test framework #7
1 parent 6e1543d commit 541a528

File tree

40 files changed

+483
-171
lines changed

40 files changed

+483
-171
lines changed

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/MySQLParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.mysql;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.SQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class MySQLParserParameterizedTest extends SQLParserParameterizedTest {
3030

3131
public MySQLParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/test/java/org/apache/shardingsphere/sql/parser/mysql/UnsupportedMySQLParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.mysql;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.UnsupportedSQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class UnsupportedMySQLParserParameterizedTest extends UnsupportedSQLParserParameterizedTest {
3030

3131
public UnsupportedMySQLParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/OpenGaussParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.opengauss;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.SQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class OpenGaussParserParameterizedTest extends SQLParserParameterizedTest {
3030

3131
public OpenGaussParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-opengauss/src/test/java/org/apache/shardingsphere/sql/parser/opengauss/UnsupportedOpenGaussParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.opengauss;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.UnsupportedSQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class UnsupportedOpenGaussParserParameterizedTest extends UnsupportedSQLParserParameterizedTest {
3030

3131
public UnsupportedOpenGaussParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/OracleParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.oracle;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.SQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class OracleParserParameterizedTest extends SQLParserParameterizedTest {
3030

3131
public OracleParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/test/java/org/apache/shardingsphere/sql/parser/oracle/UnsupportedOracleParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.oracle;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.UnsupportedSQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class UnsupportedOracleParserParameterizedTest extends UnsupportedSQLParserParameterizedTest {
3030

3131
public UnsupportedOracleParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/PostgreSQLParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.postgresql;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.SQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class PostgreSQLParserParameterizedTest extends SQLParserParameterizedTest {
3030

3131
public PostgreSQLParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/test/java/org/apache/shardingsphere/sql/parser/postgresql/UnsupportedPostgreSQLParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.postgresql;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.UnsupportedSQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class UnsupportedPostgreSQLParserParameterizedTest extends UnsupportedSQLParserParameterizedTest {
3030

3131
public UnsupportedPostgreSQLParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/SQL92ParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.sql92;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.SQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class SQL92ParserParameterizedTest extends SQLParserParameterizedTest {
3030

3131
public SQL92ParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/test/java/org/apache/shardingsphere/sql/parser/sql92/UnsupportedSQL92ParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.sql92;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.UnsupportedSQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class UnsupportedSQL92ParserParameterizedTest extends UnsupportedSQLParserParameterizedTest {
3030

3131
public UnsupportedSQL92ParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/SQLServerParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.sqlserver;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.SQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class SQLServerParserParameterizedTest extends SQLParserParameterizedTest {
3030

3131
public SQLServerParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/test/java/org/apache/shardingsphere/sql/parser/sqlserver/UnsupportedSQLServerParserParameterizedTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package org.apache.shardingsphere.sql.parser.sqlserver;
1919

20+
import org.apache.shardingsphere.test.runner.ShardingSphereParallelTestParameterized;
2021
import org.apache.shardingsphere.test.sql.parser.parameterized.engine.UnsupportedSQLParserParameterizedTest;
2122
import org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.sql.SQLCaseType;
2223
import org.junit.runner.RunWith;
23-
import org.junit.runners.Parameterized;
2424
import org.junit.runners.Parameterized.Parameters;
2525

2626
import java.util.Collection;
2727

28-
@RunWith(Parameterized.class)
28+
@RunWith(ShardingSphereParallelTestParameterized.class)
2929
public final class UnsupportedSQLServerParserParameterizedTest extends UnsupportedSQLParserParameterizedTest {
3030

3131
public UnsupportedSQLServerParserParameterizedTest(final String sqlCaseId, final String databaseType, final SQLCaseType sqlCaseType) {

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@
6161
<groupId>org.testcontainers</groupId>
6262
<artifactId>testcontainers</artifactId>
6363
</dependency>
64+
65+
<dependency>
66+
<groupId>org.apache.shardingsphere</groupId>
67+
<artifactId>shardingsphere-test-common</artifactId>
68+
<version>${project.version}</version>
69+
<scope>compile</scope>
70+
</dependency>
6471
</dependencies>
6572

6673
<build>

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dal/GeneralDALIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
2121
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2222
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
23-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
24-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
23+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2525
import org.junit.Test;
2626
import org.junit.runners.Parameterized.Parameters;
2727

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dcl/GeneralDCLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
2222
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2323
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
24-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
25-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
25+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2626
import org.junit.Test;
2727
import org.junit.runners.Parameterized.Parameters;
2828

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ddl/GeneralDDLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.shardingsphere.test.integration.cases.SQLExecuteType;
2222
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2323
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
24-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
25-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
25+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2626
import org.junit.Test;
2727
import org.junit.runners.Parameterized.Parameters;
2828

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/AdditionalDMLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
2424
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2525
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
26-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
27-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
26+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
27+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2828
import org.junit.Test;
2929
import org.junit.runners.Parameterized.Parameters;
3030

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/BatchDMLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2525
import org.apache.shardingsphere.test.integration.framework.param.model.CaseParameterizedArray;
2626
import org.apache.shardingsphere.test.integration.framework.param.model.ParameterizedArray;
27-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
28-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
27+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
28+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2929
import org.junit.Test;
3030
import org.junit.runners.Parameterized.Parameters;
3131

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dml/GeneralDMLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
2323
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2424
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
25-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
26-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
25+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
26+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2727
import org.junit.Test;
2828
import org.junit.runners.Parameterized.Parameters;
2929

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/AdditionalDQLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
2424
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2525
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
26-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
27-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
26+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
27+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2828
import org.junit.Test;
2929
import org.junit.runners.Parameterized.Parameters;
3030

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/dql/GeneralDQLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import org.apache.shardingsphere.test.integration.cases.value.SQLValue;
2323
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2424
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
25-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
26-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
25+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
26+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2727
import org.junit.Test;
2828
import org.junit.runners.Parameterized.Parameters;
2929

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/ral/GeneralRALIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
2121
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2222
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
23-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
24-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
23+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2525
import org.junit.Test;
2626
import org.junit.runners.Parameterized.Parameters;
2727

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rdl/GeneralRDLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
2121
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2222
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
23-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
24-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
23+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2525
import org.junit.Test;
2626
import org.junit.runners.Parameterized.Parameters;
2727

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/engine/rql/GeneralRQLIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.shardingsphere.test.integration.cases.SQLCommandType;
2121
import org.apache.shardingsphere.test.integration.framework.param.array.ParameterizedArrayFactory;
2222
import org.apache.shardingsphere.test.integration.framework.param.model.AssertionParameterizedArray;
23-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelLevel;
24-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
23+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelLevel;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2525
import org.junit.Test;
2626
import org.junit.runners.Parameterized.Parameters;
2727

‎shardingsphere-test/shardingsphere-integration-test/shardingsphere-integration-test-suite/src/test/java/org/apache/shardingsphere/test/integration/framework/runner/ShardingSphereIntegrationTestParameterized.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919

2020
import org.apache.shardingsphere.test.integration.env.runtime.IntegrationTestEnvironment;
2121
import org.apache.shardingsphere.test.integration.env.runtime.cluster.ClusterEnvironment;
22-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.ParallelRunnerScheduler;
23-
import org.apache.shardingsphere.test.integration.framework.runner.parallel.annotaion.ParallelRuntimeStrategy;
22+
import org.apache.shardingsphere.test.integration.framework.runner.parallel.DatabaseTypeParallelRunnerExecutorFactory;
23+
import org.apache.shardingsphere.test.integration.framework.runner.parallel.ParameterizedParallelRunnerScheduler;
24+
import org.apache.shardingsphere.test.runner.parallel.annotaion.ParallelRuntimeStrategy;
2425
import org.junit.runners.Parameterized;
2526

2627
/**
@@ -35,7 +36,7 @@ public ShardingSphereIntegrationTestParameterized(final Class<?> clazz) throws T
3536
if (ClusterEnvironment.Type.DOCKER != IntegrationTestEnvironment.getInstance().getClusterEnvironment().getType()) {
3637
ParallelRuntimeStrategy parallelRuntimeStrategy = clazz.getAnnotation(ParallelRuntimeStrategy.class);
3738
if (null != parallelRuntimeStrategy) {
38-
setScheduler(new ParallelRunnerScheduler(parallelRuntimeStrategy.value()));
39+
setScheduler(new ParameterizedParallelRunnerScheduler(parallelRuntimeStrategy.value(), new DatabaseTypeParallelRunnerExecutorFactory()));
3940
}
4041
}
4142
}

0 commit comments

Comments
 (0)