This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 132c20b Remove usage of classes in Junit 4
132c20b is described below
commit 132c20b0831c79a63374af4cce9cd6a10c659413
Author: ken.lj <[email protected]>
AuthorDate: Tue Jan 22 18:52:16 2019 +0800
Remove usage of classes in Junit 4
---
.../dubbo/rpc/cluster/router/ConfigConditionRouterTest.java | 4 ++--
.../java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java | 4 ++--
.../java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java | 3 ++-
.../test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java | 7 ++++---
.../test/java/org/apache/dubbo/config/ReferenceConfigTest.java | 6 ++++--
.../src/test/java/org/apache/dubbo/config/ServiceConfigTest.java | 3 ++-
.../dubbo/config/spring/schema/DubboNamespaceHandlerTest.java | 8 ++++----
.../test/java/org/apache/dubbo/rpc/validation/ValidationTest.java | 6 ++++--
8 files changed, 24 insertions(+), 17 deletions(-)
diff --git
a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/ConfigConditionRouterTest.java
b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/ConfigConditionRouterTest.java
index 0e864c7..1235869 100644
---
a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/ConfigConditionRouterTest.java
+++
b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/ConfigConditionRouterTest.java
@@ -20,10 +20,10 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-import org.junit.Ignore;
-@Ignore("FIXME This is not a formal UT")
+@Disabled("FIXME This is not a formal UT")
public class ConfigConditionRouterTest {
private static CuratorFramework client;
diff --git
a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java
b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java
index c9fb8b2..98cdaf4 100644
---
a/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java
+++
b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/TagRouterTest.java
@@ -19,11 +19,11 @@ package org.apache.dubbo.rpc.cluster.router;
import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.retry.ExponentialBackoffRetry;
-
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
-@Ignore("FIXME This is not a formal UT")
+@Disabled("FIXME This is not a formal UT")
public class TagRouterTest {
private static CuratorFramework client;
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
index 2d82f45..f0d1a80 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java
@@ -30,6 +30,7 @@ import org.apache.dubbo.monitor.MonitorService;
import org.apache.dubbo.registry.RegistryService;
import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -62,7 +63,7 @@ public class AbstractInterfaceConfigTest {
System.clearProperty(Constants.DUBBO_PROPERTIES_KEY);
}
- @After
+ @AfterEach
public void tearMethodAfterEachUT() {
ConfigManager.getInstance().clear();
}
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
index f5ace5c..96e5582 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConfigCenterConfigTest.java
@@ -19,13 +19,14 @@
package org.apache.dubbo.config;
-import junit.framework.TestCase;
-import org.junit.Test;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ConfigCenterConfigTest {
@Test
public void testPrefix() {
ConfigCenterConfig config = new ConfigCenterConfig();
- TestCase.assertEquals("dubbo.config-center", config.getPrefix());
+ Assertions.assertEquals("dubbo.config-center", config.getPrefix());
}
}
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
index 2cbff57..7c0c759 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java
@@ -21,17 +21,19 @@ import org.apache.dubbo.config.api.DemoService;
import org.apache.dubbo.config.context.ConfigManager;
import org.apache.dubbo.config.provider.impl.DemoServiceImpl;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
public class ReferenceConfigTest {
- @Before
+ @BeforeEach
public void setUp() {
ConfigManager.getInstance().clear();
}
- @After
+ @AfterEach
public void tearDown() {
ConfigManager.getInstance().clear();
}
diff --git
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
index 774120e..1030bf3 100644
---
a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
+++
b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java
@@ -32,6 +32,7 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Protocol;
import org.apache.dubbo.rpc.service.GenericService;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
@@ -106,7 +107,7 @@ public class ServiceConfigTest {
ConfigManager.getInstance().clear();
}
- @After
+ @AfterEach
public void tearDown() {
ConfigManager.getInstance().clear();
}
diff --git
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
index b031353..90f341f 100644
---
a/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
+++
b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java
@@ -27,13 +27,13 @@ import org.apache.dubbo.config.spring.ServiceBean;
import org.apache.dubbo.config.spring.api.DemoService;
import org.apache.dubbo.config.spring.impl.DemoServiceImpl;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import java.io.IOException;
import java.util.Map;
import static org.hamcrest.CoreMatchers.is;
@@ -42,12 +42,12 @@ import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.MatcherAssert.assertThat;
public class DubboNamespaceHandlerTest {
- @Before
+ @BeforeEach
public void setUp() {
ConfigManager.getInstance().clear();
}
- @After
+ @AfterEach
public void tearDown() {
ConfigManager.getInstance().clear();
}
diff --git
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
index 99a191c..691f925 100644
---
a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
+++
b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/validation/ValidationTest.java
@@ -28,7 +28,9 @@ import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import javax.validation.ConstraintViolation;
@@ -46,12 +48,12 @@ public class ValidationTest {
private RegistryConfig registryNA = new RegistryConfig("N/A");
private ProtocolConfig protocolDubo29582 = new ProtocolConfig("dubbo",
29582);
- @Before
+ @BeforeEach
public void setUp() {
ConfigManager.getInstance().clear();
}
- @After
+ @AfterEach
public void tearDown() {
ConfigManager.getInstance().clear();
}
