[shardingsphere] branch master updated: Upgrade junit 5 on distsql modules (#24452)

[su...@apache.org]

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 1de440c0bc9 Upgrade junit 5 on distsql modules (#24452)
1de440c0bc9 is described below

commit 1de440c0bc9c779ce5516d1957c0cfeb3f92aa49
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Mar 4 11:30:16 2023 +0800

    Upgrade junit 5 on distsql modules (#24452)
---
 .../distsql/parser/rdl/RegisterStorageUnitTest.java          | 12 ++++++------
 .../segment/converter/DataSourceSegmentsConverterTest.java   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/distsql/parser/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java b/distsql/parser/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
index ff09e10eb8c..d9b30b253c0 100644
--- a/distsql/parser/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
+++ b/distsql/parser/src/test/java/org/apache/shardingsphere/distsql/parser/rdl/RegisterStorageUnitTest.java
@@ -20,15 +20,15 @@ package org.apache.shardingsphere.distsql.parser.rdl;
 import org.apache.shardingsphere.distsql.parser.engine.api.DistSQLStatementParserEngine;
 import org.apache.shardingsphere.distsql.parser.segment.URLBasedDataSourceSegment;
 import org.apache.shardingsphere.distsql.parser.statement.rdl.create.RegisterStorageUnitStatement;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-@RunWith(MockitoJUnitRunner.class)
-public class RegisterStorageUnitTest {
+@ExtendWith(MockitoExtension.class)
+public final class RegisterStorageUnitTest {
     
     @Test
     public void assertRegisterStorageUnitSpecialCharacters() {
diff --git a/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java b/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
index 6a6b69b02c3..6a24cf87833 100644
--- a/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
+++ b/distsql/statement/src/test/java/org/apache/shardingsphere/distsql/parser/segment/converter/DataSourceSegmentsConverterTest.java
@@ -24,7 +24,7 @@ import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
 import org.apache.shardingsphere.infra.datasource.props.DataSourceProperties;
 import org.apache.shardingsphere.test.util.PropertiesBuilder;
 import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -34,7 +34,7 @@ import java.util.Properties;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public final class DataSourceSegmentsConverterTest {