This is an automated email from the ASF dual-hosted git repository.
panjuan 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 ae3e44fbc48 Remove ParallelParameterized (#24677)
ae3e44fbc48 is described below
commit ae3e44fbc4843aa071067bfb23e81d6b0e02e83d
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 19 13:56:58 2023 +0800
Remove ParallelParameterized (#24677)
---
.../agent/core/plugin/jar/PluginJarLoaderTest.java | 10 +--
...ncryptPredicateFunctionRightValueTokenTest.java | 2 +-
...efaultShardingStrategyStatementUpdaterTest.java | 4 +-
...opShardingKeyGeneratorStatementUpdaterTest.java | 35 +++-------
.../infra/datanode/DataNodeTest.java | 4 +-
.../datasource/props/DataSourcePropertiesTest.java | 4 +-
.../pipeline/cdc/util/CDCSchemaTableUtilTest.java | 2 +-
.../cdc/util/DataRecordResultConvertUtilTest.java | 7 +-
.../DatabaseOperateBackendHandlerFactoryTest.java | 4 +-
.../test/e2e/engine/dql/AdditionalDQLE2EIT.java | 9 ++-
.../framework/runner/ParallelParameterized.java | 42 ------------
.../framework/runner/ParallelRunningStrategy.java | 50 ---------------
.../runner/executor/ParallelRunnerExecutor.java | 75 ----------------------
.../key/ParallelRunnerExecutorKeyProvider.java | 42 ------------
.../ParallelRunnerExecutorKeyProviderFactory.java | 48 --------------
.../CaseParallelRunnerExecutorKeyProvider.java | 38 -----------
.../ScenarioParallelRunnerExecutorKeyProvider.java | 38 -----------
.../framework/runner/param/RunnerParameters.java | 49 --------------
.../runner/scheduler/ParallelRunnerScheduler.java | 46 -------------
.../ExceptionInTransactionTestCase.java | 4 +-
.../cases/cursor/OpenGaussCursorTestCase.java | 2 +-
.../cases/readonly/MySQLSetReadOnlyTestCase.java | 2 +-
.../readonly/PostgreSQLSetReadOnlyTestCase.java | 5 +-
.../savepoint/OpenGaussSavePointTestCase.java | 2 +-
.../savepoint/PostgreSQLSavePointTestCase.java | 2 +-
.../cases/truncate/MySQLXATruncateTestCase.java | 2 +-
.../impl/updatable/LockClusterStatementAssert.java | 4 +-
27 files changed, 42 insertions(+), 490 deletions(-)
diff --git
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoaderTest.java
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoaderTest.java
index 198ab0f7566..b0b54011329 100644
---
a/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoaderTest.java
+++
b/agent/core/src/test/java/org/apache/shardingsphere/agent/core/plugin/jar/PluginJarLoaderTest.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.agent.core.plugin.jar;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.File;
import java.io.IOException;
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-public class PluginJarLoaderTest {
+public final class PluginJarLoaderTest {
@Test
public void assertLoad() throws IOException {
@@ -41,10 +41,6 @@ public class PluginJarLoaderTest {
}
private String getResourceURL() throws UnsupportedEncodingException {
- return URLDecoder.decode(
-
Objects.requireNonNull(PluginJarLoader.class.getClassLoader().getResource(""))
- .getFile(),
- "UTF8");
+ return
URLDecoder.decode(Objects.requireNonNull(PluginJarLoader.class.getClassLoader().getResource("")).getFile(),
"UTF8");
}
-
}
diff --git
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptPredicateFunctionRightValueTokenTest.java
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptPredicateFunctionRightValueTokenTest.java
index c2a0658c0a6..0341aca7034 100644
---
a/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptPredicateFunctionRightValueTokenTest.java
+++
b/features/encrypt/core/src/test/java/org/apache/shardingsphere/encrypt/rewrite/pojo/EncryptPredicateFunctionRightValueTokenTest.java
@@ -19,7 +19,7 @@ package org.apache.shardingsphere.encrypt.rewrite.pojo;
import
org.apache.shardingsphere.encrypt.rewrite.token.pojo.EncryptPredicateFunctionRightValueToken;
import
org.apache.shardingsphere.sql.parser.sql.common.segment.dml.expr.FunctionSegment;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Collections;
import java.util.LinkedHashMap;
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java
index 89c0f0910be..98481375902 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterDefaultShardingStrategyStatementUpdaterTest.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.sharding.distsql.handler.update.AlterDefaultSha
import
org.apache.shardingsphere.sharding.distsql.parser.statement.AlterDefaultShardingStrategyStatement;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
-import org.junit.Before;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
@@ -51,7 +51,7 @@ public final class
AlterDefaultShardingStrategyStatementUpdaterTest {
private final AlterDefaultShardingStrategyStatementUpdater updater = new
AlterDefaultShardingStrategyStatementUpdater();
- @Before
+ @BeforeEach
public void before() {
when(database.getName()).thenReturn("test");
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
index 0860a20e4ff..8857c4bb350 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/DropShardingKeyGeneratorStatementUpdaterTest.java
@@ -26,59 +26,46 @@ import
org.apache.shardingsphere.sharding.api.config.rule.ShardingAutoTableRuleC
import
org.apache.shardingsphere.sharding.api.config.strategy.keygen.KeyGenerateStrategyConfiguration;
import
org.apache.shardingsphere.sharding.distsql.handler.update.DropShardingKeyGeneratorStatementUpdater;
import
org.apache.shardingsphere.sharding.distsql.parser.statement.DropShardingKeyGeneratorStatement;
-import org.junit.Before;
import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Answers;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import java.util.Arrays;
import java.util.Collections;
import java.util.Properties;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.mock;
-@ExtendWith(MockitoExtension.class)
public final class DropShardingKeyGeneratorStatementUpdaterTest {
- @Mock(answer = Answers.RETURNS_DEEP_STUBS)
- private ShardingSphereDatabase database;
-
- private final DropShardingKeyGeneratorStatementUpdater updater = new
DropShardingKeyGeneratorStatementUpdater();
-
- @Before
- public void before() {
- when(database.getName()).thenReturn("test");
- }
-
@Test
public void assertExecuteWithNotExist() {
- assertThrows(MissingRequiredAlgorithmException.class, () ->
updater.checkSQLStatement(database, createSQLStatement("uuid_key_generator"),
new ShardingRuleConfiguration()));
+ DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(false,
Collections.singleton("uuid_key_generator"));
+ assertThrows(MissingRequiredAlgorithmException.class,
+ () -> new
DropShardingKeyGeneratorStatementUpdater().checkSQLStatement(mock(ShardingSphereDatabase.class),
sqlStatement, new ShardingRuleConfiguration()));
}
@Test
public void assertExecuteWithNotExistWithIfExists() {
DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(true,
Collections.singletonList("uuid_key_generator"));
- updater.checkSQLStatement(database, sqlStatement, new
ShardingRuleConfiguration());
+ new
DropShardingKeyGeneratorStatementUpdater().checkSQLStatement(mock(ShardingSphereDatabase.class),
sqlStatement, new ShardingRuleConfiguration());
}
@Test
public void assertDropSpecifiedKeyGenerator() {
+ DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(false,
Collections.singleton("uuid_key_generator"));
ShardingRuleConfiguration currentRuleConfig = new
ShardingRuleConfiguration();
currentRuleConfig.getKeyGenerators().put("uuid_key_generator", new
AlgorithmConfiguration("uuid", new Properties()));
-
updater.updateCurrentRuleConfiguration(createSQLStatement("uuid_key_generator"),
currentRuleConfig);
+ new
DropShardingKeyGeneratorStatementUpdater().updateCurrentRuleConfiguration(sqlStatement,
currentRuleConfig);
assertTrue(currentRuleConfig.getKeyGenerators().isEmpty());
}
@Test
public void assertExecuteWithUsed() {
+ DropShardingKeyGeneratorStatement sqlStatement = new
DropShardingKeyGeneratorStatement(false,
Collections.singleton("uuid_key_generator"));
ShardingRuleConfiguration currentRuleConfig = new
ShardingRuleConfiguration();
currentRuleConfig.getKeyGenerators().put("uuid_key_generator", new
AlgorithmConfiguration("UUID", null));
currentRuleConfig.getAutoTables().add(createShardingAutoTableRuleConfiguration());
- assertThrows(AlgorithmInUsedException.class, () ->
updater.checkSQLStatement(database, createSQLStatement("uuid_key_generator"),
currentRuleConfig));
+ assertThrows(AlgorithmInUsedException.class, () -> new
DropShardingKeyGeneratorStatementUpdater().checkSQLStatement(mock(ShardingSphereDatabase.class),
sqlStatement, currentRuleConfig));
}
private ShardingAutoTableRuleConfiguration
createShardingAutoTableRuleConfiguration() {
@@ -86,8 +73,4 @@ public final class
DropShardingKeyGeneratorStatementUpdaterTest {
result.setKeyGenerateStrategy(new
KeyGenerateStrategyConfiguration("order_id", "uuid_key_generator"));
return result;
}
-
- private DropShardingKeyGeneratorStatement createSQLStatement(final
String... keyGeneratorNames) {
- return new DropShardingKeyGeneratorStatement(false,
Arrays.asList(keyGeneratorNames));
- }
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
index 2ca69718249..d6f7d7ff918 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datanode/DataNodeTest.java
@@ -23,7 +23,7 @@ import org.junit.jupiter.api.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
public final class DataNodeTest {
@@ -56,7 +56,7 @@ public final class DataNodeTest {
assertThat(dataNode, is(new DataNode("ds_0.tbl_0")));
assertThat(dataNode, is(dataNode));
assertThat(dataNode, not(new DataNode("ds_0.tbl_1")));
- assertNotEquals(null, dataNode);
+ assertNotEquals(dataNode, null);
}
@Test
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
index efa764cd5b5..227b0c3ce47 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/datasource/props/DataSourcePropertiesTest.java
@@ -31,7 +31,7 @@ import static org.hamcrest.CoreMatchers.instanceOf;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -99,7 +99,7 @@ public final class DataSourcePropertiesTest {
@Test
public void assertNotEqualsWithNullValue() {
- assertNotEquals(null, new
DataSourceProperties(MockedDataSource.class.getName(), new HashMap<>()));
+ assertNotEquals(new
DataSourceProperties(MockedDataSource.class.getName(), new HashMap<>()), null);
}
@Test
diff --git
a/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilTest.java
b/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilTest.java
index 8d560b14649..6d3875fc4da 100644
---
a/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilTest.java
+++
b/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/CDCSchemaTableUtilTest.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseTy
import
org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.util.Arrays;
import java.util.Collection;
diff --git
a/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilTest.java
b/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilTest.java
index 39d418f226e..81a05ef8c48 100644
---
a/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilTest.java
+++
b/kernel/data-pipeline/cdc/core/src/test/java/org/apache/shardingsphere/data/pipeline/cdc/util/DataRecordResultConvertUtilTest.java
@@ -28,7 +28,7 @@ import
org.apache.shardingsphere.data.pipeline.api.ingest.record.Column;
import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord;
import
org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult.Record;
import
org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordResult.Record.Builder;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -43,7 +43,8 @@ import java.time.LocalTime;
import java.time.OffsetDateTime;
import java.time.OffsetTime;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.mock;
@@ -80,6 +81,6 @@ public final class DataRecordResultConvertUtilTest {
String print =
JsonFormat.printer().usingTypeRegistry(registry).print(expectedRecord);
Builder actualRecord = Record.newBuilder();
JsonFormat.parser().usingTypeRegistry(registry).merge(print,
actualRecord);
- assertEquals(actualRecord.build(), expectedRecord);
+ assertThat(actualRecord.build(), is(expectedRecord));
}
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
index b7d21320560..4b173bb4820 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/database/DatabaseOperateBackendHandlerFactoryTest.java
@@ -40,7 +40,7 @@ import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl
import
org.apache.shardingsphere.sql.parser.sql.dialect.statement.postgresql.ddl.PostgreSQLDropDatabaseStatement;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -83,7 +83,7 @@ public final class DatabaseOperateBackendHandlerFactoryTest {
when(ProxyContext.getInstance().databaseExists("foo_db")).thenReturn(true);
}
- @After
+ @AfterEach
public void tearDown() {
setGovernanceMetaDataContexts(false);
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
index e715c2479b7..b2473735ccc 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/dql/AdditionalDQLE2EIT.java
@@ -51,7 +51,7 @@ public final class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(TestCaseArgumentsProvider.class)
- public void
assertExecuteQueryWithResultSetTypeAndResultSetConcurrency(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
+ public void assertExecuteQueryWithResultSetTypeAndConcurrency(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
try (SingleE2EITContainerComposer containerComposer = new
SingleE2EITContainerComposer(testParam)) {
init(testParam, containerComposer);
// TODO fix e2e test blocked exception with PostgreSQL or
openGuass in #23643
@@ -69,8 +69,7 @@ public final class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(TestCaseArgumentsProvider.class)
- public void
assertExecuteQueryWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability(final
AssertionTestParameter testParam)
- throws SQLException, ParseException, JAXBException, IOException {
+ public void
assertExecuteQueryWithResultSetTypeAndConcurrencyAndHoldability(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
try (SingleE2EITContainerComposer containerComposer = new
SingleE2EITContainerComposer(testParam)) {
init(testParam, containerComposer);
// TODO fix e2e test blocked exception with PostgreSQL or
openGuass in #23643
@@ -88,7 +87,7 @@ public final class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(TestCaseArgumentsProvider.class)
- public void assertExecuteWithResultSetTypeAndResultSetConcurrency(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
+ public void assertExecuteWithResultSetTypeAndConcurrency(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
try (SingleE2EITContainerComposer containerComposer = new
SingleE2EITContainerComposer(testParam)) {
init(testParam, containerComposer);
// TODO fix e2e test blocked exception with PostgreSQL or
openGuass in #23643
@@ -106,7 +105,7 @@ public final class AdditionalDQLE2EIT extends BaseDQLE2EIT {
@ParameterizedTest(name = "{0}")
@EnabledIf("isEnabled")
@ArgumentsSource(TestCaseArgumentsProvider.class)
- public void
assertExecuteWithResultSetTypeAndResultSetConcurrencyAndResultSetHoldability(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
+ public void
assertExecuteWithResultSetTypeAndConcurrencyAndHoldability(final
AssertionTestParameter testParam) throws SQLException, ParseException,
JAXBException, IOException {
try (SingleE2EITContainerComposer containerComposer = new
SingleE2EITContainerComposer(testParam)) {
init(testParam, containerComposer);
// TODO fix e2e test blocked exception with PostgreSQL or
openGuass in #23643
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/ParallelParameterized.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/ParallelParameterized.java
deleted file mode 100644
index 9834a5cccf0..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/ParallelParameterized.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner;
-
-import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
-import
org.apache.shardingsphere.test.e2e.env.runtime.cluster.ClusterEnvironment;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.ParallelRunnerExecutor;
-import
org.apache.shardingsphere.test.e2e.framework.runner.scheduler.ParallelRunnerScheduler;
-import org.junit.runners.Parameterized;
-
-/**
- * Parallel parameterized.
- */
-public final class ParallelParameterized extends Parameterized {
-
- // CHECKSTYLE:OFF
- public ParallelParameterized(final Class<?> clazz) throws Throwable {
- // CHECKSTYLE:ON
- super(clazz);
- if (ClusterEnvironment.Type.DOCKER !=
IntegrationTestEnvironment.getInstance().getClusterEnvironment().getType()) {
- ParallelRunningStrategy runningStrategy =
clazz.getAnnotation(ParallelRunningStrategy.class);
- if (null != runningStrategy) {
- setScheduler(new
ParallelRunnerScheduler(runningStrategy.value(), new ParallelRunnerExecutor()));
- }
- }
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/ParallelRunningStrategy.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/ParallelRunningStrategy.java
deleted file mode 100644
index a9f38fdcf7d..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/ParallelRunningStrategy.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parallel running strategy.
- */
-@Documented
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-public @interface ParallelRunningStrategy {
-
- /**
- * Get parallel level.
- *
- * @return parallel level
- */
- ParallelLevel value();
-
- /**
- * Parallel level.
- */
- enum ParallelLevel {
-
- CASE, SCENARIO
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/ParallelRunnerExecutor.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/ParallelRunnerExecutor.java
deleted file mode 100644
index 89206712e46..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/ParallelRunnerExecutor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.executor;
-
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
-
-import java.util.Collection;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-/**
- * Parallel runner executor.
- */
-public final class ParallelRunnerExecutor {
-
- private final Collection<Future<?>> futures = new CopyOnWriteArrayList<>();
-
- private final Map<Object, ExecutorService> executorServices = new
ConcurrentHashMap<>();
-
- /**
- * Execute child statement.
- *
- * @param key executor key
- * @param childStatement child statement
- */
- public void execute(final String key, final Runnable childStatement) {
- futures.add(getExecutorService(key).submit(childStatement));
- }
-
- private ExecutorService getExecutorService(final String key) {
- if (executorServices.containsKey(key)) {
- return executorServices.get(key);
- }
- String threadPoolNameFormat = String.join("-", "TestThread", key,
"%d");
- ExecutorService executorService = Executors.newFixedThreadPool(
- Runtime.getRuntime().availableProcessors(), new
ThreadFactoryBuilder().setDaemon(true).setNameFormat(threadPoolNameFormat).build());
- if (null != executorServices.putIfAbsent(key, executorService)) {
- executorService.shutdownNow();
- }
- return executorServices.get(key);
- }
-
- /**
- * Finish tasks.
- */
- public void finished() {
- futures.forEach(each -> {
- try {
- each.get();
- } catch (final InterruptedException | ExecutionException ignored) {
- }
- });
- executorServices.values().forEach(ExecutorService::shutdownNow);
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
deleted file mode 100644
index 548ddffac38..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.executor.key;
-
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
-
-/**
- * Parallel runner executor key provider.
- */
-public interface ParallelRunnerExecutorKeyProvider {
-
- /**
- * Get key.
- *
- * @param testParam test parameter
- * @return parallel runner executor key
- */
- String getKey(E2ETestParameter testParam);
-
- /**
- * Get parallel level.
- *
- * @return parallel level
- */
- ParallelLevel getParallelLevel();
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProviderFactory.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProviderFactory.java
deleted file mode 100644
index 1c9968b0acd..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/ParallelRunnerExecutorKeyProviderFactory.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.executor.key;
-
-import lombok.AccessLevel;
-import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.key.impl.CaseParallelRunnerExecutorKeyProvider;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.key.impl.ScenarioParallelRunnerExecutorKeyProvider;
-
-/**
- * Parallel runner executor key provider factory.
- */
-@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ParallelRunnerExecutorKeyProviderFactory {
-
- /**
- * Create new instance of parallel runner executor key provider.
- *
- * @param parallelLevel parallel level
- * @return created instance
- */
- public static ParallelRunnerExecutorKeyProvider newInstance(final
ParallelLevel parallelLevel) {
- switch (parallelLevel) {
- case CASE:
- return new CaseParallelRunnerExecutorKeyProvider();
- case SCENARIO:
- return new ScenarioParallelRunnerExecutorKeyProvider();
- default:
- throw new UnsupportedOperationException(parallelLevel.name());
- }
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
deleted file mode 100644
index 9eaf7c2f2a5..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/CaseParallelRunnerExecutorKeyProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.executor.key.impl;
-
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.key.ParallelRunnerExecutorKeyProvider;
-
-/**
- * Case parallel runner executor key provider.
- */
-public final class CaseParallelRunnerExecutorKeyProvider implements
ParallelRunnerExecutorKeyProvider {
-
- @Override
- public String getKey(final E2ETestParameter testParam) {
- return testParam.getDatabaseType().getType();
- }
-
- @Override
- public ParallelLevel getParallelLevel() {
- return ParallelLevel.CASE;
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
deleted file mode 100644
index f459d756d60..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/executor/key/impl/ScenarioParallelRunnerExecutorKeyProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.executor.key.impl;
-
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import
org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.key.ParallelRunnerExecutorKeyProvider;
-
-/**
- * Scenario parallel runner executor key provider.
- */
-public final class ScenarioParallelRunnerExecutorKeyProvider implements
ParallelRunnerExecutorKeyProvider {
-
- @Override
- public String getKey(final E2ETestParameter testParam) {
- return String.join("-", testParam.getAdapter(),
testParam.getScenario(), testParam.getDatabaseType().getType());
- }
-
- @Override
- public ParallelLevel getParallelLevel() {
- return ParallelLevel.SCENARIO;
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java
deleted file mode 100644
index 32d51ebe885..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/param/RunnerParameters.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.param;
-
-import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
-import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
-import org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters;
-import org.mockito.internal.configuration.plugins.Plugins;
-
-/**
- * Runner parameters.
- */
-@RequiredArgsConstructor
-public final class RunnerParameters {
-
- private final Runnable childStatement;
-
- /**
- * Get test parameter.
- *
- * @return test parameter
- */
- @SneakyThrows(ReflectiveOperationException.class)
- public E2ETestParameter getTestParameter() {
- Object[] params = (Object[])
Plugins.getMemberAccessor().get(BlockJUnit4ClassRunnerWithParameters.class.getDeclaredField("parameters"),
getRunner());
- return (E2ETestParameter) params[0];
- }
-
- @SneakyThrows(ReflectiveOperationException.class)
- private Object getRunner() {
- return
Plugins.getMemberAccessor().get(childStatement.getClass().getDeclaredField("val$each"),
childStatement);
- }
-}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/scheduler/ParallelRunnerScheduler.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/scheduler/ParallelRunnerScheduler.java
deleted file mode 100644
index ab77fe90dce..00000000000
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/runner/scheduler/ParallelRunnerScheduler.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.framework.runner.scheduler;
-
-import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.framework.runner.ParallelRunningStrategy.ParallelLevel;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.ParallelRunnerExecutor;
-import
org.apache.shardingsphere.test.e2e.framework.runner.executor.key.ParallelRunnerExecutorKeyProviderFactory;
-import
org.apache.shardingsphere.test.e2e.framework.runner.param.RunnerParameters;
-import org.junit.runners.model.RunnerScheduler;
-
-/**
- * Parallel runner scheduler.
- */
-@RequiredArgsConstructor
-public final class ParallelRunnerScheduler implements RunnerScheduler {
-
- private final ParallelLevel parallelLevel;
-
- private final ParallelRunnerExecutor executor;
-
- @Override
- public void schedule(final Runnable childStatement) {
-
executor.execute(ParallelRunnerExecutorKeyProviderFactory.newInstance(parallelLevel).getKey(new
RunnerParameters(childStatement).getTestParameter()), childStatement);
- }
-
- @Override
- public void finished() {
- executor.finished();
- }
-}
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
index 731ccf778f0..940b2183fda 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/commitrollback/ExceptionInTransactionTestCase.java
@@ -28,9 +28,9 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
-import static org.hamcrest.Matchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
+import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* An exception occurred within the transaction integration test.
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
index 9e12d9fda63..76995f8fdcb 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/cursor/OpenGaussCursorTestCase.java
@@ -34,8 +34,8 @@ import java.util.Objects;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* OpenGauss cursor transaction integration test.
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
index 66708cea375..c6cbc7c32af 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/MySQLSetReadOnlyTestCase.java
@@ -27,7 +27,7 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* MySQL set read only transaction integration test.
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
index cb425907c93..db1120dfa79 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/readonly/PostgreSQLSetReadOnlyTestCase.java
@@ -22,12 +22,13 @@ import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBas
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionContainerComposer;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionTestCase;
import
org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
-import org.junit.Assert;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
+import static org.junit.jupiter.api.Assertions.fail;
+
/**
* PostgreSQL set read only transaction integration test.
*/
@@ -55,7 +56,7 @@ public final class PostgreSQLSetReadOnlyTestCase extends
SetReadOnlyTestCase {
executeWithLog(connection2, "update account set balance = 100
where id = 2;");
log.info("Using the driver of postgresql:42.4.1 expect to update
successfully.");
} catch (final SQLException ex) {
- Assert.fail("Update failed, should be successfully.");
+ fail("Update failed, should be successfully.");
}
}
}
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
index cddd2fda1a1..611f7e2b8fd 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/OpenGaussSavePointTestCase.java
@@ -30,7 +30,7 @@ import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* OpenGauss savepoint transaction integration test.
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
index 2013c8c9062..db287b7ed29 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/savepoint/PostgreSQLSavePointTestCase.java
@@ -31,7 +31,7 @@ import java.sql.SQLException;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* PostgreSQL savepoint transaction integration test.
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
index 5ad018bc7c3..29134ef484e 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/cases/truncate/MySQLXATruncateTestCase.java
@@ -30,7 +30,7 @@ import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.fail;
/**
* MySQL truncate XA transaction integration test.
diff --git
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java
index 3dca89ceaed..3ea10492cea 100644
---
a/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java
+++
b/test/it/parser/src/main/java/org/apache/shardingsphere/test/it/sql/parser/internal/asserts/statement/ral/impl/updatable/LockClusterStatementAssert.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.test.it.sql.parser.internal.cases.parser.jaxb.s
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
/**
* Lock cluster statement assert.
@@ -43,7 +43,7 @@ public final class LockClusterStatementAssert {
public static void assertIs(final SQLCaseAssertContext assertContext,
final LockClusterStatement actual,
final LockClusterStatementTestCase expected) {
if (null == expected) {
- assertNull(assertContext.getText("Actual statement should not
exist."), actual);
+ assertNull(actual, assertContext.getText("Actual statement should
not exist."));
} else {
assertThat(actual.getLockStrategy(),
is(expected.getLockStrategy()));
}
