You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2022/05/17 07:39:59 UTC
[servicecomb-java-chassis] branch master updated: [SCB-2475] migrate to junit5 demo dynamic-config part1 (#2910)
This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
The following commit(s) were added to refs/heads/master by this push:
new d8f528fb2 [SCB-2475] migrate to junit5 demo dynamic-config part1 (#2910)
d8f528fb2 is described below
commit d8f528fb26003777e3c2aec0ed32c0a1e3b3302d
Author: ZhangJian He <sh...@gmail.com>
AuthorDate: Tue May 17 15:39:54 2022 +0800
[SCB-2475] migrate to junit5 demo dynamic-config part1 (#2910)
---
.../springboot/jaxrs/SpringBootJaxrsIT.java | 10 +++------
.../springmvc/client/SpringmvcClientIT.java | 9 +++-----
.../servicecomb/deployment/TestDeployment.java | 6 +++---
.../sources/ApolloConfigurationSourceImplTest.java | 18 ++++++++--------
.../config/client/ApolloClientTest.java | 21 ++++++++-----------
.../config/client/ApolloConfigTest.java | 24 +++++++++++-----------
.../ConfigCenterConfigurationSourceImplTest.java | 12 +++++------
.../config/center/client/AddressManagerTest.java | 22 ++++++++++----------
.../TestConfigCenterDefaultDeploymentProvider.java | 24 +++++++++++-----------
.../TestKieCenterDefaultDeploymentProvider.java | 24 +++++++++++-----------
.../sources/NacosConfigurationSourceImplTest.java | 24 ++++++++++------------
.../config/nacos/client/NacosClientTest.java | 20 ++++++++----------
.../config/nacos/client/NacosConfigTest.java | 14 ++++++-------
13 files changed, 107 insertions(+), 121 deletions(-)
diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/test/java/org/apache/servicecomb/springboot/jaxrs/SpringBootJaxrsIT.java b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/test/java/org/apache/servicecomb/springboot/jaxrs/SpringBootJaxrsIT.java
index 638c1c30a..d5152c98f 100644
--- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/test/java/org/apache/servicecomb/springboot/jaxrs/SpringBootJaxrsIT.java
+++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/src/test/java/org/apache/servicecomb/springboot/jaxrs/SpringBootJaxrsIT.java
@@ -17,14 +17,11 @@
package org.apache.servicecomb.springboot.jaxrs;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.fail;
-
import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.springboot.jaxrs.client.JaxrsClient;
-import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class SpringBootJaxrsIT {
@@ -37,11 +34,10 @@ public class SpringBootJaxrsIT {
public void clientGetsNoError() throws Exception {
try {
JaxrsClient.main(new String[0]);
-
- MatcherAssert.assertThat(TestMgr.errors().isEmpty(), is(true));
+ Assertions.assertTrue(TestMgr.errors().isEmpty());
} catch (Throwable e) {
e.printStackTrace();
- fail("test case failed, message=" + e.getMessage());
+ Assertions.fail("test case failed, message=" + e.getMessage());
}
}
}
diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/test/java/org/apache/servicecomb/springboot/springmvc/client/SpringmvcClientIT.java b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/test/java/org/apache/servicecomb/springboot/springmvc/client/SpringmvcClientIT.java
index 93ca1356a..661c8384a 100644
--- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/test/java/org/apache/servicecomb/springboot/springmvc/client/SpringmvcClientIT.java
+++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/src/test/java/org/apache/servicecomb/springboot/springmvc/client/SpringmvcClientIT.java
@@ -17,13 +17,10 @@
package org.apache.servicecomb.springboot.springmvc.client;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.fail;
-
import org.apache.servicecomb.demo.TestMgr;
-import org.hamcrest.MatcherAssert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class SpringmvcClientIT {
@Before
@@ -36,10 +33,10 @@ public class SpringmvcClientIT {
try {
SpringmvcClient.main(new String[0]);
- MatcherAssert.assertThat(TestMgr.errors().isEmpty(), is(true));
+ Assertions.assertTrue(TestMgr.errors().isEmpty());
} catch (Throwable e) {
e.printStackTrace();
- fail("test case failed, message=" + e.getMessage());
+ Assertions.fail("test case failed, message=" + e.getMessage());
}
}
}
diff --git a/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java b/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
index b626381cf..60552bae6 100644
--- a/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
+++ b/deployment/src/test/java/org/apache/servicecomb/deployment/TestDeployment.java
@@ -20,8 +20,8 @@ package org.apache.servicecomb.deployment;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestDeployment {
@After
@@ -33,7 +33,7 @@ public class TestDeployment {
public void testConfiguration() {
CustomDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo("TestCenter");
- Assert.assertEquals(info.getAccessURL().get(0), "http://localhost/custom");
- Assert.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
+ Assertions.assertEquals("http://localhost/custom", info.getAccessURL().get(0));
+ Assertions.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
}
}
diff --git a/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java b/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
index 6c8790d35..ecbe861d7 100644
--- a/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
+++ b/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/archaius/sources/ApolloConfigurationSourceImplTest.java
@@ -25,8 +25,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import com.netflix.config.WatchedUpdateListener;
@@ -38,7 +38,7 @@ public class ApolloConfigurationSourceImplTest {
public void testCreate() throws Exception {
ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
- apolloConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getAdded().isEmpty()));
+ apolloConfigurationSource.addUpdateListener(result -> Assertions.assertFalse(result.getAdded().isEmpty()));
UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
Map<String, Object> createItems = new HashMap<>();
createItems.put("testKey", "testValue");
@@ -49,7 +49,7 @@ public class ApolloConfigurationSourceImplTest {
public void testUpdate() throws Exception {
ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
- apolloConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getChanged().isEmpty()));
+ apolloConfigurationSource.addUpdateListener(result -> Assertions.assertFalse(result.getChanged().isEmpty()));
UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
Map<String, Object> updateItems = new HashMap<>();
updateItems.put("testKey", "testValue");
@@ -59,14 +59,14 @@ public class ApolloConfigurationSourceImplTest {
@Test
public void testDelete() throws Exception {
ApolloConfigurationSourceImpl apolloConfigurationSource = new ApolloConfigurationSourceImpl();
- apolloConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getDeleted().isEmpty()));
- UpdateHandler udateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
+ apolloConfigurationSource.addUpdateListener(result -> Assertions.assertFalse(result.getDeleted().isEmpty()));
+ UpdateHandler updateHandler = Deencapsulation.getField(apolloConfigurationSource, UpdateHandler.class);
Map<String, Object> deleteItems = new HashMap<>();
deleteItems.put("testKey", "testValue");
apolloConfigurationSource.getCurrentData().put("testKey", "testValue");
- udateHandler.handle(DELETE, deleteItems);
- Assert.assertTrue(apolloConfigurationSource.getCurrentData().isEmpty());
+ updateHandler.handle(DELETE, deleteItems);
+ Assertions.assertTrue(apolloConfigurationSource.getCurrentData().isEmpty());
}
@Test
@@ -75,6 +75,6 @@ public class ApolloConfigurationSourceImplTest {
WatchedUpdateListener watchedUpdateListener = Mockito.mock(WatchedUpdateListener.class);
apolloConfigurationSource.addUpdateListener(watchedUpdateListener);
apolloConfigurationSource.removeUpdateListener(watchedUpdateListener);
- Assert.assertTrue(apolloConfigurationSource.getCurrentListeners().isEmpty());
+ Assertions.assertTrue(apolloConfigurationSource.getCurrentListeners().isEmpty());
}
}
diff --git a/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloClientTest.java b/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloClientTest.java
index 269050fa6..4d015cf46 100644
--- a/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloClientTest.java
+++ b/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloClientTest.java
@@ -24,9 +24,9 @@ import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl;
import org.apache.servicecomb.config.archaius.sources.ApolloConfigurationSourceImpl.UpdateHandler;
import org.apache.servicecomb.config.client.ApolloClient.ConfigRefresh;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import org.springframework.http.HttpEntity;
@@ -38,7 +38,7 @@ import org.springframework.web.client.RestTemplate;
import mockit.Deencapsulation;
public class ApolloClientTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() {
ApolloConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
@@ -64,7 +64,7 @@ public class ApolloClientTest {
cr.run();
Map<String, Object> originMap = Deencapsulation.getField(apolloClient, "originalConfigMap");
- Assert.assertEquals(1, originMap.size());
+ Assertions.assertEquals(1, originMap.size());
}
@Test
@@ -84,32 +84,29 @@ public class ApolloClientTest {
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
- status = true;
before.put("test", "testValue");
try {
Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
- status = true;
after.put("test", "testValue2");
try {
Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
- status = true;
try {
Deencapsulation.invoke(cr, "compareChangedConfig", before, after);
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
}
}
diff --git a/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloConfigTest.java b/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloConfigTest.java
index d96b5d894..dfcdbbeb9 100644
--- a/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloConfigTest.java
+++ b/dynamic-config/config-apollo/src/test/java/org/apache/servicecomb/config/client/ApolloConfigTest.java
@@ -18,12 +18,12 @@
package org.apache.servicecomb.config.client;
import org.apache.servicecomb.config.ConfigUtil;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class ApolloConfigTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() {
ApolloConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
}
@@ -31,13 +31,13 @@ public class ApolloConfigTest {
@Test
public void getServiceName() {
ApolloConfig instance = ApolloConfig.INSTANCE;
- Assert.assertEquals("apollo-test", instance.getServiceName());
- Assert.assertEquals("http://127.0.0.1:8070", instance.getServerUri());
- Assert.assertEquals("DEV", instance.getEnv());
- Assert.assertEquals("test-cluster", instance.getServerClusters());
- Assert.assertEquals("application", instance.getNamespace());
- Assert.assertEquals("xxx", instance.getToken());
- Assert.assertEquals(30, instance.getRefreshInterval());
- Assert.assertEquals(0, instance.getFirstRefreshInterval());
+ Assertions.assertEquals("apollo-test", instance.getServiceName());
+ Assertions.assertEquals("http://127.0.0.1:8070", instance.getServerUri());
+ Assertions.assertEquals("DEV", instance.getEnv());
+ Assertions.assertEquals("test-cluster", instance.getServerClusters());
+ Assertions.assertEquals("application", instance.getNamespace());
+ Assertions.assertEquals("xxx", instance.getToken());
+ Assertions.assertEquals(30, instance.getRefreshInterval());
+ Assertions.assertEquals(0, instance.getFirstRefreshInterval());
}
}
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java
index 40dbec8bf..b40df787f 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/ConfigCenterConfigurationSourceImplTest.java
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.servicecomb.config.center.client.AddressManager;
import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.http.client.event.RefreshEndpointEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import mockit.Deencapsulation;
@@ -39,16 +39,16 @@ class ConfigCenterConfigurationSourceImplTest {
addresses.add("http://127.0.0.1:30103");
addresses.add("http://127.0.0.2:30103");
AddressManager addressManager = new AddressManager("test", addresses, EventManager.getEventBus());
- Assert.assertNotNull(addressManager);
+ Assertions.assertNotNull(addressManager);
String address = addressManager.address();
- Assert.assertEquals("http://127.0.0.2:30103/v3/test", address);
+ Assertions.assertEquals("http://127.0.0.2:30103/v3/test", address);
address = addressManager.address();
- Assert.assertEquals("http://127.0.0.1:30103/v3/test", address);
+ Assertions.assertEquals("http://127.0.0.1:30103/v3/test", address);
addressManager = new AddressManager(null, addresses, EventManager.getEventBus());
address = addressManager.address();
- Assert.assertEquals("http://127.0.0.2:30103/v3/default", address);
+ Assertions.assertEquals("http://127.0.0.2:30103/v3/default", address);
}
@Test
@@ -65,6 +65,6 @@ class ConfigCenterConfigurationSourceImplTest {
addressManager.onRefreshEndpointEvent(event);
List<String> availableAZ = Deencapsulation.getField(addressManager, "availableZone");
- Assert.assertEquals("https://127.0.0.1:30100/v3/test", availableAZ.get(0));
+ Assertions.assertEquals("https://127.0.0.1:30100/v3/test", availableAZ.get(0));
}
}
\ No newline at end of file
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java
index e8d5dcdd1..958a6a16b 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/center/client/AddressManagerTest.java
@@ -23,7 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.servicecomb.http.client.event.RefreshEndpointEvent;
-import org.junit.Assert;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import com.google.common.eventbus.EventBus;
@@ -44,16 +44,16 @@ class AddressManagerTest {
addressManager1 = new AddressManager("project", addresses, new EventBus());
addressManager2 = new AddressManager(null, addresses, new EventBus());
- Assert.assertNotNull(addressManager1);
- Assert.assertNotNull(addressManager2);
+ Assertions.assertNotNull(addressManager1);
+ Assertions.assertNotNull(addressManager2);
List<String> addresses = Deencapsulation.getField(addressManager1, "addresses");
- Assert.assertEquals(2, addresses.size());
- Assert.assertEquals("http://127.0.0.1:30103/v3/project", addresses.get(0));
+ Assertions.assertEquals(2, addresses.size());
+ Assertions.assertEquals("http://127.0.0.1:30103/v3/project", addresses.get(0));
- Assert.assertEquals("https://127.0.0.2:30103/v3/project", addressManager1.address());
- Assert.assertEquals("http://127.0.0.1:30103/v3/project", addressManager1.address());
- Assert.assertEquals("https://127.0.0.2:30103/v3/default", addressManager2.address());
+ Assertions.assertEquals("https://127.0.0.2:30103/v3/project", addressManager1.address());
+ Assertions.assertEquals("http://127.0.0.1:30103/v3/project", addressManager1.address());
+ Assertions.assertEquals("https://127.0.0.2:30103/v3/default", addressManager2.address());
}
@Test
@@ -70,11 +70,11 @@ class AddressManagerTest {
addressManager1.refreshEndpoint(event, "CseConfigCenter");
List<String> availableZone = Deencapsulation.getField(addressManager1, "availableZone");
- Assert.assertEquals("http://127.0.0.3:30100/v3/project", availableZone.get(0));
+ Assertions.assertEquals("http://127.0.0.3:30100/v3/project", availableZone.get(0));
List<String> availableRegion = Deencapsulation.getField(addressManager1, "availableRegion");
- Assert.assertEquals("http://127.0.0.4:30100/v3/project", availableRegion.get(0));
+ Assertions.assertEquals("http://127.0.0.4:30100/v3/project", availableRegion.get(0));
- Assert.assertEquals("http://127.0.0.3:30100/v3/project", addressManager1.address());
+ Assertions.assertEquals("http://127.0.0.3:30100/v3/project", addressManager1.address());
}
}
\ No newline at end of file
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/collect/TestConfigCenterDefaultDeploymentProvider.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/collect/TestConfigCenterDefaultDeploymentProvider.java
index 597c31f3d..540ac2c52 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/collect/TestConfigCenterDefaultDeploymentProvider.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/collect/TestConfigCenterDefaultDeploymentProvider.java
@@ -21,18 +21,18 @@ import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.deployment.Deployment;
import org.apache.servicecomb.deployment.SystemBootstrapInfo;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+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 TestConfigCenterDefaultDeploymentProvider {
- @Before
+ @BeforeEach
public void start() {
ArchaiusUtils.resetConfig();
}
- @After
+ @AfterEach
public void tearDown() {
ArchaiusUtils.resetConfig();
}
@@ -41,8 +41,8 @@ public class TestConfigCenterDefaultDeploymentProvider {
public void testConfiguration() {
ConfigCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
- Assert.assertEquals(info.getAccessURL().get(0), "https://172.16.8.7:30103");
- Assert.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
+ Assertions.assertEquals("https://172.16.8.7:30103", info.getAccessURL().get(0));
+ Assertions.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
}
@Test
@@ -50,7 +50,7 @@ public class TestConfigCenterDefaultDeploymentProvider {
System.setProperty("servicecomb.config.client.serverUri", "https://localhost:9988");
ConfigCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
- Assert.assertEquals(info.getAccessURL().get(0), "https://localhost:9988");
+ Assertions.assertEquals("https://localhost:9988", info.getAccessURL().get(0));
System.getProperties().remove("servicecomb.config.client.serverUri");
}
@@ -59,9 +59,9 @@ public class TestConfigCenterDefaultDeploymentProvider {
System.setProperty("servicecomb.config.client.serverUri", "https://localhost:9988,https://localhost:9987");
ConfigCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(ConfigCenterDefaultDeploymentProvider.SYSTEM_KEY_CONFIG_CENTER);
- Assert.assertEquals(info.getAccessURL().size(), 2);
- Assert.assertEquals(info.getAccessURL().get(0), "https://localhost:9988");
- Assert.assertEquals(info.getAccessURL().get(1), "https://localhost:9987");
+ Assertions.assertEquals(2, info.getAccessURL().size());
+ Assertions.assertEquals("https://localhost:9988", info.getAccessURL().get(0));
+ Assertions.assertEquals("https://localhost:9987", info.getAccessURL().get(1));
System.getProperties().remove("servicecomb.config.client.serverUri");
}
}
diff --git a/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java b/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
index 852b9dd10..805336c23 100644
--- a/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
+++ b/dynamic-config/config-kie/src/test/java/org/apache/servicecomb/config/kie/collect/TestKieCenterDefaultDeploymentProvider.java
@@ -21,18 +21,18 @@ import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.deployment.Deployment;
import org.apache.servicecomb.deployment.SystemBootstrapInfo;
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
+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 TestKieCenterDefaultDeploymentProvider {
- @Before
+ @BeforeEach
public void start() {
ArchaiusUtils.resetConfig();
}
- @After
+ @AfterEach
public void tearDown() {
ArchaiusUtils.resetConfig();
}
@@ -41,8 +41,8 @@ public class TestKieCenterDefaultDeploymentProvider {
public void testConfiguration() {
KieCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
- Assert.assertEquals(info.getAccessURL().get(0), "https://172.16.8.7:30110");
- Assert.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
+ Assertions.assertEquals("https://172.16.8.7:30110", info.getAccessURL().get(0));
+ Assertions.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
}
@Test
@@ -50,7 +50,7 @@ public class TestKieCenterDefaultDeploymentProvider {
System.setProperty("servicecomb.kie.serverUri", "https://localhost:30110");
KieCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
- Assert.assertEquals(info.getAccessURL().get(0), "https://localhost:30110");
+ Assertions.assertEquals("https://localhost:30110", info.getAccessURL().get(0));
System.getProperties().remove("servicecomb.kie.serverUri");
}
@@ -60,9 +60,9 @@ public class TestKieCenterDefaultDeploymentProvider {
KieCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(KieCenterDefaultDeploymentProvider.SYSTEM_KEY_KIE_CENTER);
- Assert.assertEquals(info.getAccessURL().size(), 2);
- Assert.assertEquals(info.getAccessURL().get(0), "http://127.0.0.1:30110");
- Assert.assertEquals(info.getAccessURL().get(1), "http://127.0.0.2:30110");
+ Assertions.assertEquals(2, info.getAccessURL().size());
+ Assertions.assertEquals("http://127.0.0.1:30110", info.getAccessURL().get(0));
+ Assertions.assertEquals("http://127.0.0.2:30110", info.getAccessURL().get(1));
System.getProperties().remove("servicecomb.kie.serverUri");
}
diff --git a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImplTest.java b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImplTest.java
index 1faf1d159..f388fcb4b 100644
--- a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImplTest.java
+++ b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/archaius/sources/NacosConfigurationSourceImplTest.java
@@ -21,50 +21,48 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.servicecomb.config.nacos.archaius.sources.NacosConfigurationSourceImpl.UpdateHandler;
-import org.junit.Assert;
-import org.junit.Test;
+import org.apache.servicecomb.config.nacos.client.ConfigurationAction;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import com.netflix.config.WatchedUpdateListener;
import mockit.Deencapsulation;
-import static org.apache.servicecomb.config.nacos.client.ConfigurationAction.*;
-import static org.apache.servicecomb.config.nacos.client.ConfigurationAction.CREATE;
-
public class NacosConfigurationSourceImplTest {
@Test
public void testCreate() throws Exception {
NacosConfigurationSourceImpl nacosConfigurationSource = new NacosConfigurationSourceImpl();
- nacosConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getAdded().isEmpty()));
+ nacosConfigurationSource.addUpdateListener(result -> Assertions.assertFalse(result.getAdded().isEmpty()));
UpdateHandler udateHandler = Deencapsulation.getField(nacosConfigurationSource, UpdateHandler.class);
Map<String, Object> createItems = new HashMap<>();
createItems.put("nacosTestKey", "testValue");
- udateHandler.handle(CREATE, createItems);
+ udateHandler.handle(ConfigurationAction.CREATE, createItems);
}
@Test
public void testUpdate() throws Exception {
NacosConfigurationSourceImpl nacosConfigurationSource = new NacosConfigurationSourceImpl();
- nacosConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getChanged().isEmpty()));
+ nacosConfigurationSource.addUpdateListener(result -> Assertions.assertFalse(result.getChanged().isEmpty()));
UpdateHandler udateHandler = Deencapsulation.getField(nacosConfigurationSource, UpdateHandler.class);
Map<String, Object> updateItems = new HashMap<>();
updateItems.put("nacosTestKey", "testValue");
- udateHandler.handle(SET, updateItems);
+ udateHandler.handle(ConfigurationAction.SET, updateItems);
}
@Test
public void testDelete() throws Exception {
NacosConfigurationSourceImpl nacosConfigurationSource = new NacosConfigurationSourceImpl();
- nacosConfigurationSource.addUpdateListener(result -> Assert.assertTrue(!result.getDeleted().isEmpty()));
+ nacosConfigurationSource.addUpdateListener(result -> Assertions.assertFalse(result.getDeleted().isEmpty()));
UpdateHandler udateHandler = Deencapsulation.getField(nacosConfigurationSource, UpdateHandler.class);
Map<String, Object> deleteItems = new HashMap<>();
deleteItems.put("nacosTestKey", "testValue");
nacosConfigurationSource.getCurrentData().put("nacosTestKey", "testValue");
- udateHandler.handle(DELETE, deleteItems);
- Assert.assertTrue(nacosConfigurationSource.getCurrentData().isEmpty());
+ udateHandler.handle(ConfigurationAction.DELETE, deleteItems);
+ Assertions.assertTrue(nacosConfigurationSource.getCurrentData().isEmpty());
}
@Test
@@ -73,6 +71,6 @@ public class NacosConfigurationSourceImplTest {
WatchedUpdateListener watchedUpdateListener = Mockito.mock(WatchedUpdateListener.class);
nacosConfigurationSource.addUpdateListener(watchedUpdateListener);
nacosConfigurationSource.removeUpdateListener(watchedUpdateListener);
- Assert.assertTrue(nacosConfigurationSource.getCurrentListeners().isEmpty());
+ Assertions.assertTrue(nacosConfigurationSource.getCurrentListeners().isEmpty());
}
}
diff --git a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java
index 948451787..40c52b70a 100644
--- a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java
+++ b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosClientTest.java
@@ -24,15 +24,13 @@ import java.util.concurrent.ConcurrentHashMap;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.config.nacos.archaius.sources.NacosConfigurationSourceImpl;
import org.apache.servicecomb.config.nacos.archaius.sources.NacosConfigurationSourceImpl.UpdateHandler;
-import org.apache.servicecomb.config.nacos.client.NacosClient;
-import org.apache.servicecomb.config.nacos.client.NacosConfig;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
import mockit.Deencapsulation;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class NacosClientTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() {
NacosConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
}
@@ -48,7 +46,7 @@ public class NacosClientTest {
//nacosClient.refreshNacosConfig();
Map<String, Object> originMap = Deencapsulation.getField(nacosClient, "originalConfigMap");
originMap.put("nacos","12345");
- Assert.assertEquals(1, originMap.size());
+ Assertions.assertEquals(1, originMap.size());
}
@Test
@@ -68,7 +66,7 @@ public class NacosClientTest {
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
status = true;
before.put("test", "testValue");
@@ -77,7 +75,7 @@ public class NacosClientTest {
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
status = true;
after.put("test", "testValue2");
@@ -86,7 +84,7 @@ public class NacosClientTest {
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
status = true;
try {
@@ -94,6 +92,6 @@ public class NacosClientTest {
} catch (Exception e) {
status = false;
}
- Assert.assertTrue(status);
+ Assertions.assertTrue(status);
}
}
diff --git a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosConfigTest.java b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosConfigTest.java
index 89c44e715..8b82d0d67 100644
--- a/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosConfigTest.java
+++ b/dynamic-config/config-nacos/src/test/java/org/apache/servicecomb/config/nacos/client/NacosConfigTest.java
@@ -18,12 +18,12 @@
package org.apache.servicecomb.config.nacos.client;
import org.apache.servicecomb.config.ConfigUtil;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
public class NacosConfigTest {
- @BeforeClass
+ @BeforeAll
public static void setUpClass() {
NacosConfig.setConcurrentCompositeConfiguration(ConfigUtil.createLocalConfig());
}
@@ -31,8 +31,8 @@ public class NacosConfigTest {
@Test
public void getServiceName() {
NacosConfig instance = NacosConfig.INSTANCE;
- Assert.assertEquals("DEFAULT_GROUP", instance.getGroup());
- Assert.assertEquals("127.0.0.1:8848", instance.getServerAddr());
- Assert.assertEquals("example", instance.getDataId());
+ Assertions.assertEquals("DEFAULT_GROUP", instance.getGroup());
+ Assertions.assertEquals("127.0.0.1:8848", instance.getServerAddr());
+ Assertions.assertEquals("example", instance.getDataId());
}
}