Use junit5.

Author: ujjboy

dubbo-config/dubbo-config-spring/pom.xml

@@ -120,6 +120,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
         <dependency>

dubbo-dependencies-bom/pom.xml

@@ -140,7 +140,6 @@
         <hessian_lite_version>3.2.5</hessian_lite_version>
         <swagger_version>1.5.19</swagger_version>
         <spring_test_version>4.3.16.RELEASE</spring_test_version>
-        <junit_version>4.12</junit_version>
         <metrics_version>2.0.1</metrics_version>
         <sofa_registry_version>5.2.0</sofa_registry_version>
         <gson_version>2.8.5</gson_version>
@@ -526,11 +525,6 @@
             </dependency>
 
             <!-- Test lib -->
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>${junit_version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
                 <artifactId>curator-test</artifactId>

dubbo-registry/dubbo-registry-sofa/pom.xml

@@ -111,10 +111,14 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
 

dubbo-registry/dubbo-registry-sofa/src/test/java/org/apache/dubbo/registry/sofa/SofaRegistryTest.java

@@ -24,10 +24,10 @@
 import org.apache.dubbo.config.ReferenceConfig;
 import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.config.ServiceConfig;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 /**
  */
@@ -45,9 +45,9 @@ public class SofaRegistryTest {
 
     private static RegistryConfig registryConfig;
 
-    @BeforeClass
+    @BeforeAll
     public static void beforeClass() {
-        
+
         protocolConfig1 = new ProtocolConfig();
         protocolConfig1.setName("dubbo");
         protocolConfig1.setPort(20890);
@@ -59,7 +59,7 @@ public static void beforeClass() {
         registryConfig = new RegistryConfig();
         registryConfig.setAddress("sofa://127.0.0.1:9603");
         registryConfig.setProtocol("sofa");
-        
+
         registryMain = new TestRegistryMain();
         try {
             registryMain.startRegistry();
@@ -79,7 +79,7 @@ public void testPubAndSub() throws InterruptedException {
         serviceConfig1.setGroup("g1");
         serviceConfig1.setApplication(applicationConfig);
         serviceConfig1.export();
-        
+
         ServiceConfig<HelloService> serviceConfig2 = new ServiceConfig<>();
         serviceConfig2.setInterface(HelloService.class);
         serviceConfig2.setRef(new HelloServiceImpl("rrr22"));
@@ -90,8 +90,8 @@ public void testPubAndSub() throws InterruptedException {
         serviceConfig2.setRegister(false);
         serviceConfig2.export();
 
-        Thread.sleep(1000); 
-        
+        Thread.sleep(1000);
+
         // do refer
         ReferenceConfig<HelloService> referenceConfig1 = new ReferenceConfig<>();
         referenceConfig1.setInterface(HelloService.class);
@@ -101,7 +101,7 @@ public void testPubAndSub() throws InterruptedException {
         referenceConfig1.setRegistry(registryConfig);
         referenceConfig1.setApplication(applicationConfig);
         HelloService service = referenceConfig1.get();
-        Assert.assertEquals("rrr11", service.sayHello("xxx"));
+        Assertions.assertEquals("rrr11", service.sayHello("xxx"));
 
         // do refer duplicated
         ReferenceConfig<HelloService> referenceConfig2 = new ReferenceConfig<>();
@@ -112,7 +112,7 @@ public void testPubAndSub() throws InterruptedException {
         referenceConfig2.setRegistry(registryConfig);
         referenceConfig2.setApplication(applicationConfig);
         HelloService service2 = referenceConfig2.get();
-        Assert.assertEquals("rrr11", service2.sayHello("xxx"));
+        Assertions.assertEquals("rrr11", service2.sayHello("xxx"));
 
         // export on service
         ServiceConfig<HelloService> serviceConfig3 = new ServiceConfig<>();
@@ -123,19 +123,19 @@ public void testPubAndSub() throws InterruptedException {
         serviceConfig3.setGroup("g1");
         serviceConfig3.setApplication(applicationConfig);
         serviceConfig3.export();
-        Assert.assertTrue(service2.sayHello("xxx").startsWith("rrr1"));
+        Assertions.assertTrue(service2.sayHello("xxx").startsWith("rrr1"));
 
         // unrefer
         referenceConfig1.destroy();
-        Assert.assertTrue(service2.sayHello("xxx").startsWith("rrr1"));
-        
+        Assertions.assertTrue(service2.sayHello("xxx").startsWith("rrr1"));
+
         // unexport on service
         serviceConfig1.unexport();
         Thread.sleep(2000);
-        Assert.assertTrue(service2.sayHello("xxx").startsWith("rrr1"));
+        Assertions.assertTrue(service2.sayHello("xxx").startsWith("rrr1"));
     }
 
-    @AfterClass
+    @AfterAll
     public static void afterClass() {
         try {
             registryMain.stopRegistry();