[SCB-2475] migrate to junit5 registry part 1 (#2831)
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/MockMicroserviceVersions.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/MockMicroserviceVersions.java
index 5f9fd58..3b6aa43 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/MockMicroserviceVersions.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/MockMicroserviceVersions.java
@@ -38,6 +38,7 @@
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class MockMicroserviceVersions extends MicroserviceVersions {
// key is serviceId
@@ -112,7 +113,7 @@
}
public void check(MicroserviceVersionRule microserviceVersionRule, String latestVersion, String... instanceVersions) {
- Assert.assertSame(findMicroserviceVersion(latestVersion), microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertSame(findMicroserviceVersion(latestVersion), microserviceVersionRule.getLatestMicroserviceVersion());
MatcherAssert.assertThat(microserviceVersionRule.getInstances().values(),
Matchers.containsInAnyOrder(findInstances(instanceVersions).toArray()));
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java
index 7deeeb1..4e6453c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/RegistryUtilsTest.java
@@ -23,8 +23,8 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache.MicroserviceCacheStatus;
import org.apache.servicecomb.serviceregistry.registry.cache.MockedMicroserviceCache;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class RegistryUtilsTest {
@Test
@@ -33,25 +33,25 @@
microserviceCache.setStatus(MicroserviceCacheStatus.CLIENT_ERROR);
MicroserviceInstances microserviceInstances = RegistryUtils
.convertCacheToMicroserviceInstances(microserviceCache);
- Assert.assertNull(microserviceInstances);
+ Assertions.assertNull(microserviceInstances);
microserviceCache = new MockedMicroserviceCache();
microserviceCache.setStatus(MicroserviceCacheStatus.SETTING_CACHE_ERROR);
microserviceInstances = RegistryUtils.convertCacheToMicroserviceInstances(microserviceCache);
- Assert.assertNull(microserviceInstances);
+ Assertions.assertNull(microserviceInstances);
microserviceCache = new MockedMicroserviceCache();
microserviceCache.setStatus(MicroserviceCacheStatus.INIT);
microserviceInstances = RegistryUtils.convertCacheToMicroserviceInstances(microserviceCache);
- Assert.assertNull(microserviceInstances);
+ Assertions.assertNull(microserviceInstances);
microserviceCache = new MockedMicroserviceCache();
microserviceCache.setStatus(MicroserviceCacheStatus.SERVICE_NOT_FOUND);
microserviceInstances = RegistryUtils.convertCacheToMicroserviceInstances(microserviceCache);
- Assert.assertTrue(microserviceInstances.isMicroserviceNotExist());
- Assert.assertFalse(microserviceInstances.isNeedRefresh());
- Assert.assertEquals("", microserviceInstances.getRevision());
- Assert.assertNull(microserviceInstances.getInstancesResponse());
+ Assertions.assertTrue(microserviceInstances.isMicroserviceNotExist());
+ Assertions.assertFalse(microserviceInstances.isNeedRefresh());
+ Assertions.assertEquals("", microserviceInstances.getRevision());
+ Assertions.assertNull(microserviceInstances.getInstancesResponse());
microserviceCache = new MockedMicroserviceCache();
microserviceCache.setStatus(MicroserviceCacheStatus.REFRESHED);
@@ -59,19 +59,19 @@
MicroserviceInstance microserviceInstance = new MicroserviceInstance();
microserviceCache.setInstances(Collections.singletonList(microserviceInstance));
microserviceInstances = RegistryUtils.convertCacheToMicroserviceInstances(microserviceCache);
- Assert.assertFalse(microserviceInstances.isMicroserviceNotExist());
- Assert.assertTrue(microserviceInstances.isNeedRefresh());
- Assert.assertEquals("0166f3c18702617d5e55cf911e4e412cc8760dab", microserviceInstances.getRevision());
- Assert.assertEquals(1, microserviceInstances.getInstancesResponse().getInstances().size());
- Assert.assertSame(microserviceInstance, microserviceInstances.getInstancesResponse().getInstances().get(0));
+ Assertions.assertFalse(microserviceInstances.isMicroserviceNotExist());
+ Assertions.assertTrue(microserviceInstances.isNeedRefresh());
+ Assertions.assertEquals("0166f3c18702617d5e55cf911e4e412cc8760dab", microserviceInstances.getRevision());
+ Assertions.assertEquals(1, microserviceInstances.getInstancesResponse().getInstances().size());
+ Assertions.assertSame(microserviceInstance, microserviceInstances.getInstancesResponse().getInstances().get(0));
microserviceCache = new MockedMicroserviceCache();
microserviceCache.setStatus(MicroserviceCacheStatus.NO_CHANGE);
microserviceCache.setRevisionId("0166f3c18702617d5e55cf911e4e412cc8760dab");
microserviceInstances = RegistryUtils.convertCacheToMicroserviceInstances(microserviceCache);
- Assert.assertFalse(microserviceInstances.isMicroserviceNotExist());
- Assert.assertFalse(microserviceInstances.isNeedRefresh());
- Assert.assertEquals("0166f3c18702617d5e55cf911e4e412cc8760dab", microserviceInstances.getRevision());
- Assert.assertNull(microserviceInstances.getInstancesResponse());
+ Assertions.assertFalse(microserviceInstances.isMicroserviceNotExist());
+ Assertions.assertFalse(microserviceInstances.isNeedRefresh());
+ Assertions.assertEquals("0166f3c18702617d5e55cf911e4e412cc8760dab", microserviceInstances.getRevision());
+ Assertions.assertNull(microserviceInstances.getInstancesResponse());
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java
index 3477fb6..987c90b 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/ServiceRegistryTest.java
@@ -17,52 +17,50 @@
package org.apache.servicecomb.serviceregistry;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
import java.util.regex.Matcher;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class ServiceRegistryTest {
@Test
public void testNameFormat() {
Matcher matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("abc");
- assertTrue(matcher.matches());
+ Assertions.assertTrue(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("abc00");
- assertTrue(matcher.matches());
+ Assertions.assertTrue(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ABC");
- assertTrue(matcher.matches());
+ Assertions.assertTrue(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("A2BC");
- assertTrue(matcher.matches());
+ Assertions.assertTrue(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("abc-ABC");
- assertTrue(matcher.matches());
+ Assertions.assertTrue(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("abc_ABC");
- assertTrue(matcher.matches());
+ Assertions.assertTrue(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("-abc");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("abc-");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("_abc");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("abc_");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("0abc");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab.c");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab?c");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab#c");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab&c");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab*c");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
matcher = ServiceRegistry.REGISTRY_NAME_PATTERN.matcher("ab@c");
- assertFalse(matcher.matches());
+ Assertions.assertFalse(matcher.matches());
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestConsumers.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestConsumers.java
index 8803246..dbcf6be 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestConsumers.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestConsumers.java
@@ -32,12 +32,12 @@
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class TestConsumers extends TestRegistryBase {
@Before
@@ -53,13 +53,13 @@
public void getOrCreateMicroserviceVersionRule() {
MicroserviceVersionRule microserviceVersionRule = appManager
.getOrCreateMicroserviceVersionRule(appId, serviceName, versionRule);
- Assert.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
- Assert.assertEquals(1, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals(1, microserviceManager.getVersionsByName().size());
MicroserviceVersion microserviceVersion = microserviceVersionRule.getLatestMicroserviceVersion();
- Assert.assertEquals(serviceName, microserviceVersion.getMicroserviceName());
- Assert.assertEquals(serviceId, microserviceVersion.getMicroserviceId());
- Assert.assertEquals(version, microserviceVersion.getVersion().getVersion());
+ Assertions.assertEquals(serviceName, microserviceVersion.getMicroserviceName());
+ Assertions.assertEquals(serviceId, microserviceVersion.getMicroserviceId());
+ Assertions.assertEquals(version, microserviceVersion.getVersion().getVersion());
}
@Test
@@ -68,17 +68,17 @@
MicroserviceVersions microserviceVersions = microserviceManager.getOrCreateMicroserviceVersions(serviceName);
MicroserviceVersionRule microserviceVersionRule = microserviceVersions
.getOrCreateMicroserviceVersionRule(versionRule);
- Assert.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
- Assert.assertEquals(0, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertEquals(0, microserviceManager.getVersionsByName().size());
}
@Test
public void watchDeleteEvent() {
MicroserviceVersionRule microserviceVersionRule = appManager
.getOrCreateMicroserviceVersionRule(appId, serviceName, versionRule);
- Assert.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
- Assert.assertEquals(1, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals(1, microserviceManager.getVersionsByName().size());
mockNotExist();
@@ -89,7 +89,7 @@
key.setAppId(appId);
key.setServiceName(serviceName);
eventBus.post(event);
- Assert.assertEquals(0, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals(0, microserviceManager.getVersionsByName().size());
}
@Test
@@ -103,7 +103,7 @@
try (LogCollector collector = new LogCollector()) {
appManager.getOrCreateMicroserviceVersionRule(appId, serviceName, versionRule);
- Assert.assertEquals(0, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals(0, microserviceManager.getVersionsByName().size());
MatcherAssert.assertThat(collector.getEvents().stream()
.filter(e -> e.getThrowableInformation() != null)
@@ -117,13 +117,13 @@
public void delete_disconnect_cache() {
MicroserviceVersionRule microserviceVersionRule = appManager
.getOrCreateMicroserviceVersionRule(appId, serviceName, versionRule);
- Assert.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
- Assert.assertEquals(1, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals("0.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals(1, microserviceManager.getVersionsByName().size());
mockDisconnect();
appManager.pullInstances();
- Assert.assertEquals(1, microserviceManager.getVersionsByName().size());
+ Assertions.assertEquals(1, microserviceManager.getVersionsByName().size());
}
@Test
@@ -145,7 +145,7 @@
Hello.class);
MicroserviceVersionRule microserviceVersionRule = appManager.getOrCreateMicroserviceVersionRule(appId, "3rd", "0+");
- Assert.assertEquals(2, microserviceVersionRule.getInstances().size());
+ Assertions.assertEquals(2, microserviceVersionRule.getInstances().size());
MatcherAssert.assertThat(microserviceVersionRule.getInstances().values().stream()
.flatMap(inst -> inst.getEndpoints().stream())
.toArray(),
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestRegistry.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestRegistry.java
index 4a9954f..9f0d4f6 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestRegistry.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/TestRegistry.java
@@ -36,10 +36,10 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
import org.apache.servicecomb.serviceregistry.registry.LocalServiceRegistryFactory;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import com.netflix.config.ConcurrentCompositeConfiguration;
@@ -87,38 +87,38 @@
serviceRegistry.run();
RegistryUtils.setServiceRegistry(serviceRegistry);
- Assert.assertEquals(serviceRegistry, RegistryUtils.getServiceRegistry());
+ Assertions.assertEquals(serviceRegistry, RegistryUtils.getServiceRegistry());
- Assert.assertEquals(serviceRegistry.getServiceRegistryClient(), RegistryUtils.getServiceRegistryClient());
+ Assertions.assertEquals(serviceRegistry.getServiceRegistryClient(), RegistryUtils.getServiceRegistryClient());
Microservice microservice = RegistryUtils.getMicroservice();
- Assert.assertEquals(serviceRegistry.getMicroservice(), microservice);
- Assert.assertEquals(serviceRegistry.getMicroserviceInstance(), RegistryUtils.getMicroserviceInstance());
+ Assertions.assertEquals(serviceRegistry.getMicroservice(), microservice);
+ Assertions.assertEquals(serviceRegistry.getMicroserviceInstance(), RegistryUtils.getMicroserviceInstance());
List<MicroserviceInstance> instanceList = RegistryUtils.findServiceInstance("default", "default", "0.0.1");
- Assert.assertEquals(1, instanceList.size());
- Assert.assertEquals(RegistryUtils.getMicroservice().getServiceId(), instanceList.get(0).getServiceId());
+ Assertions.assertEquals(1, instanceList.size());
+ Assertions.assertEquals(RegistryUtils.getMicroservice().getServiceId(), instanceList.get(0).getServiceId());
instanceList = RegistryUtils.findServiceInstance("default", "notExists", "0.0.1");
- Assert.assertNull(instanceList);
+ Assertions.assertNull(instanceList);
MicroserviceInstances microserviceInstances =
RegistryUtils.findServiceInstances("default", "default", "0.0.1");
List<MicroserviceInstance> instanceLists = microserviceInstances.getInstancesResponse().getInstances();
- Assert.assertEquals(1, instanceLists.size());
- Assert.assertEquals(RegistryUtils.getMicroservice().getServiceId(), instanceLists.get(0).getServiceId());
+ Assertions.assertEquals(1, instanceLists.size());
+ Assertions.assertEquals(RegistryUtils.getMicroservice().getServiceId(), instanceLists.get(0).getServiceId());
Map<String, String> properties = new HashMap<>();
properties.put("k", "v");
RegistryUtils.updateInstanceProperties(properties);
- Assert.assertEquals(properties, RegistryUtils.getMicroserviceInstance().getProperties());
+ Assertions.assertEquals(properties, RegistryUtils.getMicroserviceInstance().getProperties());
- Assert.assertEquals(microservice, RegistryUtils.getMicroservice(microservice.getServiceId()));
+ Assertions.assertEquals(microservice, RegistryUtils.getMicroservice(microservice.getServiceId()));
RegistryUtils.updateMicroserviceProperties(properties);
- Assert.assertEquals(properties, RegistryUtils.getMicroservice().getProperties());
+ Assertions.assertEquals(properties, RegistryUtils.getMicroservice().getProperties());
- Assert.assertEquals("default", RegistryUtils.getAppId());
+ Assertions.assertEquals("default", RegistryUtils.getAppId());
}
@Test
@@ -130,7 +130,7 @@
}
};
String address = RegistrationManager.getPublishAddress();
- Assert.assertEquals("1.1.1.1", address);
+ Assertions.assertEquals("1.1.1.1", address);
new Expectations(DynamicPropertyFactory.getInstance()) {
{
@@ -142,7 +142,7 @@
};
}
};
- Assert.assertEquals("127.0.0.1", RegistrationManager.getPublishAddress());
+ Assertions.assertEquals("127.0.0.1", RegistrationManager.getPublishAddress());
new Expectations(DynamicPropertyFactory.getInstance()) {
{
@@ -158,7 +158,7 @@
};
}
};
- Assert.assertEquals("1.1.1.1", RegistrationManager.getPublishAddress());
+ Assertions.assertEquals("1.1.1.1", RegistrationManager.getPublishAddress());
}
@Test
@@ -170,10 +170,10 @@
}
};
String host = RegistrationManager.getPublishHostName();
- Assert.assertEquals("testHostName", host);
+ Assertions.assertEquals("testHostName", host);
inMemoryConfig.addProperty(RegistrationManager.PUBLISH_ADDRESS, "127.0.0.1");
- Assert.assertEquals("127.0.0.1", RegistrationManager.getPublishHostName());
+ Assertions.assertEquals("127.0.0.1", RegistrationManager.getPublishHostName());
new Expectations(DynamicPropertyFactory.getInstance()) {
{
@@ -184,7 +184,7 @@
}
};
inMemoryConfig.addProperty(RegistrationManager.PUBLISH_ADDRESS, "{eth100}");
- Assert.assertEquals("testHostName", RegistrationManager.getPublishHostName());
+ Assertions.assertEquals("testHostName", RegistrationManager.getPublishHostName());
}
@Test
@@ -196,11 +196,11 @@
}
};
- Assert.assertEquals("rest://172.0.0.0:8080", RegistrationManager.getPublishAddress("rest", "172.0.0.0:8080"));
- Assert.assertNull(RegistrationManager.getPublishAddress("rest", null));
+ Assertions.assertEquals("rest://172.0.0.0:8080", RegistrationManager.getPublishAddress("rest", "172.0.0.0:8080"));
+ Assertions.assertNull(RegistrationManager.getPublishAddress("rest", null));
URI uri = new URI(RegistrationManager.getPublishAddress("rest", "0.0.0.0:8080"));
- Assert.assertEquals("1.1.1.1:8080", uri.getAuthority());
+ Assertions.assertEquals("1.1.1.1:8080", uri.getAuthority());
new Expectations(DynamicPropertyFactory.getInstance()) {
{
@@ -212,7 +212,7 @@
};
}
};
- Assert.assertEquals("rest://1.1.1.1:8080", RegistrationManager.getPublishAddress("rest", "172.0.0.0:8080"));
+ Assertions.assertEquals("rest://1.1.1.1:8080", RegistrationManager.getPublishAddress("rest", "172.0.0.0:8080"));
InetAddress ethAddress = Mockito.mock(InetAddress.class);
Mockito.when(ethAddress.getHostAddress()).thenReturn("1.1.1.1");
@@ -230,7 +230,7 @@
};
String query = URLEncodedUtils.format(Collections.singletonList(new BasicNameValuePair("country", "中 国")),
StandardCharsets.UTF_8.name());
- Assert.assertEquals("rest://1.1.1.1:8080?" + query,
+ Assertions.assertEquals("rest://1.1.1.1:8080?" + query,
RegistrationManager.getPublishAddress("rest", "172.0.0.0:8080?" + query));
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java
index 609252f..c776d11 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/adapter/TestEnvAdapterManager.java
@@ -16,13 +16,10 @@
*/
package org.apache.servicecomb.serviceregistry.adapter;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestEnvAdapterManager {
@@ -30,15 +27,15 @@
@Test
public void testLoadAdapter() {
- assertEquals(3, manager.values().size());
- assertNull(manager.findValue("cas-env-three"));
- assertNotNull(manager.findValue("default-env-adapter"));
- assertNotNull(manager.findValue("cas_env_one"));
- assertNotNull(manager.findValue("cas_env_two"));
+ Assertions.assertEquals(3, manager.values().size());
+ Assertions.assertNull(manager.findValue("cas-env-three"));
+ Assertions.assertNotNull(manager.findValue("default-env-adapter"));
+ Assertions.assertNotNull(manager.findValue("cas_env_one"));
+ Assertions.assertNotNull(manager.findValue("cas_env_two"));
- assertEquals(0, manager.findValue("cas_env_one").getOrder());
- assertEquals(0, manager.findValue("cas_env_two").getOrder());
- assertEquals(0, manager.findValue("default-env-adapter").getOrder());
+ Assertions.assertEquals(0, manager.findValue("cas_env_one").getOrder());
+ Assertions.assertEquals(0, manager.findValue("cas_env_two").getOrder());
+ Assertions.assertEquals(0, manager.findValue("default-env-adapter").getOrder());
}
@Test
@@ -46,9 +43,9 @@
Microservice microservice = new Microservice();
manager.processMicroserviceWithAdapters(microservice);
- assertEquals("order=0", microservice.getProperties().get("cas_env_one"));
- assertEquals("order=0", microservice.getProperties().get("cas_env_two"));
- assertNull(microservice.getProperties().get("default-env-adapter"));
+ Assertions.assertEquals("order=0", microservice.getProperties().get("cas_env_one"));
+ Assertions.assertEquals("order=0", microservice.getProperties().get("cas_env_two"));
+ Assertions.assertNull(microservice.getProperties().get("default-env-adapter"));
}
@Test
@@ -56,8 +53,8 @@
MicroserviceInstance instance = new MicroserviceInstance();
manager.processInstanceWithAdapters(instance);
- assertEquals("order=0", instance.getProperties().get("cas_env_one"));
- assertEquals("order=0", instance.getProperties().get("cas_env_two"));
- assertNull(instance.getProperties().get("default-env-adapter"));
+ Assertions.assertEquals("order=0", instance.getProperties().get("cas_env_one"));
+ Assertions.assertEquals("order=0", instance.getProperties().get("cas_env_two"));
+ Assertions.assertNull(instance.getProperties().get("default-env-adapter"));
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestConst.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestConst.java
index 443da84..8dbf506 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestConst.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestConst.java
@@ -17,20 +17,20 @@
package org.apache.servicecomb.serviceregistry.api;
import org.apache.servicecomb.config.ConfigUtil;
-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 TestConst {
- @Before
+ @BeforeEach
public void setUp() {
System.setProperty("servicecomb.service.registry.api.version", "v4");
System.setProperty("servicecomb.config.client.domainName", "testtenane");
ConfigUtil.createLocalConfig();
}
- @After
+ @AfterEach
public void tearDown() {
System.getProperties().remove("servicecomb.service.registry.api.version");
System.getProperties().remove("servicecomb.config.client.domainName");
@@ -41,40 +41,40 @@
// this test case depends on class loading and java property may initialized after class loading, so we make to run in all cases.
if (Const.REGISTRY_API.CURRENT_VERSION.equals(Const.REGISTRY_API.VERSION_V3)) {
- Assert.assertEquals("/registry/v3/microservices", Const.REGISTRY_API.MICROSERVICE_OPERATION_ALL);
- Assert.assertEquals("/registry/v3/microservices/%s", Const.REGISTRY_API.MICROSERVICE_OPERATION_ONE);
- Assert.assertEquals("/registry/v3/microservices/%s/instances",
+ Assertions.assertEquals("/registry/v3/microservices", Const.REGISTRY_API.MICROSERVICE_OPERATION_ALL);
+ Assertions.assertEquals("/registry/v3/microservices/%s", Const.REGISTRY_API.MICROSERVICE_OPERATION_ONE);
+ Assertions.assertEquals("/registry/v3/microservices/%s/instances",
Const.REGISTRY_API.MICROSERVICE_INSTANCE_OPERATION_ALL);
- Assert.assertEquals("/registry/v3/microservices/%s/instances/%s",
+ Assertions.assertEquals("/registry/v3/microservices/%s/instances/%s",
Const.REGISTRY_API.MICROSERVICE_INSTANCE_OPERATION_ONE);
- Assert.assertEquals("/registry/v3/existence", Const.REGISTRY_API.MICROSERVICE_EXISTENCE);
- Assert.assertEquals("/registry/v3/microservices/%s/schemas/%s", Const.REGISTRY_API.MICROSERVICE_SCHEMA);
- Assert.assertEquals("/registry/v3/microservices/%s/instances/%s/heartbeat",
+ Assertions.assertEquals("/registry/v3/existence", Const.REGISTRY_API.MICROSERVICE_EXISTENCE);
+ Assertions.assertEquals("/registry/v3/microservices/%s/schemas/%s", Const.REGISTRY_API.MICROSERVICE_SCHEMA);
+ Assertions.assertEquals("/registry/v3/microservices/%s/instances/%s/heartbeat",
Const.REGISTRY_API.MICROSERVICE_HEARTBEAT);
- Assert.assertEquals("/registry/v3/microservices/%s/watcher", Const.REGISTRY_API.MICROSERVICE_WATCH);
- Assert.assertEquals("/registry/v3/instances", Const.REGISTRY_API.MICROSERVICE_INSTANCES);
- Assert.assertEquals("/registry/v3/microservices/%s/properties",
+ Assertions.assertEquals("/registry/v3/microservices/%s/watcher", Const.REGISTRY_API.MICROSERVICE_WATCH);
+ Assertions.assertEquals("/registry/v3/instances", Const.REGISTRY_API.MICROSERVICE_INSTANCES);
+ Assertions.assertEquals("/registry/v3/microservices/%s/properties",
Const.REGISTRY_API.MICROSERVICE_PROPERTIES);
- Assert.assertEquals("/registry/v3/microservices/%s/instances/%s/properties",
+ Assertions.assertEquals("/registry/v3/microservices/%s/instances/%s/properties",
Const.REGISTRY_API.MICROSERVICE_INSTANCE_PROPERTIES);
} else {
String prefix = "/v4/" + Const.REGISTRY_API.DOMAIN_NAME + "/registry/";
- Assert.assertEquals(prefix + "microservices", Const.REGISTRY_API.MICROSERVICE_OPERATION_ALL);
- Assert.assertEquals(prefix + "microservices/%s", Const.REGISTRY_API.MICROSERVICE_OPERATION_ONE);
- Assert.assertEquals(prefix + "microservices/%s/instances",
+ Assertions.assertEquals(prefix + "microservices", Const.REGISTRY_API.MICROSERVICE_OPERATION_ALL);
+ Assertions.assertEquals(prefix + "microservices/%s", Const.REGISTRY_API.MICROSERVICE_OPERATION_ONE);
+ Assertions.assertEquals(prefix + "microservices/%s/instances",
Const.REGISTRY_API.MICROSERVICE_INSTANCE_OPERATION_ALL);
- Assert.assertEquals(prefix + "microservices/%s/instances/%s",
+ Assertions.assertEquals(prefix + "microservices/%s/instances/%s",
Const.REGISTRY_API.MICROSERVICE_INSTANCE_OPERATION_ONE);
- Assert.assertEquals(prefix + "existence", Const.REGISTRY_API.MICROSERVICE_EXISTENCE);
- Assert.assertEquals(prefix + "microservices/%s/schemas/%s",
+ Assertions.assertEquals(prefix + "existence", Const.REGISTRY_API.MICROSERVICE_EXISTENCE);
+ Assertions.assertEquals(prefix + "microservices/%s/schemas/%s",
Const.REGISTRY_API.MICROSERVICE_SCHEMA);
- Assert.assertEquals(prefix + "microservices/%s/instances/%s/heartbeat",
+ Assertions.assertEquals(prefix + "microservices/%s/instances/%s/heartbeat",
Const.REGISTRY_API.MICROSERVICE_HEARTBEAT);
- Assert.assertEquals(prefix + "microservices/%s/watcher", Const.REGISTRY_API.MICROSERVICE_WATCH);
- Assert.assertEquals(prefix + "instances", Const.REGISTRY_API.MICROSERVICE_INSTANCES);
- Assert.assertEquals(prefix + "microservices/%s/properties",
+ Assertions.assertEquals(prefix + "microservices/%s/watcher", Const.REGISTRY_API.MICROSERVICE_WATCH);
+ Assertions.assertEquals(prefix + "instances", Const.REGISTRY_API.MICROSERVICE_INSTANCES);
+ Assertions.assertEquals(prefix + "microservices/%s/properties",
Const.REGISTRY_API.MICROSERVICE_PROPERTIES);
- Assert.assertEquals(prefix + "microservices/%s/instances/%s/properties",
+ Assertions.assertEquals(prefix + "microservices/%s/instances/%s/properties",
Const.REGISTRY_API.MICROSERVICE_INSTANCE_PROPERTIES);
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestMicroserviceKey.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestMicroserviceKey.java
index 0fbaef8..9155a26 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestMicroserviceKey.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/TestMicroserviceKey.java
@@ -19,9 +19,9 @@
import org.apache.servicecomb.registry.api.MicroserviceKey;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceKey {
@@ -39,21 +39,21 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oMicroserviceKey.getAppId());
- Assert.assertNull(oMicroserviceKey.getTenant());
- Assert.assertNull(oMicroserviceKey.getServiceName());
- Assert.assertNull(oMicroserviceKey.getStage());
- Assert.assertNull(oMicroserviceKey.getVersion());
+ Assertions.assertNull(oMicroserviceKey.getAppId());
+ Assertions.assertNull(oMicroserviceKey.getTenant());
+ Assertions.assertNull(oMicroserviceKey.getServiceName());
+ Assertions.assertNull(oMicroserviceKey.getStage());
+ Assertions.assertNull(oMicroserviceKey.getVersion());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals("1", oMicroserviceKey.getVersion());
- Assert.assertEquals("testServiceName", oMicroserviceKey.getServiceName());
- Assert.assertEquals("Test", oMicroserviceKey.getStage());
- Assert.assertEquals("testTenantName", oMicroserviceKey.getTenant());
- Assert.assertEquals(Const.REGISTRY_APP_ID, oMicroserviceKey.getAppId());
+ Assertions.assertEquals("1", oMicroserviceKey.getVersion());
+ Assertions.assertEquals("testServiceName", oMicroserviceKey.getServiceName());
+ Assertions.assertEquals("Test", oMicroserviceKey.getStage());
+ Assertions.assertEquals("testTenantName", oMicroserviceKey.getTenant());
+ Assertions.assertEquals(Const.REGISTRY_APP_ID, oMicroserviceKey.getAppId());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestBasePath.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestBasePath.java
index ed2b040..d9fe117 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestBasePath.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestBasePath.java
@@ -21,9 +21,9 @@
import org.apache.servicecomb.registry.api.registry.BasePath;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
/**
* Created by on 2017/3/29.
@@ -43,15 +43,15 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oBasePath.getPath());
- Assert.assertNull(oBasePath.getProperty());
+ Assertions.assertNull(oBasePath.getPath());
+ Assertions.assertNull(oBasePath.getProperty());
}
@Test
public void testInitializedValues() {
initBasePath(); //Initialize the Values
- Assert.assertEquals("a", oBasePath.getPath());
- Assert.assertNotNull(oBasePath.getProperty());
+ Assertions.assertEquals("a", oBasePath.getPath());
+ Assertions.assertNotNull(oBasePath.getProperty());
}
private void initBasePath() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFramework.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFramework.java
index ba6d01f..2952fe9 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFramework.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFramework.java
@@ -18,15 +18,15 @@
package org.apache.servicecomb.serviceregistry.api.registry;
import org.apache.servicecomb.registry.api.registry.Framework;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestFramework {
@Test
public void testDefaultValues() {
Framework framework = new Framework();
- Assert.assertNull(framework.getName());
- Assert.assertNull(framework.getVersion());
+ Assertions.assertNull(framework.getName());
+ Assertions.assertNull(framework.getVersion());
}
@Test
@@ -34,7 +34,7 @@
Framework framework = new Framework();
framework.setName("JAVA-CHASSIS");
framework.setVersion("x.x.x");
- Assert.assertEquals("JAVA-CHASSIS", framework.getName());
- Assert.assertEquals("x.x.x", framework.getVersion());
+ Assertions.assertEquals("JAVA-CHASSIS", framework.getName());
+ Assertions.assertEquals("x.x.x", framework.getVersion());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFrameworkVersions.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFrameworkVersions.java
index 63a3871..96388a2 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFrameworkVersions.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestFrameworkVersions.java
@@ -18,14 +18,14 @@
package org.apache.servicecomb.serviceregistry.api.registry;
import org.apache.servicecomb.registry.api.registry.FrameworkVersions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestFrameworkVersions {
- @Test
- public void testFrameworkVersions() {
- // this.getClass().getPackage().getImplementationVersion()
- // is not stable, may get null or 2.0.1-SNAPSHOT
- Assert.assertTrue(FrameworkVersions.allVersions().contains("ServiceComb"));
- }
+ @Test
+ public void testFrameworkVersions() {
+ // this.getClass().getPackage().getImplementationVersion()
+ // is not stable, may get null or 2.0.1-SNAPSHOT
+ Assertions.assertTrue(FrameworkVersions.allVersions().contains("ServiceComb"));
+ }
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestHealthCheck.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestHealthCheck.java
index 812e653..756f1c4 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestHealthCheck.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestHealthCheck.java
@@ -20,9 +20,9 @@
import org.apache.servicecomb.registry.api.registry.HealthCheck;
import org.apache.servicecomb.registry.api.registry.HealthCheckMode;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestHealthCheck {
@@ -40,33 +40,33 @@
@Test
public void testDefaultValues() {
- Assert.assertEquals(0, oHealthCheck.getInterval());
- Assert.assertEquals(0, oHealthCheck.getPort());
- Assert.assertEquals(0, oHealthCheck.getTimes());
- Assert.assertNull(oHealthCheck.getMode());
- Assert.assertEquals(0, oHealthCheck.getTTL());
+ Assertions.assertEquals(0, oHealthCheck.getInterval());
+ Assertions.assertEquals(0, oHealthCheck.getPort());
+ Assertions.assertEquals(0, oHealthCheck.getTimes());
+ Assertions.assertNull(oHealthCheck.getMode());
+ Assertions.assertEquals(0, oHealthCheck.getTTL());
}
@Test
public void testInitializedValues() {
initHealthCheck(); //Initialize the Values
- Assert.assertEquals(10, oHealthCheck.getInterval());
- Assert.assertEquals(8080, oHealthCheck.getPort());
- Assert.assertEquals(2, oHealthCheck.getTimes());
- Assert.assertEquals(HealthCheckMode.PLATFORM, oHealthCheck.getMode());
- Assert.assertEquals(0, oHealthCheck.getTTL()); //TTL Values will changes based on the Mode
- Assert.assertEquals("pull", oHealthCheck.getMode().getName());
+ Assertions.assertEquals(10, oHealthCheck.getInterval());
+ Assertions.assertEquals(8080, oHealthCheck.getPort());
+ Assertions.assertEquals(2, oHealthCheck.getTimes());
+ Assertions.assertEquals(HealthCheckMode.PLATFORM, oHealthCheck.getMode());
+ Assertions.assertEquals(0, oHealthCheck.getTTL()); //TTL Values will changes based on the Mode
+ Assertions.assertEquals("pull", oHealthCheck.getMode().getName());
//Testing Different modes of the HealthCheckMode
oHealthCheck.setMode(HealthCheckMode.HEARTBEAT);
- Assert.assertEquals(HealthCheckMode.HEARTBEAT, oHealthCheck.getMode());
- Assert.assertEquals(30, oHealthCheck.getTTL()); //TTL Values will changes based on the Mode
- Assert.assertEquals("push", oHealthCheck.getMode().getName());
+ Assertions.assertEquals(HealthCheckMode.HEARTBEAT, oHealthCheck.getMode());
+ Assertions.assertEquals(30, oHealthCheck.getTTL()); //TTL Values will changes based on the Mode
+ Assertions.assertEquals("push", oHealthCheck.getMode().getName());
oHealthCheck.setMode(HealthCheckMode.UNKNOWN);
- Assert.assertEquals(HealthCheckMode.UNKNOWN, oHealthCheck.getMode());
- Assert.assertEquals(0, oHealthCheck.getTTL()); //TTL Values will changes based on the Mode
- Assert.assertEquals("unknown", oHealthCheck.getMode().getName());
+ Assertions.assertEquals(HealthCheckMode.UNKNOWN, oHealthCheck.getMode());
+ Assertions.assertEquals(0, oHealthCheck.getTTL()); //TTL Values will changes based on the Mode
+ Assertions.assertEquals("unknown", oHealthCheck.getMode().getName());
}
private void initHealthCheck() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroService.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroService.java
index 5040cfc..d75d5ea 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroService.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroService.java
@@ -27,9 +27,9 @@
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstanceStatus;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroService {
@@ -55,37 +55,37 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oMicroservice.getAppId());
- Assert.assertNull(oMicroservice.getDescription());
- Assert.assertNull(oMicroservice.getLevel());
- Assert.assertEquals(0, oMicroservice.getProperties().size());
- Assert.assertEquals(0, oMicroservice.getSchemas().size());
- Assert.assertNull(oMicroservice.getServiceId());
- Assert.assertNull(oMicroservice.getServiceName());
- Assert.assertEquals(MicroserviceInstanceStatus.UP.toString(), oMicroservice.getStatus());
- Assert.assertNull(oMicroservice.getVersion());
- Assert.assertEquals(0, oMicroservice.getPaths().size());
- Assert.assertNull(oMicroservice.getFramework());
- Assert.assertNull(oMicroservice.getEnvironment());
+ Assertions.assertNull(oMicroservice.getAppId());
+ Assertions.assertNull(oMicroservice.getDescription());
+ Assertions.assertNull(oMicroservice.getLevel());
+ Assertions.assertEquals(0, oMicroservice.getProperties().size());
+ Assertions.assertEquals(0, oMicroservice.getSchemas().size());
+ Assertions.assertNull(oMicroservice.getServiceId());
+ Assertions.assertNull(oMicroservice.getServiceName());
+ Assertions.assertEquals(MicroserviceInstanceStatus.UP.toString(), oMicroservice.getStatus());
+ Assertions.assertNull(oMicroservice.getVersion());
+ Assertions.assertEquals(0, oMicroservice.getPaths().size());
+ Assertions.assertNull(oMicroservice.getFramework());
+ Assertions.assertNull(oMicroservice.getEnvironment());
}
@Test
public void testInitializedValues() {
initMicroservice(); //Initialize the Object
- Assert.assertEquals("testAppID", oMicroservice.getAppId());
- Assert.assertEquals("This is the test", oMicroservice.getDescription());
- Assert.assertEquals("INFO", oMicroservice.getLevel());
- Assert.assertEquals("testServiceID", oMicroservice.getServiceId());
- Assert.assertEquals("testServiceName", oMicroservice.getServiceName());
- Assert.assertEquals(MicroserviceInstanceStatus.DOWN.toString(), oMicroservice.getStatus());
- Assert.assertEquals("1.0.0", oMicroservice.getVersion());
- Assert.assertEquals("fakeProxy", oMicroservice.getProperties().get("proxy"));
- Assert.assertEquals(1, oMicroservice.getSchemas().size());
- Assert.assertEquals(1, oMicroservice.getPaths().size());
- Assert.assertEquals("JAVA-CHASSIS", oMicroservice.getFramework().getName());
- Assert.assertEquals("x.x.x", oMicroservice.getFramework().getVersion());
- Assert.assertEquals("SDK", oMicroservice.getRegisterBy());
- Assert.assertEquals("development", oMicroservice.getEnvironment());
+ Assertions.assertEquals("testAppID", oMicroservice.getAppId());
+ Assertions.assertEquals("This is the test", oMicroservice.getDescription());
+ Assertions.assertEquals("INFO", oMicroservice.getLevel());
+ Assertions.assertEquals("testServiceID", oMicroservice.getServiceId());
+ Assertions.assertEquals("testServiceName", oMicroservice.getServiceName());
+ Assertions.assertEquals(MicroserviceInstanceStatus.DOWN.toString(), oMicroservice.getStatus());
+ Assertions.assertEquals("1.0.0", oMicroservice.getVersion());
+ Assertions.assertEquals("fakeProxy", oMicroservice.getProperties().get("proxy"));
+ Assertions.assertEquals(1, oMicroservice.getSchemas().size());
+ Assertions.assertEquals(1, oMicroservice.getPaths().size());
+ Assertions.assertEquals("JAVA-CHASSIS", oMicroservice.getFramework().getName());
+ Assertions.assertEquals("x.x.x", oMicroservice.getFramework().getVersion());
+ Assertions.assertEquals("SDK", oMicroservice.getRegisterBy());
+ Assertions.assertEquals("development", oMicroservice.getEnvironment());
}
private void initMicroservice() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroServiceInstance.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroServiceInstance.java
index 18c2652..e2dce4b 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroServiceInstance.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroServiceInstance.java
@@ -30,9 +30,9 @@
import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import com.netflix.config.ConcurrentCompositeConfiguration;
@@ -78,40 +78,40 @@
@SuppressWarnings("deprecation")
@Test
public void testDefaultValues() {
- Assert.assertNull(oMicroserviceInstance.getHostName());
- Assert.assertNull(oMicroserviceInstance.getInstanceId());
- Assert.assertNull(oMicroserviceInstance.getServiceId());
- Assert.assertEquals(0, oMicroserviceInstance.getProperties().size());
- Assert.assertEquals(0, oMicroserviceInstance.getEndpoints().size());
- Assert.assertNull(oMicroserviceInstance.getHealthCheck());
- Assert.assertNull(oMicroserviceInstance.getStage());
- Assert.assertEquals(MicroserviceInstanceStatus.UP, oMicroserviceInstance.getStatus());
- Assert.assertEquals("instanceId=null;serviceId=null;status=UP;endpoints=[]", oMicroserviceInstance.toString());
+ Assertions.assertNull(oMicroserviceInstance.getHostName());
+ Assertions.assertNull(oMicroserviceInstance.getInstanceId());
+ Assertions.assertNull(oMicroserviceInstance.getServiceId());
+ Assertions.assertEquals(0, oMicroserviceInstance.getProperties().size());
+ Assertions.assertEquals(0, oMicroserviceInstance.getEndpoints().size());
+ Assertions.assertNull(oMicroserviceInstance.getHealthCheck());
+ Assertions.assertNull(oMicroserviceInstance.getStage());
+ Assertions.assertEquals(MicroserviceInstanceStatus.UP, oMicroserviceInstance.getStatus());
+ Assertions.assertEquals("instanceId=null;serviceId=null;status=UP;endpoints=[]", oMicroserviceInstance.toString());
}
@SuppressWarnings("deprecation")
@Test
public void testInitializedValues() {
initMicroserviceInstance(); //Initialize the Object
- Assert.assertEquals("testHostName", oMicroserviceInstance.getHostName());
- Assert.assertEquals("testInstanceID", oMicroserviceInstance.getInstanceId());
- Assert.assertEquals(1, oMicroserviceInstance.getEndpoints().size());
- Assert.assertEquals("testServiceID", oMicroserviceInstance.getServiceId());
- Assert.assertEquals(oMockHealthCheck, oMicroserviceInstance.getHealthCheck());
- Assert.assertEquals(MicroserviceInstanceStatus.DOWN, oMicroserviceInstance.getStatus());
- Assert.assertEquals("Test", oMicroserviceInstance.getStage());
- Assert.assertEquals("china", oMicroserviceInstance.getProperties().get("region"));
+ Assertions.assertEquals("testHostName", oMicroserviceInstance.getHostName());
+ Assertions.assertEquals("testInstanceID", oMicroserviceInstance.getInstanceId());
+ Assertions.assertEquals(1, oMicroserviceInstance.getEndpoints().size());
+ Assertions.assertEquals("testServiceID", oMicroserviceInstance.getServiceId());
+ Assertions.assertEquals(oMockHealthCheck, oMicroserviceInstance.getHealthCheck());
+ Assertions.assertEquals(MicroserviceInstanceStatus.DOWN, oMicroserviceInstance.getStatus());
+ Assertions.assertEquals("Test", oMicroserviceInstance.getStage());
+ Assertions.assertEquals("china", oMicroserviceInstance.getProperties().get("region"));
- Assert.assertEquals(oMicroserviceInstance, oMicroserviceInstance);
+ Assertions.assertEquals(oMicroserviceInstance, oMicroserviceInstance);
MicroserviceInstance other = new MicroserviceInstance();
other.setInstanceId("testInstanceIDOther");
MicroserviceInstance same = new MicroserviceInstance();
same.setInstanceId("testInstanceID");
- Assert.assertNotEquals(oMicroserviceInstance, other);
- Assert.assertNotEquals(oMicroserviceInstance.hashCode(), other.hashCode());
- Assert.assertEquals(oMicroserviceInstance, same);
- Assert.assertEquals(oMicroserviceInstance.hashCode(), same.hashCode());
- Assert.assertEquals("instanceId=testInstanceID;serviceId=testServiceID;status=DOWN;endpoints=[testEndpoints]",
+ Assertions.assertNotEquals(oMicroserviceInstance, other);
+ Assertions.assertNotEquals(oMicroserviceInstance.hashCode(), other.hashCode());
+ Assertions.assertEquals(oMicroserviceInstance, same);
+ Assertions.assertEquals(oMicroserviceInstance.hashCode(), same.hashCode());
+ Assertions.assertEquals("instanceId=testInstanceID;serviceId=testServiceID;status=DOWN;endpoints=[testEndpoints]",
oMicroserviceInstance.toString());
}
@@ -136,8 +136,8 @@
configuration.addConfiguration(config);
ConfigurationManager.install(configuration);
MicroserviceInstance instance = MicroserviceInstance.createFromDefinition(config);
- Assert.assertEquals(instance.getDataCenterInfo().getName(), "myDC");
- Assert.assertEquals(instance.getDataCenterInfo().getRegion(), "my-Region");
- Assert.assertEquals(instance.getDataCenterInfo().getAvailableZone(), "my-Zone");
+ Assertions.assertEquals(instance.getDataCenterInfo().getName(), "myDC");
+ Assertions.assertEquals(instance.getDataCenterInfo().getRegion(), "my-Region");
+ Assertions.assertEquals(instance.getDataCenterInfo().getAvailableZone(), "my-Zone");
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java
index c4c359e..471b0af 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestMicroserviceFactory.java
@@ -33,16 +33,16 @@
@Test
public void testAllowCrossApp() {
Microservice microservice = new Microservice();
- Assert.assertFalse(microservice.allowCrossApp());
+ Assertions.assertFalse(microservice.allowCrossApp());
microservice.getProperties().put(CONFIG_ALLOW_CROSS_APP_KEY, "true");
- Assert.assertTrue(microservice.allowCrossApp());
+ Assertions.assertTrue(microservice.allowCrossApp());
microservice.getProperties().put(CONFIG_ALLOW_CROSS_APP_KEY, "false");
- Assert.assertFalse(microservice.allowCrossApp());
+ Assertions.assertFalse(microservice.allowCrossApp());
microservice.getProperties().put(CONFIG_ALLOW_CROSS_APP_KEY, "asfas");
- Assert.assertFalse(microservice.allowCrossApp());
+ Assertions.assertFalse(microservice.allowCrossApp());
}
@Test
@@ -52,7 +52,7 @@
String microserviceName = "default";
- Assert.assertEquals(microserviceName, microservice.getServiceName());
+ Assertions.assertEquals(microserviceName, microservice.getServiceName());
}
@Test
@@ -61,7 +61,7 @@
Configuration configuration = ConfigUtil.createLocalConfig();
configuration.setProperty(BootStrapProperties.CONFIG_SERVICE_DESCRIPTION, new String[] {"test1", "test2"});
Microservice microservice = factory.create(configuration);
- Assert.assertEquals("test1,test2", microservice.getDescription());
+ Assertions.assertEquals("test1,test2", microservice.getDescription());
}
@Test
@@ -71,12 +71,12 @@
MicroserviceFactory factory = new MicroserviceFactory();
Microservice microservice = factory.create(configuration);
- Assert.assertNull(microservice.getDescription());
+ Assertions.assertNull(microservice.getDescription());
configuration.setProperty(BootStrapProperties.CONFIG_SERVICE_DESCRIPTION, new String[] {});
microservice = factory.create(configuration);
- Assert.assertNull(microservice.getDescription());
+ Assertions.assertNull(microservice.getDescription());
}
@Test
@@ -88,7 +88,7 @@
Microservice microservice = factory.create(configuration);
- Assert.assertEquals(",", microservice.getDescription());
+ Assertions.assertEquals(",", microservice.getDescription());
}
@Test
@@ -100,7 +100,7 @@
Microservice microservice = factory.create(configuration);
- Assert.assertEquals(" , ", microservice.getDescription());
+ Assertions.assertEquals(" , ", microservice.getDescription());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterConfig.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterConfig.java
index 69171e1..898941a 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterConfig.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterConfig.java
@@ -17,55 +17,55 @@
package org.apache.servicecomb.serviceregistry.api.registry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestServiceCenterConfig {
ServiceCenterConfig config = new ServiceCenterConfig();
@Test
public void testDefaultValues() {
- Assert.assertEquals(0, config.getMaxHeaderBytes());
- Assert.assertEquals(0, config.getMaxBodyBytes());
- Assert.assertNull(config.getReadHeaderTimeout());
- Assert.assertNull(config.getReadTimeout());
- Assert.assertNull(config.getIdleTimeout());
- Assert.assertNull(config.getWriteTimeout());
- Assert.assertNull(config.getLimitTTLUnit());
- Assert.assertEquals(0, config.getLimitConnections());
- Assert.assertNull(config.getLimitIPLookup());
- Assert.assertNull(config.getSslEnabled());
- Assert.assertNull(config.getSslMinVersion());
- Assert.assertNull(config.getSslVerifyPeer());
- Assert.assertNull(config.getSslCiphers());
- Assert.assertNull(config.getAutoSyncInterval());
- Assert.assertEquals(0, config.getCompactIndexDelta());
- Assert.assertNull(config.getCompactInterval());
- Assert.assertEquals(0, config.getLogRotateSize());
- Assert.assertEquals(0, config.getLogBackupCount());
+ Assertions.assertEquals(0, config.getMaxHeaderBytes());
+ Assertions.assertEquals(0, config.getMaxBodyBytes());
+ Assertions.assertNull(config.getReadHeaderTimeout());
+ Assertions.assertNull(config.getReadTimeout());
+ Assertions.assertNull(config.getIdleTimeout());
+ Assertions.assertNull(config.getWriteTimeout());
+ Assertions.assertNull(config.getLimitTTLUnit());
+ Assertions.assertEquals(0, config.getLimitConnections());
+ Assertions.assertNull(config.getLimitIPLookup());
+ Assertions.assertNull(config.getSslEnabled());
+ Assertions.assertNull(config.getSslMinVersion());
+ Assertions.assertNull(config.getSslVerifyPeer());
+ Assertions.assertNull(config.getSslCiphers());
+ Assertions.assertNull(config.getAutoSyncInterval());
+ Assertions.assertEquals(0, config.getCompactIndexDelta());
+ Assertions.assertNull(config.getCompactInterval());
+ Assertions.assertEquals(0, config.getLogRotateSize());
+ Assertions.assertEquals(0, config.getLogBackupCount());
}
@Test
public void testInitializedValues() {
initMicroservice(); //Initialize the Object
- Assert.assertEquals(10, config.getMaxHeaderBytes());
- Assert.assertEquals(10, config.getMaxBodyBytes());
- Assert.assertEquals("60s", config.getReadHeaderTimeout());
- Assert.assertEquals("60s", config.getReadTimeout());
- Assert.assertEquals("60s", config.getIdleTimeout());
- Assert.assertEquals("60s", config.getWriteTimeout());
- Assert.assertEquals("s", config.getLimitTTLUnit());
- Assert.assertEquals(0, config.getLimitConnections());
- Assert.assertEquals("xxx", config.getLimitIPLookup());
- Assert.assertEquals("false", config.getSslEnabled());
- Assert.assertEquals("xxx", config.getSslMinVersion());
- Assert.assertEquals("true", config.getSslVerifyPeer());
- Assert.assertEquals("xxx", config.getSslCiphers());
- Assert.assertEquals("30s", config.getAutoSyncInterval());
- Assert.assertEquals(100, config.getCompactIndexDelta());
- Assert.assertEquals("100", config.getCompactInterval());
- Assert.assertEquals(20, config.getLogRotateSize());
- Assert.assertEquals(50, config.getLogBackupCount());
+ Assertions.assertEquals(10, config.getMaxHeaderBytes());
+ Assertions.assertEquals(10, config.getMaxBodyBytes());
+ Assertions.assertEquals("60s", config.getReadHeaderTimeout());
+ Assertions.assertEquals("60s", config.getReadTimeout());
+ Assertions.assertEquals("60s", config.getIdleTimeout());
+ Assertions.assertEquals("60s", config.getWriteTimeout());
+ Assertions.assertEquals("s", config.getLimitTTLUnit());
+ Assertions.assertEquals(0, config.getLimitConnections());
+ Assertions.assertEquals("xxx", config.getLimitIPLookup());
+ Assertions.assertEquals("false", config.getSslEnabled());
+ Assertions.assertEquals("xxx", config.getSslMinVersion());
+ Assertions.assertEquals("true", config.getSslVerifyPeer());
+ Assertions.assertEquals("xxx", config.getSslCiphers());
+ Assertions.assertEquals("30s", config.getAutoSyncInterval());
+ Assertions.assertEquals(100, config.getCompactIndexDelta());
+ Assertions.assertEquals("100", config.getCompactInterval());
+ Assertions.assertEquals(20, config.getLogRotateSize());
+ Assertions.assertEquals(50, config.getLogBackupCount());
}
private void initMicroservice() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterInfo.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterInfo.java
index 2689647..1b1eea2 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterInfo.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/registry/TestServiceCenterInfo.java
@@ -17,8 +17,8 @@
package org.apache.servicecomb.serviceregistry.api.registry;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestServiceCenterInfo {
ServiceCenterInfo info = new ServiceCenterInfo();
@@ -27,21 +27,21 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(info.getVersion());
- Assert.assertNull(info.getBuildTag());
- Assert.assertNull(info.getRunMode());
- Assert.assertNull(info.getApiVersion());
- Assert.assertNull(info.getConfig());
+ Assertions.assertNull(info.getVersion());
+ Assertions.assertNull(info.getBuildTag());
+ Assertions.assertNull(info.getRunMode());
+ Assertions.assertNull(info.getApiVersion());
+ Assertions.assertNull(info.getConfig());
}
@Test
public void testInitializedValues() {
initMicroservice(); //Initialize the Object
- Assert.assertEquals("x.x.x", info.getVersion());
- Assert.assertEquals("xxx", info.getBuildTag());
- Assert.assertEquals("dev", info.getRunMode());
- Assert.assertEquals("x.x.x", info.getApiVersion());
- Assert.assertNotNull(info.getConfig());
+ Assertions.assertEquals("x.x.x", info.getVersion());
+ Assertions.assertEquals("xxx", info.getBuildTag());
+ Assertions.assertEquals("dev", info.getRunMode());
+ Assertions.assertEquals("x.x.x", info.getApiVersion());
+ Assertions.assertNotNull(info.getConfig());
}
private void initMicroservice() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateSchemaRequest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateSchemaRequest.java
index 6d7cbac..1be09dc 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateSchemaRequest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateSchemaRequest.java
@@ -16,17 +16,17 @@
*/
package org.apache.servicecomb.serviceregistry.api.request;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestCreateSchemaRequest {
- @Test
- public void testProperties() {
- CreateSchemaRequest request = new CreateSchemaRequest();
+ @Test
+ public void testProperties() {
+ CreateSchemaRequest request = new CreateSchemaRequest();
- Assert.assertEquals(null, request.getSchema());
+ Assertions.assertNull(request.getSchema());
- request.setSchema("schema");
- Assert.assertEquals("schema", request.getSchema());
- }
+ request.setSchema("schema");
+ Assertions.assertEquals("schema", request.getSchema());
+ }
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateServiceRequest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateServiceRequest.java
index b25f93c..3fa95a0 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateServiceRequest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestCreateServiceRequest.java
@@ -19,9 +19,9 @@
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestCreateServiceRequest {
@@ -44,13 +44,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oCreateServiceRequest.getService());
+ Assertions.assertNull(oCreateServiceRequest.getService());
}
@Test
public void testInitializedValues() {
initCreateServiceRequest(); //Initialize the Object
- Assert.assertEquals(oMockMicroservice, oCreateServiceRequest.getService());
+ Assertions.assertEquals(oMockMicroservice, oCreateServiceRequest.getService());
}
private void initCreateServiceRequest() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestRegisterInstanceRequest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestRegisterInstanceRequest.java
index 6258783..4af001d 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestRegisterInstanceRequest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestRegisterInstanceRequest.java
@@ -19,9 +19,9 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestRegisterInstanceRequest {
@@ -44,13 +44,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oRegisterInstanceRequest.getInstance());
+ Assertions.assertNull(oRegisterInstanceRequest.getInstance());
}
@Test
public void testInitializedValues() {
initRegisterInstanceRequest(); //Initialize the Object
- Assert.assertEquals(oMockMicroserviceInstance, oRegisterInstanceRequest.getInstance());
+ Assertions.assertEquals(oMockMicroserviceInstance, oRegisterInstanceRequest.getInstance());
}
private void initRegisterInstanceRequest() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestUpdatePropertiesRequest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestUpdatePropertiesRequest.java
index 5169b17..c054957 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestUpdatePropertiesRequest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/request/TestUpdatePropertiesRequest.java
@@ -19,19 +19,19 @@
import java.util.HashMap;
import java.util.Map;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestUpdatePropertiesRequest {
@Test
public void testProperties() {
UpdatePropertiesRequest request = new UpdatePropertiesRequest();
- Assert.assertEquals(null, request.getProperties());
+ Assertions.assertNull(request.getProperties());
Map<String, String> properties = new HashMap<>();
properties.put("k", "v");
request.setProperties(properties);
- Assert.assertEquals(properties, request.getProperties());
+ Assertions.assertEquals(properties, request.getProperties());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestCreateServiceResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestCreateServiceResponse.java
index a417215..6298dff 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestCreateServiceResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestCreateServiceResponse.java
@@ -18,9 +18,9 @@
package org.apache.servicecomb.serviceregistry.api.response;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestCreateServiceResponse {
@@ -38,13 +38,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oCreateServiceResponse.getServiceId());
+ Assertions.assertNull(oCreateServiceResponse.getServiceId());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals("testServiceId", oCreateServiceResponse.getServiceId());
+ Assertions.assertEquals("testServiceId", oCreateServiceResponse.getServiceId());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestFindInstancesResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestFindInstancesResponse.java
index 94241a5..fbc6be0 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestFindInstancesResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestFindInstancesResponse.java
@@ -23,9 +23,9 @@
import org.apache.servicecomb.registry.api.registry.FindInstancesResponse;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestFindInstancesResponse {
@@ -49,13 +49,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oFindInstancesResponse.getInstances());
+ Assertions.assertNull(oFindInstancesResponse.getInstances());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals(1, oFindInstancesResponse.getInstances().size());
+ Assertions.assertEquals(1, oFindInstancesResponse.getInstances().size());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetAllServicesResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetAllServicesResponse.java
index 5ba2093..044cc0b 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetAllServicesResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetAllServicesResponse.java
@@ -22,9 +22,9 @@
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestGetAllServicesResponse {
@@ -46,14 +46,14 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oGetAllServicesResponse.getServices());
+ Assertions.assertNull(oGetAllServicesResponse.getServices());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
List<Microservice> list = oGetAllServicesResponse.getServices();
- Assert.assertEquals(oMockMicroservice, list.get(0));
+ Assertions.assertEquals(oMockMicroservice, list.get(0));
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetExistenceResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetExistenceResponse.java
index 4a189a9..0f313b2 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetExistenceResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetExistenceResponse.java
@@ -18,9 +18,9 @@
package org.apache.servicecomb.serviceregistry.api.response;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestGetExistenceResponse {
@@ -38,15 +38,15 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oGetExistenceResponse.getSchemaId());
- Assert.assertNull(oGetExistenceResponse.getServiceId());
+ Assertions.assertNull(oGetExistenceResponse.getSchemaId());
+ Assertions.assertNull(oGetExistenceResponse.getServiceId());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals("testSchemaId", oGetExistenceResponse.getSchemaId());
- Assert.assertEquals("testServiceId", oGetExistenceResponse.getServiceId());
+ Assertions.assertEquals("testSchemaId", oGetExistenceResponse.getSchemaId());
+ Assertions.assertEquals("testServiceId", oGetExistenceResponse.getServiceId());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetInstancesResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetInstancesResponse.java
index b6597ec..758a221 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetInstancesResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetInstancesResponse.java
@@ -22,9 +22,9 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestGetInstancesResponse {
@@ -48,13 +48,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oGetInstancesResponse.getInstances());
+ Assertions.assertNull(oGetInstancesResponse.getInstances());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals(1, oGetInstancesResponse.getInstances().size());
+ Assertions.assertEquals(1, oGetInstancesResponse.getInstances().size());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetServiceResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetServiceResponse.java
index 977c9df..167c9ea 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetServiceResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestGetServiceResponse.java
@@ -19,9 +19,9 @@
import org.apache.servicecomb.registry.api.registry.Microservice;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestGetServiceResponse {
@@ -43,13 +43,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oGetServiceResponse.getService());
+ Assertions.assertNull(oGetServiceResponse.getService());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals(oMockMicroservice, oGetServiceResponse.getService());
+ Assertions.assertEquals(oMockMicroservice, oGetServiceResponse.getService());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestHeartbeatResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestHeartbeatResponse.java
index 2fe32b0..f8201b7 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestHeartbeatResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestHeartbeatResponse.java
@@ -18,9 +18,9 @@
package org.apache.servicecomb.serviceregistry.api.response;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestHeartbeatResponse {
@@ -38,15 +38,15 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oHeartbeatResponse.getMessage());
- Assert.assertEquals(false, oHeartbeatResponse.isOk());
+ Assertions.assertNull(oHeartbeatResponse.getMessage());
+ Assertions.assertFalse(oHeartbeatResponse.isOk());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals("testMessage", oHeartbeatResponse.getMessage());
- Assert.assertEquals(true, oHeartbeatResponse.isOk());
+ Assertions.assertEquals("testMessage", oHeartbeatResponse.getMessage());
+ Assertions.assertTrue(oHeartbeatResponse.isOk());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceChangedEvent.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceChangedEvent.java
index df9cc5a..986464c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceChangedEvent.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceChangedEvent.java
@@ -22,9 +22,9 @@
import org.apache.servicecomb.registry.api.registry.WatchAction;
import org.apache.servicecomb.registry.api.event.MicroserviceInstanceChangedEvent;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestMicroserviceInstanceChangedEvent {
@@ -51,25 +51,25 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oMicroserviceInstanceChangedEvent.getAction());
- Assert.assertNull(oMicroserviceInstanceChangedEvent.getInstance());
- Assert.assertNull(oMicroserviceInstanceChangedEvent.getKey());
+ Assertions.assertNull(oMicroserviceInstanceChangedEvent.getAction());
+ Assertions.assertNull(oMicroserviceInstanceChangedEvent.getInstance());
+ Assertions.assertNull(oMicroserviceInstanceChangedEvent.getKey());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals(WatchAction.CREATE, oMicroserviceInstanceChangedEvent.getAction());
- Assert.assertEquals("CREATE", oMicroserviceInstanceChangedEvent.getAction().getName());
- Assert.assertEquals(oMockMicroserviceInstance, oMicroserviceInstanceChangedEvent.getInstance());
- Assert.assertEquals(oMockMicroserviceKey, oMicroserviceInstanceChangedEvent.getKey());
+ Assertions.assertEquals(WatchAction.CREATE, oMicroserviceInstanceChangedEvent.getAction());
+ Assertions.assertEquals("CREATE", oMicroserviceInstanceChangedEvent.getAction().getName());
+ Assertions.assertEquals(oMockMicroserviceInstance, oMicroserviceInstanceChangedEvent.getInstance());
+ Assertions.assertEquals(oMockMicroserviceKey, oMicroserviceInstanceChangedEvent.getKey());
//Test Different Actions
oMicroserviceInstanceChangedEvent.setAction(WatchAction.UPDATE);
- Assert.assertEquals("UPDATE", oMicroserviceInstanceChangedEvent.getAction().getName());
+ Assertions.assertEquals("UPDATE", oMicroserviceInstanceChangedEvent.getAction().getName());
oMicroserviceInstanceChangedEvent.setAction(WatchAction.DELETE);
- Assert.assertEquals("DELETE", oMicroserviceInstanceChangedEvent.getAction().getName());
+ Assertions.assertEquals("DELETE", oMicroserviceInstanceChangedEvent.getAction().getName());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceResponse.java
index edcdd51..d9d871a 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestMicroserviceInstanceResponse.java
@@ -18,8 +18,8 @@
package org.apache.servicecomb.serviceregistry.api.response;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceInstanceResponse {
@Test
@@ -27,6 +27,6 @@
MicroserviceInstance microserviceInstance = new MicroserviceInstance();
MicroserviceInstanceResponse microserviceInstanceResponse = new MicroserviceInstanceResponse();
microserviceInstanceResponse.setInstance(microserviceInstance);
- Assert.assertNotNull(microserviceInstanceResponse.getInstance());
+ Assertions.assertNotNull(microserviceInstanceResponse.getInstance());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java
index 9638e9f..6ef00c6 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/api/response/TestRegisterInstanceResponse.java
@@ -21,6 +21,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestRegisterInstanceResponse {
@@ -38,13 +39,13 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(oRegisterInstanceResponse.getInstanceId());
+ Assertions.assertNull(oRegisterInstanceResponse.getInstanceId());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals("testInstanceID", oRegisterInstanceResponse.getInstanceId());
+ Assertions.assertEquals("testInstanceID", oRegisterInstanceResponse.getInstanceId());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java
index af3776b..95b6e4c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TestRBACBootStrapService.java
@@ -18,8 +18,8 @@
package org.apache.servicecomb.serviceregistry.auth;
import org.apache.servicecomb.foundation.auth.Cipher;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestRBACBootStrapService {
RBACBootStrapService rbacBootStrapService = new RBACBootStrapService();
@@ -27,10 +27,10 @@
@Test
public void testGetCipher() {
Cipher cipher = rbacBootStrapService.getCipher("testCipher");
- Assert.assertSame(cipher.name(), "testCipher");
+ Assertions.assertSame(cipher.name(), "testCipher");
char[] encrypted = "testtest".toCharArray();
String result = String.valueOf(cipher.decrypt(encrypted));
- Assert.assertEquals(result, "test");
+ Assertions.assertEquals(result, "test");
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java
index 50c9821..2f0b2f5 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManagerTest.java
@@ -19,8 +19,8 @@
import org.apache.servicecomb.foundation.auth.Cipher;
import org.apache.servicecomb.service.center.client.model.RbacTokenRequest;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TokenCacheManagerTest {
RBACBootStrapService rbacBootStrapService = new RBACBootStrapService();
@@ -28,13 +28,13 @@
@Test
public void testCreateHeaders() {
Cipher cipher = rbacBootStrapService.getCipher("testCipher");
- Assert.assertSame(cipher.name(), "testCipher");
+ Assertions.assertSame(cipher.name(), "testCipher");
RbacTokenRequest request = new RbacTokenRequest();
request.setName("root");
- Assert.assertEquals(request.getName(), "root");
+ Assertions.assertEquals(request.getName(), "root");
request.setPassword(new String(cipher.decrypt("testtest".toCharArray())));
- Assert.assertEquals(request.getPassword(), "test");
+ Assertions.assertEquals(request.getPassword(), "test");
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCache.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCache.java
index d3f50b9..1bf15db 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCache.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCache.java
@@ -27,9 +27,9 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstanceStatus;
import org.apache.servicecomb.registry.cache.CacheEndpoint;
import org.apache.servicecomb.registry.cache.InstanceCache;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestInstanceCache {
private static InstanceCache instanceCache = null;
@@ -51,29 +51,29 @@
@Test
public void testGetMethod() {
- Assert.assertEquals("testAppID", instanceCache.getAppId());
- Assert.assertEquals("testMicroServiceName", instanceCache.getMicroserviceName());
- Assert.assertEquals("1.0", instanceCache.getMicroserviceVersionRule());
- Assert.assertNotNull(instanceCache.getInstanceMap());
+ Assertions.assertEquals("testAppID", instanceCache.getAppId());
+ Assertions.assertEquals("testMicroServiceName", instanceCache.getMicroserviceName());
+ Assertions.assertEquals("1.0", instanceCache.getMicroserviceVersionRule());
+ Assertions.assertNotNull(instanceCache.getInstanceMap());
}
@Test
public void testGetOrCreateTransportMap() {
Map<String, List<CacheEndpoint>> transportMap = instanceCache.getOrCreateTransportMap();
- Assert.assertEquals(1, transportMap.size());
+ Assertions.assertEquals(1, transportMap.size());
}
@Test
public void testCacheChanged() {
InstanceCache newCache =
new InstanceCache("testAppID", "testMicroServiceName", "1.0", instanceCache.getInstanceMap());
- Assert.assertTrue(instanceCache.cacheChanged(newCache));
+ Assertions.assertTrue(instanceCache.cacheChanged(newCache));
}
@Test
public void getVersionedCache() {
VersionedCache versionedCache = instanceCache.getVersionedCache();
- Assert.assertEquals("1.0", versionedCache.name());
- Assert.assertSame(instMap, versionedCache.data());
+ Assertions.assertEquals("1.0", versionedCache.name());
+ Assertions.assertSame(instMap, versionedCache.data());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCacheManagerNew.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCacheManagerNew.java
index db85897..70f297f 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCacheManagerNew.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestInstanceCacheManagerNew.java
@@ -25,9 +25,9 @@
import org.apache.servicecomb.registry.consumer.MicroserviceManager;
import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestInstanceCacheManagerNew {
MockMicroserviceVersions mockMicroserviceVersions;
@@ -59,7 +59,7 @@
microserviceManager.getVersionsByName()
.put(mockMicroserviceVersions.getMicroserviceName(), mockMicroserviceVersions);
- Assert.assertEquals(8,
+ Assertions.assertEquals(8,
mgr
.getOrCreate(mockMicroserviceVersions.getAppId(),
mockMicroserviceVersions.getMicroserviceName(),
@@ -73,7 +73,7 @@
microserviceManager.getVersionsByName()
.put(mockMicroserviceVersions.getMicroserviceName(), mockMicroserviceVersions);
- Assert.assertEquals(8,
+ Assertions.assertEquals(8,
mgr
.getOrCreateVersionedCache(mockMicroserviceVersions.getAppId(),
mockMicroserviceVersions.getMicroserviceName(),
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestMicroserviceInstanceCache.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestMicroserviceInstanceCache.java
index 84ebee5..cdd8401 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestMicroserviceInstanceCache.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/cache/TestMicroserviceInstanceCache.java
@@ -27,7 +27,6 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -35,6 +34,7 @@
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceInstanceCache {
@Before
@@ -64,11 +64,11 @@
};
Microservice cachedService = MicroserviceInstanceCache.getOrCreate("forkedid");
- Assert.assertNotNull(cachedService);
+ Assertions.assertNotNull(cachedService);
cachedService = MicroserviceInstanceCache.getOrCreate("forkedid");
- Assert.assertNotNull(cachedService);
+ Assertions.assertNotNull(cachedService);
cachedService = MicroserviceInstanceCache.getOrCreate("forkedidNull");
- Assert.assertNull(cachedService);
+ Assertions.assertNull(cachedService);
}
@Test
@@ -92,10 +92,10 @@
}
};
MicroserviceInstance cachedInstance = MicroserviceInstanceCache.getOrCreate("forkedserviceid", "forkedinstanceid");
- Assert.assertNotNull(cachedInstance);
+ Assertions.assertNotNull(cachedInstance);
cachedInstance = MicroserviceInstanceCache.getOrCreate("forkedserviceid", "forkedinstanceid");
- Assert.assertNotNull(cachedInstance);
+ Assertions.assertNotNull(cachedInstance);
cachedInstance = MicroserviceInstanceCache.getOrCreate("forkedserviceidNull", "forkedinstanceidNull");
- Assert.assertNull(cachedInstance);
+ Assertions.assertNull(cachedInstance);
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
index a3b4a74..fea0f34 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImplTest.java
@@ -17,8 +17,6 @@
package org.apache.servicecomb.serviceregistry.client;
-import static org.junit.Assert.fail;
-
import java.io.InputStream;
import java.util.List;
@@ -55,16 +53,16 @@
@Test
public void testLoadRegistryFile() {
- Assert.assertNotNull(registryClient);
+ Assertions.assertNotNull(registryClient);
MatcherAssert.assertThat(registryClient.getAllMicroservices().size(), Is.is(2));
List<MicroserviceInstance> m =
registryClient.findServiceInstance("", "default", "ms2", DefinitionConst.VERSION_RULE_ALL);
- Assert.assertEquals(1, m.size());
+ Assertions.assertEquals(1, m.size());
MicroserviceInstances microserviceInstances =
registryClient.findServiceInstances("", "default", "ms2", DefinitionConst.VERSION_RULE_ALL, null);
List<MicroserviceInstance> mi = microserviceInstances.getInstancesResponse().getInstances();
- Assert.assertEquals(1, mi.size());
+ Assertions.assertEquals(1, mi.size());
}
private Microservice mockRegisterMicroservice(String appId, String name, String version) {
@@ -82,20 +80,20 @@
public void getMicroserviceId_appNotMatch() {
mockRegisterMicroservice("otherApp", microserviceName, "1.0.0");
- Assert.assertNull(registryClient.getMicroserviceId(appId, microserviceName, "1.0.0", ""));
+ Assertions.assertNull(registryClient.getMicroserviceId(appId, microserviceName, "1.0.0", ""));
}
@Test
public void getMicroserviceId_nameNotMatch() {
mockRegisterMicroservice(appId, "otherName", "1.0.0");
- Assert.assertNull(registryClient.getMicroserviceId(appId, microserviceName, "1.0.0", ""));
+ Assertions.assertNull(registryClient.getMicroserviceId(appId, microserviceName, "1.0.0", ""));
}
@Test
public void getMicroserviceId_versionNotMatch() {
mockRegisterMicroservice(appId, microserviceName, "1.0.0");
- Assert.assertNull(registryClient.getMicroserviceId(appId, microserviceName, "2.0.0", ""));
+ Assertions.assertNull(registryClient.getMicroserviceId(appId, microserviceName, "2.0.0", ""));
}
@Test
@@ -105,7 +103,7 @@
String serviceId =
registryClient.getMicroserviceId(appId, microserviceName, DefinitionConst.VERSION_RULE_LATEST, "");
- Assert.assertEquals(v2.getServiceId(), serviceId);
+ Assertions.assertEquals(v2.getServiceId(), serviceId);
}
@Test
@@ -114,7 +112,7 @@
mockRegisterMicroservice(appId, microserviceName, "2.0.0");
String serviceId = registryClient.getMicroserviceId(appId, microserviceName, "1.0.0", "");
- Assert.assertEquals(v1.getServiceId(), serviceId);
+ Assertions.assertEquals(v1.getServiceId(), serviceId);
}
@Test
@@ -166,7 +164,7 @@
public void registerSchema_normal() {
Microservice v1 = mockRegisterMicroservice(appId, microserviceName, "1.0.0");
- Assert.assertTrue(registryClient.registerSchema(v1.getServiceId(), "sid", "content"));
+ Assertions.assertTrue(registryClient.registerSchema(v1.getServiceId(), "sid", "content"));
}
@Test
@@ -175,27 +173,27 @@
MicroserviceInstance instance = new MicroserviceInstance();
instance.setServiceId(microservice.getServiceId());
String instanceId = registryClient.registerMicroserviceInstance(instance);
- Assert.assertNotNull(registryClient.findServiceInstance(microservice.getServiceId(), instanceId));
+ Assertions.assertNotNull(registryClient.findServiceInstance(microservice.getServiceId(), instanceId));
}
@Test
public void testGetServiceCenterInfo() {
ServiceCenterInfo serviceCenterInfo = registryClient.getServiceCenterInfo();
- Assert.assertEquals("1.0.0", serviceCenterInfo.getVersion());
+ Assertions.assertEquals("1.0.0", serviceCenterInfo.getVersion());
}
@Test
public void testGetSchemas() {
Holder<List<GetSchemaResponse>> schemasHolder = registryClient.getSchemas("002");
- Assert.assertEquals(200, schemasHolder.getStatusCode());
- Assert.assertTrue(schemasHolder.getValue().isEmpty());
+ Assertions.assertEquals(200, schemasHolder.getStatusCode());
+ Assertions.assertTrue(schemasHolder.getValue().isEmpty());
}
@Test
public void testLoadSchemaIdsFromRegistryFile() {
Microservice microservice = registryClient.getMicroservice("002");
MatcherAssert.assertThat(microservice.getSchemas().size(), Is.is(1));
- Assert.assertTrue(microservice.getSchemas().contains("hello"));
+ Assertions.assertTrue(microservice.getSchemas().contains("hello"));
}
@SuppressWarnings("deprecation")
@@ -204,16 +202,16 @@
List<MicroserviceInstance> m = registryClient
.findServiceInstance("", "default", "ms2", DefinitionConst.VERSION_RULE_ALL);
MicroserviceInstance instance = m.get(0);
- Assert.assertEquals(MicroserviceInstanceStatus.UP, instance.getStatus());
+ Assertions.assertEquals(MicroserviceInstanceStatus.UP, instance.getStatus());
boolean updateOperationResult = registryClient
.undateMicroserviceInstanceStatus(instance.getServiceId(), instance.getInstanceId(), "TESTING");
- Assert.assertTrue(updateOperationResult);
+ Assertions.assertTrue(updateOperationResult);
m = registryClient
.findServiceInstance("", "default", "ms2", DefinitionConst.VERSION_RULE_ALL);
instance = m.get(0);
- Assert.assertEquals(MicroserviceInstanceStatus.TESTING, instance.getStatus());
+ Assertions.assertEquals(MicroserviceInstanceStatus.TESTING, instance.getStatus());
}
@SuppressWarnings("deprecation")
@@ -223,14 +221,14 @@
registryClient.undateMicroserviceInstanceStatus("msIdNotExist", "", "UP");
shouldThrowException();
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid serviceId, serviceId=msIdNotExist", e.getMessage());
+ Assertions.assertEquals("Invalid serviceId, serviceId=msIdNotExist", e.getMessage());
}
try {
registryClient.undateMicroserviceInstanceStatus("002", "instanceIdNotExist", "UP");
shouldThrowException();
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid argument. microserviceId=002, instanceId=instanceIdNotExist.",
+ Assertions.assertEquals("Invalid argument. microserviceId=002, instanceId=instanceIdNotExist.",
e.getMessage());
}
}
@@ -246,19 +244,19 @@
registryClient.undateMicroserviceInstanceStatus(instance.getServiceId(), instance.getInstanceId(), null);
shouldThrowException();
} catch (NullPointerException e) {
- Assert.assertEquals("Name is null", e.getMessage());
+ Assertions.assertEquals("Name is null", e.getMessage());
}
try {
registryClient
.undateMicroserviceInstanceStatus(instance.getServiceId(), instance.getInstanceId(), "IllegalStatus");
shouldThrowException();
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid status: IllegalStatus", e.getMessage());
+ Assertions.assertEquals("Invalid status: IllegalStatus", e.getMessage());
}
}
private void shouldThrowException() {
- fail("an exception is expected");
+ Assertions.fail("an exception is expected");
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestEndpoints.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestEndpoints.java
index 999c1f7..b575c47 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestEndpoints.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestEndpoints.java
@@ -20,8 +20,8 @@
import java.util.List;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestEndpoints {
@Test
@@ -35,9 +35,9 @@
ep.setInstances(instances);
ep.setVersion("v1");
- Assert.assertEquals("appId", ep.getAppId());
- Assert.assertEquals("sn", ep.getServiceName());
- Assert.assertEquals(instances, ep.getInstances());
- Assert.assertEquals("v1", ep.getVersion());
+ Assertions.assertEquals("appId", ep.getAppId());
+ Assertions.assertEquals("sn", ep.getServiceName());
+ Assertions.assertEquals(instances, ep.getInstances());
+ Assertions.assertEquals("v1", ep.getVersion());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java
index 5c12cde..3e34874 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/TestIpPortManager.java
@@ -25,7 +25,6 @@
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.foundation.common.net.IpPort;
import org.apache.servicecomb.registry.RegistrationManager;
-import org.apache.servicecomb.registry.api.registry.DataCenterInfo;
import org.apache.servicecomb.serviceregistry.RegistryUtils;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.registry.cache.CacheEndpoint;
@@ -35,7 +34,6 @@
import org.apache.servicecomb.serviceregistry.refresh.ClassificationAddress;
import org.apache.servicecomb.serviceregistry.registry.AbstractServiceRegistry;
import org.apache.servicecomb.serviceregistry.registry.LocalServiceRegistryFactory;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -44,6 +42,7 @@
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestIpPortManager {
@Mocked
@@ -84,22 +83,22 @@
IpPort address1 = manager.getAvailableAddress();
// test initial
- Assert.assertEquals("127.0.0.1", address1.getHostOrIp());
- Assert.assertTrue(address1.getPort() == 9980 || address1.getPort() == 9981);
+ Assertions.assertEquals("127.0.0.1", address1.getHostOrIp());
+ Assertions.assertTrue(address1.getPort() == 9980 || address1.getPort() == 9981);
// test getAvailableAddress()
IpPort address2 = manager.getAvailableAddress();
- Assert.assertEquals("127.0.0.1", address2.getHostOrIp());
+ Assertions.assertEquals("127.0.0.1", address2.getHostOrIp());
if (address1.getPort() == 9980) {
- Assert.assertEquals(9981, address2.getPort());
+ Assertions.assertEquals(9981, address2.getPort());
} else {
- Assert.assertEquals(9980, address2.getPort());
+ Assertions.assertEquals(9980, address2.getPort());
}
// test getAvailableAddress() when reaching the end
IpPort address3 = manager.getAvailableAddress();
- Assert.assertEquals("127.0.0.1", address3.getHostOrIp());
- Assert.assertEquals(address1.getPort(), address3.getPort());
+ Assertions.assertEquals("127.0.0.1", address3.getHostOrIp());
+ Assertions.assertEquals(address1.getPort(), address3.getPort());
// mock endpoint list
Map<String, List<CacheEndpoint>> addresses = new HashMap<>();
@@ -121,15 +120,15 @@
// test getAvailableAddress() when auto discovery is disabled
IpPort address4 = manager.getAvailableAddress();
- Assert.assertEquals("127.0.0.1", address4.getHostOrIp());
+ Assertions.assertEquals("127.0.0.1", address4.getHostOrIp());
if (address1.getPort() == 9980) {
address4 = manager.getAvailableAddress();
}
- Assert.assertEquals(9980, address4.getPort());
+ Assertions.assertEquals(9980, address4.getPort());
IpPort address5 = manager.getAvailableAddress();
- Assert.assertEquals("127.0.0.1", address5.getHostOrIp());
- Assert.assertEquals(9981, address5.getPort());
+ Assertions.assertEquals("127.0.0.1", address5.getHostOrIp());
+ Assertions.assertEquals(9981, address5.getPort());
//mock RegistrationManager.INSTANCE
String instanceId = "e8a04b54cf2711e7b701286ed488fc20";
@@ -147,8 +146,8 @@
manager.initAutoDiscovery();
manager.setAutoDiscoveryInited(true);
IpPort address6 = manager.getAvailableAddress();
- Assert.assertEquals("127.0.0.1", address6.getHostOrIp());
- Assert.assertEquals(9982, address6.getPort());
+ Assertions.assertEquals("127.0.0.1", address6.getHostOrIp());
+ Assertions.assertEquals(9982, address6.getPort());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientHttp.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientHttp.java
index 2f39cca..8b0ddd9 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientHttp.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestClientHttp.java
@@ -30,8 +30,8 @@
import org.apache.servicecomb.serviceregistry.client.Endpoints;
import org.apache.servicecomb.serviceregistry.client.IpPortManager;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import io.vertx.core.Handler;
@@ -99,26 +99,26 @@
oClient.init();
oClient.registerMicroservice(microservice);
oClient.registerMicroserviceInstance(microservice.getInstance());
- Assert.assertNull(oClient.getMicroservice(microservice.getServiceId()));
- Assert.assertNull(oClient.getMicroserviceInstance("testConsumerID", "testproviderID"));
- Assert.assertNull(oClient.findServiceInstance(microservice.getServiceId(),
+ Assertions.assertNull(oClient.getMicroservice(microservice.getServiceId()));
+ Assertions.assertNull(oClient.getMicroserviceInstance("testConsumerID", "testproviderID"));
+ Assertions.assertNull(oClient.findServiceInstance(microservice.getServiceId(),
microservice.getAppId(),
microservice.getServiceName(),
microservice.getVersion()));
- Assert.assertNull(oClient.findServiceInstances(microservice.getServiceId(),
+ Assertions.assertNull(oClient.findServiceInstances(microservice.getServiceId(),
microservice.getAppId(),
microservice.getServiceName(),
microservice.getVersion(),
"0"));
- Assert.assertNull(oClient.getMicroserviceId(microservice.getAppId(),
+ Assertions.assertNull(oClient.getMicroserviceId(microservice.getAppId(),
microservice.getServiceName(),
microservice.getVersion(),
microservice.getEnvironment()));
- Assert.assertNull(oClient.heartbeat(microservice.getServiceId(),
+ Assertions.assertNull(oClient.heartbeat(microservice.getServiceId(),
microservice.getInstance().getInstanceId()));
oClient.watch("",
Mockito.mock(AsyncResultCallback.class));
- Assert.assertFalse(oClient.unregisterMicroserviceInstance(microservice.getServiceId(),
+ Assertions.assertFalse(oClient.unregisterMicroserviceInstance(microservice.getServiceId(),
microservice.getInstance().getInstanceId()));
}
@@ -130,15 +130,15 @@
oContext.setIpPort(new IpPort("145.0.0.1", 8080));
oContext.setParams(null);
- Assert.assertEquals("//test", oContext.getUri());
- Assert.assertEquals(io.vertx.core.http.HttpMethod.POST, oContext.getMethod());
- Assert.assertEquals(8080, oContext.getIpPort().getPort());
- Assert.assertNull(oContext.getParams());
+ Assertions.assertEquals("//test", oContext.getUri());
+ Assertions.assertEquals(io.vertx.core.http.HttpMethod.POST, oContext.getMethod());
+ Assertions.assertEquals(8080, oContext.getIpPort().getPort());
+ Assertions.assertNull(oContext.getParams());
RestResponse oResponse = new RestResponse(null, null);
oResponse.setRequestContext(oContext);
- Assert.assertEquals(oContext, oResponse.getRequestContext());
- Assert.assertNull(oResponse.getResponse());
+ Assertions.assertEquals(oContext, oResponse.getRequestContext());
+ Assertions.assertNull(oResponse.getResponse());
}
@Test
@@ -150,25 +150,25 @@
oParam.addHeader("testKey", "testValue");
oParam.addQueryParam("testParam", "ValueParam");
oParam.addQueryParam("testParam1", "ValueParam");
- Assert.assertNull(oParam.getCookies());
- Assert.assertNull(oParam.getBody());
- Assert.assertNotEquals(null, oParam.getHeaders());
- Assert.assertNotEquals(null, oParam.getQueryParams());
+ Assertions.assertNull(oParam.getCookies());
+ Assertions.assertNull(oParam.getBody());
+ Assertions.assertNotEquals(null, oParam.getHeaders());
+ Assertions.assertNotEquals(null, oParam.getQueryParams());
oParam.setQueryParams(null);
- Assert.assertEquals("", oParam.getQueryParams());
+ Assertions.assertEquals("", oParam.getQueryParams());
oParam.setFormFields(null);
- Assert.assertNull(oParam.getFormFields());
+ Assertions.assertNull(oParam.getFormFields());
Endpoints oEndpoints = new Endpoints();
oEndpoints.setInstances(null);
oEndpoints.setVersion("1.0");
- Assert.assertNull(oEndpoints.getInstances());
- Assert.assertEquals("1.0", oEndpoints.getVersion());
+ Assertions.assertNull(oEndpoints.getInstances());
+ Assertions.assertEquals("1.0", oEndpoints.getVersion());
}
@Test
public void testIpPortManager() {
IpPortManager oManager = new IpPortManager(ServiceRegistryConfig.INSTANCE);
IpPort oIPPort = oManager.getAvailableAddress();
- Assert.assertEquals(oIPPort.getHostOrIp(), oManager.getAvailableAddress().getHostOrIp());
+ Assertions.assertEquals(oIPPort.getHostOrIp(), oManager.getAvailableAddress().getHostOrIp());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java
index 3ab56a7..4d7fbb5 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestMicroserviceInstances.java
@@ -24,9 +24,9 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstances;
import org.apache.servicecomb.registry.api.registry.FindInstancesResponse;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
public class TestMicroserviceInstances {
@@ -54,18 +54,18 @@
@Test
public void testDefaultValues() {
- Assert.assertNull(microserviceInstances.getInstancesResponse());
- Assert.assertTrue(microserviceInstances.isNeedRefresh());
- Assert.assertNull(microserviceInstances.getRevision());
- Assert.assertNull(findInstancesResponse.getInstances());
+ Assertions.assertNull(microserviceInstances.getInstancesResponse());
+ Assertions.assertTrue(microserviceInstances.isNeedRefresh());
+ Assertions.assertNull(microserviceInstances.getRevision());
+ Assertions.assertNull(findInstancesResponse.getInstances());
}
@Test
public void testInitializedValues() {
initFields(); //Initialize the Object
- Assert.assertEquals(1, microserviceInstances.getInstancesResponse().getInstances().size());
- Assert.assertFalse(microserviceInstances.isNeedRefresh());
- Assert.assertEquals("1", microserviceInstances.getRevision());
+ Assertions.assertEquals(1, microserviceInstances.getInstancesResponse().getInstances().size());
+ Assertions.assertFalse(microserviceInstances.isNeedRefresh());
+ Assertions.assertEquals("1", microserviceInstances.getRevision());
}
private void initFields() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
index bef821a..71f796e 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java
@@ -18,7 +18,6 @@
package org.apache.servicecomb.serviceregistry.client.http;
import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.HashMap;
@@ -52,9 +51,9 @@
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.hamcrest.MatcherAssert;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.mockito.Mockito;
import com.google.common.cache.CacheBuilder;
@@ -114,10 +113,10 @@
try {
oClient.init();
HttpClientOptions httpClientOptions = Deencapsulation.invoke(oClient, "createHttpClientOptions");
- Assert.assertNotNull(httpClientOptions);
- Assert.assertEquals(80, httpClientOptions.getDefaultPort());
+ Assertions.assertNotNull(httpClientOptions);
+ Assertions.assertEquals(80, httpClientOptions.getDefaultPort());
} catch (Exception e) {
- Assert.assertNotNull(e);
+ Assertions.assertNotNull(e);
}
ArchaiusUtils.resetConfig();
}
@@ -128,23 +127,23 @@
ArchaiusUtils.setProperty(BootStrapProperties.CONFIG_SERVICE_NAME, "ms");
MicroserviceFactory microserviceFactory = new MicroserviceFactory();
Microservice microservice = microserviceFactory.create();
- Assert.assertNull(oClient.registerMicroservice(microservice));
- Assert.assertNull(oClient.registerMicroserviceInstance(microservice.getInstance()));
+ Assertions.assertNull(oClient.registerMicroservice(microservice));
+ Assertions.assertNull(oClient.registerMicroserviceInstance(microservice.getInstance()));
oClient.init();
- Assert.assertNull(oClient.getMicroserviceId(microservice.getAppId(),
+ Assertions.assertNull(oClient.getMicroserviceId(microservice.getAppId(),
microservice.getServiceName(),
microservice.getVersion(),
microservice.getEnvironment()));
MatcherAssert.assertThat(oClient.getAllMicroservices().isEmpty(), is(true));
- Assert.assertNull(oClient.registerMicroservice(microservice));
- Assert.assertNull(oClient.getMicroservice("microserviceId"));
- Assert.assertNull(oClient.getMicroserviceInstance("consumerId", "providerId"));
- Assert.assertFalse(oClient.unregisterMicroserviceInstance("microserviceId", "microserviceInstanceId"));
- Assert.assertNull(oClient.heartbeat("microserviceId", "microserviceInstanceId"));
- Assert.assertNull(oClient.findServiceInstance("selfMicroserviceId", "appId", "serviceName", "versionRule"));
- Assert.assertNull(oClient.findServiceInstances("selfMicroserviceId", "appId", "serviceName", "versionRule", "0"));
+ Assertions.assertNull(oClient.registerMicroservice(microservice));
+ Assertions.assertNull(oClient.getMicroservice("microserviceId"));
+ Assertions.assertNull(oClient.getMicroserviceInstance("consumerId", "providerId"));
+ Assertions.assertFalse(oClient.unregisterMicroserviceInstance("microserviceId", "microserviceInstanceId"));
+ Assertions.assertNull(oClient.heartbeat("microserviceId", "microserviceInstanceId"));
+ Assertions.assertNull(oClient.findServiceInstance("selfMicroserviceId", "appId", "serviceName", "versionRule"));
+ Assertions.assertNull(oClient.findServiceInstances("selfMicroserviceId", "appId", "serviceName", "versionRule", "0"));
- Assert.assertEquals("a", new ClientException("a").getMessage());
+ Assertions.assertEquals("a", new ClientException("a").getMessage());
ArchaiusUtils.resetConfig();
}
@@ -187,7 +186,7 @@
new RegisterSchemaTester() {
void doRun(java.util.List<LoggingEvent> events) {
oClient.registerSchema("msid", "schemaId", "content");
- Assert.assertEquals("Register schema msid/schemaId failed.", events.get(0).getMessage());
+ Assertions.assertEquals("Register schema msid/schemaId failed.", events.get(0).getMessage());
}
}.run();
}
@@ -213,10 +212,10 @@
new RegisterSchemaTester() {
void doRun(java.util.List<LoggingEvent> events) {
oClient.registerSchema("msid", "schemaId", "content");
- Assert.assertEquals(
+ Assertions.assertEquals(
"register schema msid/schemaId fail.",
events.get(0).getMessage());
- Assert.assertEquals(e, events.get(0).getThrowableInformation().getThrowable());
+ Assertions.assertEquals(e, events.get(0).getThrowableInformation().getThrowable());
}
}.run();
}
@@ -251,7 +250,7 @@
new RegisterSchemaTester() {
void doRun(java.util.List<LoggingEvent> events) {
oClient.registerSchema("msid", "schemaId", "content");
- Assert.assertEquals(
+ Assertions.assertEquals(
"Register schema msid/schemaId failed, statusCode: 400, statusMessage: client error, description: too big.",
events.get(0).getMessage());
}
@@ -283,7 +282,7 @@
new RegisterSchemaTester() {
void doRun(java.util.List<LoggingEvent> events) {
oClient.registerSchema("msid", "schemaId", "content");
- Assert.assertEquals(
+ Assertions.assertEquals(
"register schema msid/schemaId success.",
events.get(0).getMessage());
}
@@ -321,7 +320,7 @@
Buffer bodyBuffer = Buffer.buffer("{}");
bodyHandlerHolder.value.handle(bodyBuffer);
- Assert.assertNull(holder.value);
+ Assertions.assertNull(holder.value);
}
@Test
@@ -336,7 +335,7 @@
holder.value = new GetExistenceResponse();
}
};
- Assert.assertFalse(oClient.isSchemaExist(microserviceId, schemaId));
+ Assertions.assertFalse(oClient.isSchemaExist(microserviceId, schemaId));
}
@Test
@@ -354,12 +353,12 @@
+ "\"paths\":[],\"status\":\"UP\",\"properties\":{},\"intance\":null}}",
GetServiceResponse.class);
RequestParam requestParam = requestContext.getParams();
- Assert.assertEquals("global=true", requestParam.getQueryParams());
+ Assertions.assertEquals("global=true", requestParam.getQueryParams());
}
};
Microservice aggregatedMicroservice = oClient.getAggregatedMicroservice(microserviceId);
- Assert.assertEquals("serviceId", aggregatedMicroservice.getServiceId());
- Assert.assertEquals("appId", aggregatedMicroservice.getAppId());
+ Assertions.assertEquals("serviceId", aggregatedMicroservice.getServiceId());
+ Assertions.assertEquals("appId", aggregatedMicroservice.getAppId());
}
@Test
@@ -377,7 +376,7 @@
"{ \"schema\": \"schema\", \"schemaId\":\"metricsEndpoint\",\"summary\":\"c1188d709631a9038874f9efc6eb894f\"}",
GetSchemaResponse.class);
RequestParam requestParam = requestContext.getParams();
- Assert.assertEquals("global=true", requestParam.getQueryParams());
+ Assertions.assertEquals("global=true", requestParam.getQueryParams());
}
};
@@ -392,7 +391,7 @@
Deencapsulation.setField(oClient, "schemaCache", newCache);
String str = oClient.getAggregatedSchema(microserviceId, schemaId);
- Assert.assertEquals("schema", str);
+ Assertions.assertEquals("schema", str);
Deencapsulation.setField(oClient, "schemaCache", oldCache);
}
@@ -415,9 +414,9 @@
};
Holder<List<GetSchemaResponse>> schemasHolder = oClient.getSchemas(microserviceId);
List<GetSchemaResponse> schemaResponses = schemasHolder.getValue();
- Assert.assertEquals(200, schemasHolder.getStatusCode());
- Assert.assertEquals(3, schemaResponses.size());
- Assert.assertEquals("bfa81d625cfbd3a57f38745323e16824", schemaResponses.get(1).getSummary());
+ Assertions.assertEquals(200, schemasHolder.getStatusCode());
+ Assertions.assertEquals(3, schemaResponses.size());
+ Assertions.assertEquals("bfa81d625cfbd3a57f38745323e16824", schemaResponses.get(1).getSummary());
}
@Test
@@ -438,9 +437,9 @@
};
Holder<List<GetSchemaResponse>> schemasHolder = oClient.getSchemas(microserviceId);
List<GetSchemaResponse> schemas = schemasHolder.getValue();
- Assert.assertEquals(200, schemasHolder.getStatusCode());
- Assert.assertEquals(3, schemas.size());
- Assert.assertEquals("bfa81d625cfbd3a57f38745323e16824", schemas.get(1).getSummary());
+ Assertions.assertEquals(200, schemasHolder.getStatusCode());
+ Assertions.assertEquals(3, schemas.size());
+ Assertions.assertEquals("bfa81d625cfbd3a57f38745323e16824", schemas.get(1).getSummary());
}
@Test
@@ -456,8 +455,8 @@
};
Holder<List<GetSchemaResponse>> schemasHolder = oClient.getSchemas(microserviceId);
List<GetSchemaResponse> schemaResponses = schemasHolder.getValue();
- Assert.assertEquals(404, schemasHolder.getStatusCode());
- Assert.assertNull(schemaResponses);
+ Assertions.assertEquals(404, schemasHolder.getStatusCode());
+ Assertions.assertNull(schemaResponses);
}
@Test
@@ -466,10 +465,10 @@
@Mock
void get(IpPort ipPort, String uri, RequestParam requestParam,
Handler<RestResponse> responseHandler) {
- Assert.assertEquals("global=true", requestParam.getQueryParams());
+ Assertions.assertEquals("global=true", requestParam.getQueryParams());
}
};
- Assert.assertNull(oClient.findServiceInstance("aaa", "bbb"));
+ Assertions.assertNull(oClient.findServiceInstance("aaa", "bbb"));
}
@Test
@@ -478,11 +477,11 @@
@Mock
void get(IpPort ipPort, String uri, RequestParam requestParam,
Handler<RestResponse> responseHandler) {
- Assert.assertEquals("appId=appId&global=true&serviceName=serviceName&version=1.0.0%2B",
+ Assertions.assertEquals("appId=appId&global=true&serviceName=serviceName&version=1.0.0%2B",
requestParam.getQueryParams());
}
};
- Assert.assertNull(oClient.findServiceInstance(null, "appId", "serviceName", "1.0.0+"));
+ Assertions.assertNull(oClient.findServiceInstance(null, "appId", "serviceName", "1.0.0+"));
}
@Test
@@ -504,7 +503,7 @@
new MockUp<RestClientUtil>() {
@Mock
void httpDo(RequestContext requestContext, Handler<RestResponse> responseHandler) {
- Assert.assertEquals("appId=appId&global=true&serviceName=serviceName&version=0.0.0.0%2B",
+ Assertions.assertEquals("appId=appId&global=true&serviceName=serviceName&version=0.0.0.0%2B",
requestContext.getParams().getQueryParams());
restResponse.setRequestContext(requestContext);
responseHandler.handle(restResponse);
@@ -513,8 +512,8 @@
MicroserviceInstances microserviceInstances = oClient
.findServiceInstances("consumerId", "appId", "serviceName", DefinitionConst.VERSION_RULE_ALL, null);
- Assert.assertTrue(microserviceInstances.isMicroserviceNotExist());
- Assert.assertFalse(microserviceInstances.isNeedRefresh());
+ Assertions.assertTrue(microserviceInstances.isMicroserviceNotExist());
+ Assertions.assertFalse(microserviceInstances.isNeedRefresh());
}
@Test
@@ -534,10 +533,10 @@
}
};
ServiceCenterInfo info = oClient.getServiceCenterInfo();
- Assert.assertEquals("x.x.x", info.getVersion());
- Assert.assertEquals("xxx", info.getBuildTag());
- Assert.assertEquals("dev", info.getRunMode());
- Assert.assertNotNull(info.getConfig());
+ Assertions.assertEquals("x.x.x", info.getVersion());
+ Assertions.assertEquals("xxx", info.getBuildTag());
+ Assertions.assertEquals("dev", info.getRunMode());
+ Assertions.assertNotNull(info.getConfig());
}
@Test
@@ -553,10 +552,10 @@
new RegisterSchemaTester() {
void doRun(java.util.List<LoggingEvent> events) {
oClient.getServiceCenterInfo();
- Assert.assertEquals(
+ Assertions.assertEquals(
"query servicecenter version info failed.",
events.get(0).getMessage());
- Assert.assertEquals(e, events.get(0).getThrowableInformation().getThrowable());
+ Assertions.assertEquals(e, events.get(0).getThrowableInformation().getThrowable());
}
}.run();
}
@@ -579,7 +578,7 @@
};
boolean result = oClient.undateMicroserviceInstanceStatus("svcId", "instanceId", "UP");
- Assert.assertTrue(result);
+ Assertions.assertTrue(result);
}
@SuppressWarnings("deprecation")
@@ -600,7 +599,7 @@
};
boolean result = oClient.undateMicroserviceInstanceStatus("svcId", "instanceId", "UP");
- Assert.assertFalse(result);
+ Assertions.assertFalse(result);
}
@SuppressWarnings("deprecation")
@@ -610,18 +609,18 @@
oClient.undateMicroserviceInstanceStatus("svcId", "instanceId", null);
shouldThrowException();
} catch (NullPointerException e) {
- Assert.assertEquals("Name is null", e.getMessage());
+ Assertions.assertEquals("Name is null", e.getMessage());
}
try {
oClient
.undateMicroserviceInstanceStatus("svcId", "instanceId", "IllegalStatus");
shouldThrowException();
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid status: IllegalStatus", e.getMessage());
+ Assertions.assertEquals("Invalid status: IllegalStatus", e.getMessage());
}
}
private void shouldThrowException() {
- fail("an exception is expected");
+ Assertions.fail("an exception is expected");
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/collect/TestServiceCenterDefaultDeploymentProvider.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/collect/TestServiceCenterDefaultDeploymentProvider.java
index b58ec09..33f8bfa 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/collect/TestServiceCenterDefaultDeploymentProvider.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/collect/TestServiceCenterDefaultDeploymentProvider.java
@@ -22,9 +22,9 @@
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.Assertions;
public class TestServiceCenterDefaultDeploymentProvider {
@@ -42,8 +42,8 @@
public void testConfiguration() {
ServiceCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(ServiceCenterDefaultDeploymentProvider.SYSTEM_KEY_SERVICE_CENTER);
- Assert.assertEquals(info.getAccessURL().get(0), "http://127.0.0.1:30100");
- Assert.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
+ Assertions.assertEquals(info.getAccessURL().get(0), "http://127.0.0.1:30100");
+ Assertions.assertNull(Deployment.getSystemBootStrapInfo("wrong"));
}
@Test
@@ -51,7 +51,7 @@
System.setProperty("servicecomb.service.registry.address", "https://localhost:30100");
ServiceCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(ServiceCenterDefaultDeploymentProvider.SYSTEM_KEY_SERVICE_CENTER);
- Assert.assertEquals(info.getAccessURL().get(0), "https://localhost:30100");
+ Assertions.assertEquals(info.getAccessURL().get(0), "https://localhost:30100");
System.getProperties().remove("servicecomb.service.registry.address");
}
@@ -61,9 +61,9 @@
ServiceCenterDefaultDeploymentProvider.setConfiguration(ConfigUtil.createLocalConfig());
SystemBootstrapInfo info = Deployment.getSystemBootStrapInfo(ServiceCenterDefaultDeploymentProvider.SYSTEM_KEY_SERVICE_CENTER);
- Assert.assertEquals(info.getAccessURL().size(), 2);
- Assert.assertEquals(info.getAccessURL().get(0), "http://127.0.0.1:30100");
- Assert.assertEquals(info.getAccessURL().get(1), "http://127.0.0.2:30100");
+ Assertions.assertEquals(info.getAccessURL().size(), 2);
+ Assertions.assertEquals(info.getAccessURL().get(0), "http://127.0.0.1:30100");
+ Assertions.assertEquals(info.getAccessURL().get(1), "http://127.0.0.2:30100");
System.getProperties().remove("servicecomb.service.registry.address");
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestConfigurePropertyUtils.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestConfigurePropertyUtils.java
index d5f2c4d..8bce5b1 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestConfigurePropertyUtils.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestConfigurePropertyUtils.java
@@ -27,8 +27,8 @@
import org.apache.servicecomb.registry.api.registry.BasePath;
import org.apache.servicecomb.registry.config.ConfigurePropertyUtils;
import org.apache.servicecomb.registry.definition.DefinitionConst;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestConfigurePropertyUtils {
@Test
@@ -40,18 +40,18 @@
Map<String, String> expectedMap = new HashMap<>();
expectedMap.put("key1", "value1");
expectedMap.put("key2", "value2");
- Assert.assertEquals(expectedMap, ConfigurePropertyUtils.getPropertiesWithPrefix(configuration, prefix));
+ Assertions.assertEquals(expectedMap, ConfigurePropertyUtils.getPropertiesWithPrefix(configuration, prefix));
List<BasePath> paths = ConfigurePropertyUtils.getMicroservicePaths(configuration);
- Assert.assertEquals(2, paths.size());
- Assert.assertEquals(paths.get(0).getPath(), "/test1/testpath");
- Assert.assertEquals(paths.get(0).getProperty().get("checksession"), "false");
+ Assertions.assertEquals(2, paths.size());
+ Assertions.assertEquals(paths.get(0).getPath(), "/test1/testpath");
+ Assertions.assertEquals(paths.get(0).getProperty().get("checksession"), "false");
ClassLoaderScopeContext.setClassLoaderScopeProperty(DefinitionConst.URL_PREFIX, "/webroot");
paths = ConfigurePropertyUtils.getMicroservicePaths(configuration);
- Assert.assertEquals(2, paths.size());
- Assert.assertEquals(paths.get(0).getPath(), "/webroot/test1/testpath");
- Assert.assertEquals(paths.get(0).getProperty().get("checksession"), "false");
+ Assertions.assertEquals(2, paths.size());
+ Assertions.assertEquals(paths.get(0).getPath(), "/webroot/test1/testpath");
+ Assertions.assertEquals(paths.get(0).getProperty().get("checksession"), "false");
ClassLoaderScopeContext.clearClassLoaderScopeProperty();
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestPropertiesLoader.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestPropertiesLoader.java
index bffcbc7..2cbadda 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestPropertiesLoader.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestPropertiesLoader.java
@@ -27,8 +27,8 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceFactory;
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.registry.LocalServiceRegistryFactory;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestPropertiesLoader {
private static final MicroserviceFactory microserviceFactory = new MicroserviceFactory();
@@ -41,7 +41,7 @@
configuration.clearProperty(BootStrapProperties.OLD_CONFIG_SERVICE_PROPERTIES);
Microservice microservice = microserviceFactory.create(configuration);
// microservice.yaml has 3 properties
- Assert.assertEquals(3, microservice.getProperties().size());
+ Assertions.assertEquals(3, microservice.getProperties().size());
}
@Test
@@ -52,10 +52,10 @@
try {
microserviceFactory.create(configuration);
- Assert.fail("Must throw exception");
+ Assertions.fail("Must throw exception");
} catch (Error e) {
- Assert.assertEquals(ClassNotFoundException.class, e.getCause().getClass());
- Assert.assertEquals("invalidClass", e.getCause().getMessage());
+ Assertions.assertEquals(ClassNotFoundException.class, e.getCause().getClass());
+ Assertions.assertEquals("invalidClass", e.getCause().getMessage());
}
}
@@ -67,9 +67,9 @@
try {
microserviceFactory.create(configuration);
- Assert.fail("Must throw exception");
+ Assertions.fail("Must throw exception");
} catch (Error e) {
- Assert.assertEquals(
+ Assertions.assertEquals(
"Define propertyExtendedClass java.lang.String in yaml, but not implement the interface PropertyExtended.",
e.getMessage());
}
@@ -82,7 +82,7 @@
expectedMap.put("key1", "value1");
expectedMap.put("key2", "value2");
expectedMap.put("ek0", "ev0");
- Assert.assertEquals(expectedMap, microservice.getProperties());
+ Assertions.assertEquals(expectedMap, microservice.getProperties());
}
@Test
@@ -92,6 +92,6 @@
Map<String, String> expectedMap = new HashMap<>();
expectedMap.put("key0", "value0");
expectedMap.put("ek0", "ev0");
- Assert.assertEquals(expectedMap, instance.getProperties());
+ Assertions.assertEquals(expectedMap, instance.getProperties());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
index baccda6..bc1571f 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/config/TestServiceRegistryConfig.java
@@ -24,9 +24,9 @@
import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils;
import org.apache.servicecomb.serviceregistry.collect.ServiceCenterDefaultDeploymentProvider;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestServiceRegistryConfig {
@BeforeClass
@@ -44,28 +44,26 @@
@Test
public void testServiceRegistryConfig() {
ServiceRegistryConfig oConfig = new ServiceRegistryConfigBuilder().build();
- Assert.assertNull(oConfig.getAccessKey());
- Assert.assertEquals(1000, oConfig.getConnectionTimeout());
- Assert.assertNotEquals(null, oConfig.getHeartbeatInterval());
- Assert.assertEquals("HTTP_1_1", oConfig.getHttpVersion().name());
- Assert.assertEquals("rest", oConfig.getTransport());
- Assert.assertEquals(1, oConfig.getInstances());
- Assert.assertTrue(oConfig.isSsl());
- Assert.assertEquals(30000, oConfig.getRequestTimeout());
- Assert.assertEquals(3000, oConfig.getHeartBeatRequestTimeout());
- Assert.assertNotEquals(null, oConfig.getResendHeartBeatTimes());
- Assert.assertFalse(oConfig.isPreferIpAddress());
- Assert.assertTrue(oConfig.isWatch());
- Assert.assertEquals(ServiceRegistryConfig.NO_TENANT, oConfig.getTenantName());
- Assert.assertNull(oConfig.getSecretKey());
+ Assertions.assertNull(oConfig.getAccessKey());
+ Assertions.assertEquals(1000, oConfig.getConnectionTimeout());
+ Assertions.assertEquals("HTTP_1_1", oConfig.getHttpVersion().name());
+ Assertions.assertEquals("rest", oConfig.getTransport());
+ Assertions.assertEquals(1, oConfig.getInstances());
+ Assertions.assertTrue(oConfig.isSsl());
+ Assertions.assertEquals(30000, oConfig.getRequestTimeout());
+ Assertions.assertEquals(3000, oConfig.getHeartBeatRequestTimeout());
+ Assertions.assertFalse(oConfig.isPreferIpAddress());
+ Assertions.assertTrue(oConfig.isWatch());
+ Assertions.assertEquals(ServiceRegistryConfig.NO_TENANT, oConfig.getTenantName());
+ Assertions.assertNull(oConfig.getSecretKey());
List<IpPort> ipPorts = oConfig.getIpPort();
- Assert.assertEquals("127.0.0.1:80", ipPorts.get(0).toString());
- Assert.assertEquals("127.0.0.1:443", ipPorts.get(1).toString());
- Assert.assertFalse(oConfig.isProxyEnable());
- Assert.assertEquals("127.0.0.1", oConfig.getProxyHost());
- Assert.assertEquals(8080, oConfig.getProxyPort());
- Assert.assertNull(oConfig.getProxyUsername());
- Assert.assertNull(oConfig.getProxyPasswd());
- Assert.assertEquals(60, oConfig.getIdleWatchConnectionTimeout());
+ Assertions.assertEquals("127.0.0.1:80", ipPorts.get(0).toString());
+ Assertions.assertEquals("127.0.0.1:443", ipPorts.get(1).toString());
+ Assertions.assertFalse(oConfig.isProxyEnable());
+ Assertions.assertEquals("127.0.0.1", oConfig.getProxyHost());
+ Assertions.assertEquals(8080, oConfig.getProxyPort());
+ Assertions.assertNull(oConfig.getProxyUsername());
+ Assertions.assertNull(oConfig.getProxyPasswd());
+ Assertions.assertEquals(60, oConfig.getIdleWatchConnectionTimeout());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleFixed.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleFixed.java
index d38cfde..bc0ad5a 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleFixed.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleFixed.java
@@ -24,9 +24,9 @@
import org.apache.servicecomb.registry.consumer.MicroserviceVersionRule;
import org.apache.servicecomb.serviceregistry.MockMicroserviceVersions;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceVersionRuleFixed {
MockMicroserviceVersions mockMicroserviceVersions;
@@ -48,19 +48,19 @@
@Test
public void getVersionRule() {
- Assert.assertEquals("2.0.0.0", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals("2.0.0.0", microserviceVersionRule.getVersionRule().getVersionRule());
}
@Test
public void update_empty() {
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
public void update_v1() {
mockMicroserviceVersions.update_v1();
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleLatest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleLatest.java
index 0c12d08..5d04b5c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleLatest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleLatest.java
@@ -25,9 +25,9 @@
import org.apache.servicecomb.serviceregistry.MockMicroserviceVersions;
import org.apache.servicecomb.registry.definition.DefinitionConst;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceVersionRuleLatest {
MockMicroserviceVersions mockMicroserviceVersions;
@@ -49,12 +49,12 @@
@Test
public void getVersionRule() {
- Assert.assertEquals(DefinitionConst.VERSION_RULE_LATEST, microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals(DefinitionConst.VERSION_RULE_LATEST, microserviceVersionRule.getVersionRule().getVersionRule());
}
@Test
public void update_empty() {
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleRange.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleRange.java
index 2be059f..8982530 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleRange.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleRange.java
@@ -21,9 +21,9 @@
import org.apache.servicecomb.registry.consumer.MicroserviceVersionRule;
import org.apache.servicecomb.serviceregistry.MockMicroserviceVersions;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceVersionRuleRange {
MockMicroserviceVersions mockMicroserviceVersions;
@@ -39,19 +39,19 @@
@Test
public void getVersionRule() {
- Assert.assertEquals("2.0.0.0-4.0.0.0", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals("2.0.0.0-4.0.0.0", microserviceVersionRule.getVersionRule().getVersionRule());
}
@Test
public void update_empty() {
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
public void update_v1() {
mockMicroserviceVersions.update_v1();
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleStartFrom.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleStartFrom.java
index 365b81b..c3440c9 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleStartFrom.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestMicroserviceVersionRuleStartFrom.java
@@ -21,9 +21,9 @@
import org.apache.servicecomb.registry.consumer.MicroserviceVersionRule;
import org.apache.servicecomb.serviceregistry.MockMicroserviceVersions;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceVersionRuleStartFrom {
MockMicroserviceVersions mockMicroserviceVersions;
@@ -39,19 +39,19 @@
@Test
public void getVersionRule() {
- Assert.assertEquals("2.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
+ Assertions.assertEquals("2.0.0.0+", microserviceVersionRule.getVersionRule().getVersionRule());
}
@Test
public void update_empty() {
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
public void update_v1() {
mockMicroserviceVersions.update_v1();
- Assert.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
+ Assertions.assertNull(microserviceVersionRule.getLatestMicroserviceVersion());
}
@Test
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestSimpleMicroserviceInstancePing.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestSimpleMicroserviceInstancePing.java
index e0dc83f..086c658 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestSimpleMicroserviceInstancePing.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/consumer/TestSimpleMicroserviceInstancePing.java
@@ -24,25 +24,25 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.registry.consumer.SimpleMicroserviceInstancePing;
-import org.junit.Assert;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class TestSimpleMicroserviceInstancePing {
@Test
public void testPing() throws IOException {
SimpleMicroserviceInstancePing ping = new SimpleMicroserviceInstancePing();
- Assert.assertEquals(ping.getOrder(), 100);
+ Assertions.assertEquals(ping.getOrder(), 100);
MicroserviceInstance instance = new MicroserviceInstance();
List<String> endpoints = new ArrayList<>();
ServerSocket ss = new ServerSocket(35677);
endpoints.add("http://localhost:35677");
instance.setEndpoints(endpoints);
- Assert.assertTrue(ping.ping(instance));
+ Assertions.assertTrue(ping.ping(instance));
MicroserviceInstance instance2 = new MicroserviceInstance();
- Assert.assertFalse(ping.ping(instance2));
+ Assertions.assertFalse(ping.ping(instance2));
ss.close();
- Assert.assertFalse(ping.ping(instance));
+ Assertions.assertFalse(ping.ping(instance));
}
@Test
@@ -54,9 +54,9 @@
endpoints.add("http://localhost:35676");
endpoints.add("http://localhost:35677");
instance.setEndpoints(endpoints);
- Assert.assertTrue(ping.ping(instance));
+ Assertions.assertTrue(ping.ping(instance));
ss.close();
- Assert.assertFalse(ping.ping(instance));
+ Assertions.assertFalse(ping.ping(instance));
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java
index 8f39c1f..3fcf15a 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckTask.java
@@ -25,7 +25,6 @@
import org.apache.servicecomb.foundation.common.Holder;
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;
@@ -36,6 +35,7 @@
import mockit.Deencapsulation;
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class TestInstanceCacheCheckTask {
@@ -86,7 +86,7 @@
ArchaiusUtils.setProperty(InstanceCacheCheckTask.MANUAL, UUID.randomUUID().toString());
latch.await();
- Assert.assertEquals("{\"status\":null,\"producers\":[],\"timestamp\":0}", Json.encode(result));
+ Assertions.assertEquals("{\"status\":null,\"producers\":[],\"timestamp\":0}", Json.encode(result));
}
@Test
@@ -104,8 +104,8 @@
task.init();
latch.await();
- Assert.assertNotNull(Deencapsulation.getField(task, "scheduledFuture"));
- Assert.assertEquals("{\"status\":null,\"producers\":[],\"timestamp\":0}", Json.encode(result));
+ Assertions.assertNotNull(Deencapsulation.getField(task, "scheduledFuture"));
+ Assertions.assertEquals("{\"status\":null,\"producers\":[],\"timestamp\":0}", Json.encode(result));
}
@Test
@@ -123,8 +123,8 @@
Deencapsulation.setField(task, "scheduledFuture", scheduledFuture);
task.init();
- Assert.assertNull(Deencapsulation.getField(task, "scheduledFuture"));
- Assert.assertTrue(cancelResult.value);
+ Assertions.assertNull(Deencapsulation.getField(task, "scheduledFuture"));
+ Assertions.assertTrue(cancelResult.value);
}
@Test
@@ -132,7 +132,7 @@
ArchaiusUtils.setProperty(InstanceCacheCheckTask.AUTO_INTERVAL, 0);
task.init();
- Assert.assertNull(Deencapsulation.getField(task, "scheduledFuture"));
+ Assertions.assertNull(Deencapsulation.getField(task, "scheduledFuture"));
}
@Test
@@ -140,6 +140,6 @@
ArchaiusUtils.setProperty(InstanceCacheCheckTask.AUTO_INTERVAL, -1);
task.init();
- Assert.assertNull(Deencapsulation.getField(task, "scheduledFuture"));
+ Assertions.assertNull(Deencapsulation.getField(task, "scheduledFuture"));
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerMock.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerMock.java
index 89e9ff8..9de7f5e 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerMock.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerMock.java
@@ -34,9 +34,9 @@
import org.apache.servicecomb.serviceregistry.diagnosis.Status;
import org.apache.servicecomb.serviceregistry.registry.LocalServiceRegistryFactory;
import org.junit.After;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -127,10 +127,10 @@
expectedSummary.getProducers().add(instanceCacheResult);
expectedSummary.setStatus(Status.UNKNOWN);
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
} catch (Exception e) {
LOGGER.error("", e);
- Assert.fail();
+ Assertions.fail();
}
}
@@ -164,10 +164,10 @@
expectedSummary.getProducers().add(instanceCacheResult);
expectedSummary.setStatus(Status.UNKNOWN);
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
} catch (Exception e) {
LOGGER.error("", e);
- Assert.fail();
+ Assertions.fail();
}
}
@@ -201,7 +201,7 @@
expectedSummary.getProducers().add(instanceCacheResult);
expectedSummary.setStatus(Status.UNKNOWN);
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
}
@Test
@@ -238,7 +238,7 @@
expectedSummary.getProducers().add(instanceCacheResult);
expectedSummary.setStatus(Status.ABNORMAL);
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
- Assert.assertNull(microserviceVersions.getRevision());
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertNull(microserviceVersions.getRevision());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java
index 4a3b995..ee8f02c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/diagnosis/instance/TestInstanceCacheCheckerWithoutMock.java
@@ -33,6 +33,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -75,7 +76,7 @@
public void check_appManager_empty() {
InstanceCacheSummary instanceCacheSummary = checker.check();
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
}
@Test
@@ -84,10 +85,10 @@
appId = "notExist";
DiscoveryManager.INSTANCE.getAppManager().getOrCreateMicroserviceVersions(appId, microserviceName);
InstanceCacheSummary instanceCacheSummary = checker.check();
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
} catch (Exception e) {
LOGGER.error("", e);
- Assert.fail();
+ Assertions.fail();
}
}
@@ -101,13 +102,13 @@
MicroserviceVersionRule microserviceVersionRule = DiscoveryManager.INSTANCE.getAppManager()
.getOrCreateMicroserviceVersionRule(appId, microserviceName, DefinitionConst.VERSION_RULE_ALL);
- Assert.assertEquals(microserviceName, microserviceVersionRule.getLatestMicroserviceVersion().getMicroserviceName());
+ Assertions.assertEquals(microserviceName, microserviceVersionRule.getLatestMicroserviceVersion().getMicroserviceName());
InstanceCacheSummary instanceCacheSummary = checker.check();
expectedSummary.setStatus(Status.NORMAL);
- Assert.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
+ Assertions.assertEquals(Json.encode(expectedSummary), Json.encode(instanceCacheSummary));
}
private interface ThirdPartyServiceForUT {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java
index 3233519..8a28f42 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/refresh/AddressManagerTest.java
@@ -17,7 +17,6 @@
package org.apache.servicecomb.serviceregistry.refresh;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -26,12 +25,12 @@
import org.apache.servicecomb.foundation.common.event.EventManager;
import org.apache.servicecomb.foundation.common.net.IpPort;
import org.apache.servicecomb.http.client.event.RefreshEndpointEvent;
-import org.junit.Assert;
-import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Assertions;
import com.google.common.eventbus.EventBus;
import mockit.Deencapsulation;
+import org.junit.jupiter.api.Test;
class AddressManagerTest {
@@ -48,18 +47,18 @@
addressManager1 = new AddressManager(addresses, new EventBus());
addressManager2 = new AddressManager(addresses, new EventBus());
- Assert.assertNotNull(addressManager1);
- Assert.assertNotNull(addressManager2);
+ Assertions.assertNotNull(addressManager1);
+ Assertions.assertNotNull(addressManager2);
List<String> addresses = Deencapsulation.getField(addressManager1, "addresses");
- Assert.assertEquals(1, addresses.size());
- Assert.assertEquals("127.0.0.1:30103", addresses.get(0));
- Assert.assertEquals("127.0.0.1:30103", addressManager1.address());
+ Assertions.assertEquals(1, addresses.size());
+ Assertions.assertEquals("127.0.0.1:30103", addresses.get(0));
+ Assertions.assertEquals("127.0.0.1:30103", addressManager1.address());
ipPort = addressManager2.getAvailableIpPort();
- Assert.assertEquals("127.0.0.1:30103", ipPort.toString());
- Assert.assertEquals("127.0.0.1", ipPort.getHostOrIp());
- Assert.assertEquals(30103, ipPort.getPort());
+ Assertions.assertEquals("127.0.0.1:30103", ipPort.toString());
+ Assertions.assertEquals("127.0.0.1", ipPort.getHostOrIp());
+ Assertions.assertEquals(30103, ipPort.getPort());
}
@Test
@@ -76,10 +75,10 @@
addressManager1.refreshEndpoint(event, "SERVICECENTER");
List<String> availableZone = Deencapsulation.getField(addressManager1, "availableZone");
- Assert.assertEquals("127.0.0.3:30100", availableZone.get(0));
+ Assertions.assertEquals("127.0.0.3:30100", availableZone.get(0));
List<String> availableRegion = Deencapsulation.getField(addressManager1, "availableRegion");
- Assert.assertEquals("127.0.0.4:30100", availableRegion.get(0));
+ Assertions.assertEquals("127.0.0.4:30100", availableRegion.get(0));
}
@Test
@@ -94,10 +93,10 @@
addressManager1.refreshEndpoint(event, "SERVICECENTER");
List<String> availableZone = Deencapsulation.getField(addressManager1, "availableZone");
- Assert.assertEquals("[2008::7:957f:b2d6:1af4:a1f8]:30100", availableZone.get(0));
+ Assertions.assertEquals("[2008::7:957f:b2d6:1af4:a1f8]:30100", availableZone.get(0));
IpPort ipPort = addressManager1.getAvailableIpPort();
- Assert.assertEquals("[2008::7:957f:b2d6:1af4:a1f8]", ipPort.getHostOrIp());
- Assert.assertEquals(30100, ipPort.getPort());
+ Assertions.assertEquals("[2008::7:957f:b2d6:1af4:a1f8]", ipPort.getHostOrIp());
+ Assertions.assertEquals(30100, ipPort.getPort());
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java
index 7f756e1..65440d0 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestLocalServiceRegistry.java
@@ -36,6 +36,7 @@
import com.netflix.config.DynamicPropertyFactory;
import mockit.Deencapsulation;
+import org.junit.jupiter.api.Assertions;
public class TestLocalServiceRegistry {
private static final AbstractConfiguration inMemoryConfig = new ConcurrentMapConfiguration();
@@ -69,12 +70,12 @@
serviceRegistry.init();
RegistryUtils.init();
- Assert.assertNull(serviceRegistry.getMicroserviceInstance().getInstanceId());
+ Assertions.assertNull(serviceRegistry.getMicroserviceInstance().getInstanceId());
serviceRegistry.run();
- Assert.assertNotNull(serviceRegistry.getMicroserviceInstance().getInstanceId());
+ Assertions.assertNotNull(serviceRegistry.getMicroserviceInstance().getInstanceId());
serviceRegistry.destroy();
- Assert.assertTrue(serviceRegistry.getServiceRegistryClient()
+ Assertions.assertTrue(serviceRegistry.getServiceRegistryClient()
.getMicroserviceInstance("", serviceRegistry.getMicroservice().getServiceId())
.isEmpty());
}
@@ -93,23 +94,23 @@
serviceRegistry.getServiceRegistryClient().updateInstanceProperties(microservice.getServiceId(),
"notExist",
properties);
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid argument. microserviceId=" + microservice.getServiceId()
+ Assertions.assertEquals("Invalid argument. microserviceId=" + microservice.getServiceId()
+ ", microserviceInstanceId=notExist.",
e.getMessage());
}
serviceRegistry.updateMicroserviceProperties(properties);
- Assert.assertEquals(properties, microservice.getProperties());
+ Assertions.assertEquals(properties, microservice.getProperties());
serviceRegistry.updateInstanceProperties(properties);
- Assert.assertEquals(properties, microservice.getInstance().getProperties());
+ Assertions.assertEquals(properties, microservice.getInstance().getProperties());
properties.put("k1", "v1");
serviceRegistry.updateMicroserviceProperties(properties);
- Assert.assertEquals(properties, microservice.getProperties());
+ Assertions.assertEquals(properties, microservice.getProperties());
serviceRegistry.updateInstanceProperties(properties);
- Assert.assertEquals(properties, microservice.getInstance().getProperties());
+ Assertions.assertEquals(properties, microservice.getInstance().getProperties());
}
@Test
@@ -122,21 +123,20 @@
try {
serviceRegistry.getServiceRegistryClient().isSchemaExist("notExist", "s1");
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid serviceId, serviceId=notExist", e.getMessage());
+ Assertions.assertEquals("Invalid serviceId, serviceId=notExist", e.getMessage());
}
try {
serviceRegistry.getServiceRegistryClient().getSchema("notExist", "s1");
- Assert.fail("must throw exception");
+ Assertions.fail("must throw exception");
} catch (IllegalArgumentException e) {
- Assert.assertEquals("Invalid serviceId, serviceId=notExist", e.getMessage());
+ Assertions.assertEquals("Invalid serviceId, serviceId=notExist", e.getMessage());
}
- Assert.assertEquals(true,
- serviceRegistry.getServiceRegistryClient().isSchemaExist(microservice.getServiceId(), "s1"));
+ Assertions.assertTrue(serviceRegistry.getServiceRegistryClient().isSchemaExist(microservice.getServiceId(), "s1"));
String content = serviceRegistry.getServiceRegistryClient().getSchema(microservice.getServiceId(), "s1");
- Assert.assertEquals("s1-content", content);
+ Assertions.assertEquals("s1-content", content);
}
@Test
@@ -152,6 +152,6 @@
String serviceId = serviceRegistry.getServiceRegistryClient().registerMicroservice(microservice);
Microservice remoteMicroservice = serviceRegistry.getRemoteMicroservice(serviceId);
- Assert.assertEquals(serviceId, remoteMicroservice.getServiceId());
+ Assertions.assertEquals(serviceId, remoteMicroservice.getServiceId());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestRemoteServiceRegistry.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestRemoteServiceRegistry.java
index 47ae26a..ac68a14 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestRemoteServiceRegistry.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestRemoteServiceRegistry.java
@@ -29,7 +29,6 @@
import org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
-import org.junit.Assert;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
@@ -38,6 +37,7 @@
import mockit.Injectable;
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class TestRemoteServiceRegistry {
class TestingRemoteServiceRegistry extends RemoteServiceRegistry {
@@ -86,13 +86,13 @@
// should not block
latch.await();
- Assert.assertTrue(2 <= remote.getTaskPool().getTaskCount()); // includes complete tasks
+ Assertions.assertTrue(2 <= remote.getTaskPool().getTaskCount()); // includes complete tasks
bus.post(new ShutdownEvent());
remote.getTaskPool().schedule(() -> {
}, 0, TimeUnit.SECONDS);
- Assert.assertTrue(remote.getTaskPool().isShutdown());
+ Assertions.assertTrue(remote.getTaskPool().isShutdown());
RegistryUtils.setServiceRegistry(oldRegistry);
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestServiceRegistryFactory.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestServiceRegistryFactory.java
index 5511613..2521d63 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestServiceRegistryFactory.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/TestServiceRegistryFactory.java
@@ -18,16 +18,14 @@
package org.apache.servicecomb.serviceregistry.registry;
import org.apache.commons.configuration.Configuration;
-import org.apache.servicecomb.config.BootStrapProperties;
import org.apache.servicecomb.config.ConfigUtil;
import org.apache.servicecomb.serviceregistry.ServiceRegistry;
import org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.client.http.ServiceRegistryClientImpl;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
-import org.junit.Assert;
import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.jupiter.api.Assertions;
import com.google.common.eventbus.EventBus;
@@ -47,17 +45,17 @@
ServiceRegistryFactory.create(eventBus, serviceRegistryConfig, configuration);
serviceRegistry.init();
ServiceRegistryClient client = serviceRegistry.getServiceRegistryClient();
- Assert.assertTrue(client instanceof ServiceRegistryClientImpl);
+ Assertions.assertTrue(client instanceof ServiceRegistryClientImpl);
serviceRegistry = ServiceRegistryFactory.create(eventBus,
serviceRegistryConfig, configuration);
- Assert.assertTrue(serviceRegistry instanceof RemoteServiceRegistry);
+ Assertions.assertTrue(serviceRegistry instanceof RemoteServiceRegistry);
serviceRegistry = LocalServiceRegistryFactory.createLocal(eventBus, serviceRegistryConfig, configuration);
serviceRegistry.init();
client = serviceRegistry.getServiceRegistryClient();
- Assert.assertTrue(client instanceof LocalServiceRegistryClientImpl);
- Assert.assertTrue(LocalServiceRegistryFactory.createLocal(eventBus,
+ Assertions.assertTrue(client instanceof LocalServiceRegistryClientImpl);
+ Assertions.assertTrue(LocalServiceRegistryFactory.createLocal(eventBus,
serviceRegistryConfig, configuration) instanceof LocalServiceRegistry);
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateMicroserviceCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateMicroserviceCacheTest.java
index 16dcdcc..e85c0ca 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateMicroserviceCacheTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateMicroserviceCacheTest.java
@@ -28,8 +28,8 @@
import org.apache.servicecomb.registry.api.registry.MicroserviceInstance;
import org.apache.servicecomb.serviceregistry.registry.EmptyMockServiceRegistry;
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache.MicroserviceCacheStatus;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class AggregateMicroserviceCacheTest {
@@ -70,41 +70,41 @@
// Test initialization
// key
- Assert.assertSame(microserviceCacheKey, compositeMicroserviceCache.getKey());
+ Assertions.assertSame(microserviceCacheKey, compositeMicroserviceCache.getKey());
// status
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, compositeMicroserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, compositeMicroserviceCache.getStatus());
// revision
- Assert.assertEquals("1", compositeMicroserviceCache.getRevisionId());
- Assert.assertEquals(1L, compositeMicroserviceCache.revisionCounter.get());
+ Assertions.assertEquals("1", compositeMicroserviceCache.getRevisionId());
+ Assertions.assertEquals(1L, compositeMicroserviceCache.revisionCounter.get());
// MicroserviceCache map
- Assert.assertEquals(2, compositeMicroserviceCache.caches.size());
- Assert.assertSame(mockMicroserviceCache0, compositeMicroserviceCache.caches.get("s0"));
- Assert.assertSame(mockMicroserviceCache2, compositeMicroserviceCache.caches.get("s2"));
+ Assertions.assertEquals(2, compositeMicroserviceCache.caches.size());
+ Assertions.assertSame(mockMicroserviceCache0, compositeMicroserviceCache.caches.get("s0"));
+ Assertions.assertSame(mockMicroserviceCache2, compositeMicroserviceCache.caches.get("s2"));
// ServiceRegistry collection
- Assert.assertEquals(serviceRegistries.size(), compositeMicroserviceCache.serviceRegistries.size());
+ Assertions.assertEquals(serviceRegistries.size(), compositeMicroserviceCache.serviceRegistries.size());
Iterator<ServiceRegistry> serviceRegistryIterator = compositeMicroserviceCache.serviceRegistries.iterator();
- Assert.assertSame(serviceRegistries.get(0), serviceRegistryIterator.next());
- Assert.assertSame(serviceRegistries.get(1), serviceRegistryIterator.next());
- Assert.assertSame(serviceRegistries.get(2), serviceRegistryIterator.next());
- Assert.assertSame(serviceRegistries.get(3), serviceRegistryIterator.next());
+ Assertions.assertSame(serviceRegistries.get(0), serviceRegistryIterator.next());
+ Assertions.assertSame(serviceRegistries.get(1), serviceRegistryIterator.next());
+ Assertions.assertSame(serviceRegistries.get(2), serviceRegistryIterator.next());
+ Assertions.assertSame(serviceRegistries.get(3), serviceRegistryIterator.next());
// cached instances
- Assert.assertEquals(2, compositeMicroserviceCache.getInstances().size());
- Assert.assertSame(mockMicroserviceCache2.instances.get(0), compositeMicroserviceCache.getInstances().get(0));
- Assert.assertSame(mockMicroserviceCache2.instances.get(1), compositeMicroserviceCache.getInstances().get(1));
+ Assertions.assertEquals(2, compositeMicroserviceCache.getInstances().size());
+ Assertions.assertSame(mockMicroserviceCache2.instances.get(0), compositeMicroserviceCache.getInstances().get(0));
+ Assertions.assertSame(mockMicroserviceCache2.instances.get(1), compositeMicroserviceCache.getInstances().get(1));
// Test refresh()
mockMicroserviceCache0.instances = Collections.singletonList(new MicroserviceInstance());
mockMicroserviceCache2.instances = Collections.singletonList(new MicroserviceInstance());
compositeMicroserviceCache.refresh();
// status
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, compositeMicroserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, compositeMicroserviceCache.getStatus());
// revision
- Assert.assertEquals("2", compositeMicroserviceCache.getRevisionId());
- Assert.assertEquals(2L, compositeMicroserviceCache.revisionCounter.get());
+ Assertions.assertEquals("2", compositeMicroserviceCache.getRevisionId());
+ Assertions.assertEquals(2L, compositeMicroserviceCache.revisionCounter.get());
// cached instances
- Assert.assertEquals(2, compositeMicroserviceCache.getInstances().size());
- Assert.assertSame(mockMicroserviceCache0.instances.get(0), compositeMicroserviceCache.getInstances().get(0));
- Assert.assertSame(mockMicroserviceCache2.instances.get(0), compositeMicroserviceCache.getInstances().get(1));
+ Assertions.assertEquals(2, compositeMicroserviceCache.getInstances().size());
+ Assertions.assertSame(mockMicroserviceCache0.instances.get(0), compositeMicroserviceCache.getInstances().get(0));
+ Assertions.assertSame(mockMicroserviceCache2.instances.get(0), compositeMicroserviceCache.getInstances().get(1));
// Test refresh()
// microservice deleted and registered
@@ -112,16 +112,16 @@
mockMicroserviceCache3.status = MicroserviceCacheStatus.REFRESHED;
compositeMicroserviceCache.refresh();
// status
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, compositeMicroserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, compositeMicroserviceCache.getStatus());
// revision
- Assert.assertEquals("3", compositeMicroserviceCache.getRevisionId());
- Assert.assertEquals(3L, compositeMicroserviceCache.revisionCounter.get());
+ Assertions.assertEquals("3", compositeMicroserviceCache.getRevisionId());
+ Assertions.assertEquals(3L, compositeMicroserviceCache.revisionCounter.get());
// ServiceRegistries
- Assert.assertNotNull(compositeMicroserviceCache.caches.get("s2"));
- Assert.assertNotNull(compositeMicroserviceCache.caches.get("s3"));
+ Assertions.assertNotNull(compositeMicroserviceCache.caches.get("s2"));
+ Assertions.assertNotNull(compositeMicroserviceCache.caches.get("s3"));
// cached instances
- Assert.assertEquals(1, compositeMicroserviceCache.getInstances().size());
- Assert.assertSame(mockMicroserviceCache2.instances.get(0), compositeMicroserviceCache.getInstances().get(0));
+ Assertions.assertEquals(1, compositeMicroserviceCache.getInstances().size());
+ Assertions.assertSame(mockMicroserviceCache2.instances.get(0), compositeMicroserviceCache.getInstances().get(0));
}
public static class MockServiceRegistry extends EmptyMockServiceRegistry {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java
index 3ce08f5..9cc7668 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/AggregateServiceRegistryCacheTest.java
@@ -17,11 +17,6 @@
package org.apache.servicecomb.serviceregistry.registry.cache;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -31,6 +26,7 @@
import org.apache.servicecomb.serviceregistry.registry.cache.MicroserviceCache.MicroserviceCacheStatus;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class AggregateServiceRegistryCacheTest {
@@ -78,30 +74,30 @@
MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build()
);
- assertTrue(serviceCache instanceof AggregateMicroserviceCache);
+ Assertions.assertTrue(serviceCache instanceof AggregateMicroserviceCache);
AggregateMicroserviceCache aggregateMicroserviceCache = (AggregateMicroserviceCache) serviceCache;
- assertEquals(2, aggregateMicroserviceCache.caches.size());
- assertSame(mockServiceRegistry0.findMicroserviceCache(microserviceCacheKey),
+ Assertions.assertEquals(2, aggregateMicroserviceCache.caches.size());
+ Assertions.assertSame(mockServiceRegistry0.findMicroserviceCache(microserviceCacheKey),
aggregateMicroserviceCache.caches.get(mockServiceRegistry0.getName()));
- assertSame(mockServiceRegistry1.findMicroserviceCache(microserviceCacheKey),
+ Assertions.assertSame(mockServiceRegistry1.findMicroserviceCache(microserviceCacheKey),
aggregateMicroserviceCache.caches.get(mockServiceRegistry1.getName()));
// aggregateMicroserviceCache holds the cache of svc
- assertEquals(1, aggregateServiceRegistryCache.microserviceCache.size());
- assertNotNull(aggregateServiceRegistryCache.microserviceCache.get(microserviceCacheKey));
+ Assertions.assertEquals(1, aggregateServiceRegistryCache.microserviceCache.size());
+ Assertions.assertNotNull(aggregateServiceRegistryCache.microserviceCache.get(microserviceCacheKey));
MicroserviceCache serviceCache2 = aggregateServiceRegistryCache.findServiceCache(
MicroserviceCacheKey.builder().serviceName("svc2").appId("app").env("env").build()
);
- assertTrue(serviceCache2 instanceof AggregateMicroserviceCache);
+ Assertions.assertTrue(serviceCache2 instanceof AggregateMicroserviceCache);
AggregateMicroserviceCache aggregateMicroserviceCache2 = (AggregateMicroserviceCache) serviceCache2;
- assertEquals(1, aggregateMicroserviceCache2.caches.size());
- assertSame(
+ Assertions.assertEquals(1, aggregateMicroserviceCache2.caches.size());
+ Assertions.assertSame(
mockServiceRegistry1.findMicroserviceCache(
MicroserviceCacheKey.builder().serviceName("svc2").appId("app").env("env").build()),
aggregateMicroserviceCache2.caches.get(mockServiceRegistry1.getName()));
- assertEquals(2, aggregateServiceRegistryCache.microserviceCache.size());
- assertNotNull(aggregateServiceRegistryCache.microserviceCache.get(
+ Assertions.assertEquals(2, aggregateServiceRegistryCache.microserviceCache.size());
+ Assertions.assertNotNull(aggregateServiceRegistryCache.microserviceCache.get(
MicroserviceCacheKey.builder().serviceName("svc2").appId("app").env("env").build()
));
}
@@ -112,13 +108,13 @@
MicroserviceCacheKey.builder().serviceName("svc-not-exist").appId("app").env("env").build()
);
- assertTrue(serviceCache instanceof AggregateMicroserviceCache);
- assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, serviceCache.getStatus());
+ Assertions.assertTrue(serviceCache instanceof AggregateMicroserviceCache);
+ Assertions.assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, serviceCache.getStatus());
AggregateMicroserviceCache aggregateMicroserviceCache = (AggregateMicroserviceCache) serviceCache;
- assertEquals(0, aggregateMicroserviceCache.caches.size());
- assertEquals(3, aggregateMicroserviceCache.serviceRegistries.size());
+ Assertions.assertEquals(0, aggregateMicroserviceCache.caches.size());
+ Assertions.assertEquals(3, aggregateMicroserviceCache.serviceRegistries.size());
// should remove the cache of not existing microservice
- assertEquals(0, aggregateServiceRegistryCache.microserviceCache.size());
+ Assertions.assertEquals(0, aggregateServiceRegistryCache.microserviceCache.size());
}
@Test
@@ -136,13 +132,13 @@
)
));
- assertTrue(aggregateServiceRegistryCache.microserviceCache.isEmpty());
+ Assertions.assertTrue(aggregateServiceRegistryCache.microserviceCache.isEmpty());
MicroserviceCache serviceCache = aggregateServiceRegistryCache.findServiceCache(microserviceCacheKey);
MicroserviceCache serviceCache2 = aggregateServiceRegistryCache.findServiceCache(microserviceCacheKey2);
- assertEquals("1", serviceCache.getRevisionId());
- assertEquals("1", serviceCache2.getRevisionId());
+ Assertions.assertEquals("1", serviceCache.getRevisionId());
+ Assertions.assertEquals("1", serviceCache2.getRevisionId());
aggregateServiceRegistryCache.onMicroserviceCacheRefreshed(new MicroserviceCacheRefreshedEvent(
Collections.singletonList(
@@ -153,8 +149,8 @@
)
));
- assertEquals("2", serviceCache.getRevisionId());
- assertEquals("1", serviceCache2.getRevisionId());
+ Assertions.assertEquals("2", serviceCache.getRevisionId());
+ Assertions.assertEquals("1", serviceCache2.getRevisionId());
// test watcher
ArrayList<Object> refreshedCaches = new ArrayList<>();
@@ -173,11 +169,11 @@
)
));
- assertEquals("3", serviceCache.getRevisionId());
- assertEquals("2", serviceCache2.getRevisionId());
- assertEquals(2, refreshedCaches.size());
- assertSame(serviceCache, refreshedCaches.get(0));
- assertSame(serviceCache2, refreshedCaches.get(1));
+ Assertions.assertEquals("3", serviceCache.getRevisionId());
+ Assertions.assertEquals("2", serviceCache2.getRevisionId());
+ Assertions.assertEquals(2, refreshedCaches.size());
+ Assertions.assertSame(serviceCache, refreshedCaches.get(0));
+ Assertions.assertSame(serviceCache2, refreshedCaches.get(1));
refreshedCaches.clear();
@@ -199,14 +195,14 @@
)
));
- assertEquals("4", serviceCache.getRevisionId());
- assertEquals("3", serviceCache2.getRevisionId());
- assertEquals(2, refreshedCaches.size());
- assertSame(serviceCache, refreshedCaches.get(0));
- assertSame(serviceCache2, refreshedCaches.get(1));
- assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, serviceCache.getStatus());
+ Assertions.assertEquals("4", serviceCache.getRevisionId());
+ Assertions.assertEquals("3", serviceCache2.getRevisionId());
+ Assertions.assertEquals(2, refreshedCaches.size());
+ Assertions.assertSame(serviceCache, refreshedCaches.get(0));
+ Assertions.assertSame(serviceCache2, refreshedCaches.get(1));
+ Assertions.assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, serviceCache.getStatus());
// not existing service cache removed, only serviceCache2 is left
- assertEquals(1, aggregateServiceRegistryCache.microserviceCache.size());
- assertSame(serviceCache2, aggregateServiceRegistryCache.microserviceCache.get(microserviceCacheKey2));
+ Assertions.assertEquals(1, aggregateServiceRegistryCache.microserviceCache.size());
+ Assertions.assertSame(serviceCache2, aggregateServiceRegistryCache.microserviceCache.get(microserviceCacheKey2));
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java
index 53f82e8..1666bbb 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/MicroserviceCacheKeyTest.java
@@ -17,10 +17,8 @@
package org.apache.servicecomb.serviceregistry.registry.cache;
-import static org.junit.Assert.fail;
-
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class MicroserviceCacheKeyTest {
@@ -32,30 +30,30 @@
MicroserviceCacheKey microserviceCacheKey =
MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build();
- Assert.assertEquals("svc", microserviceCacheKey.getServiceName());
- Assert.assertEquals("app", microserviceCacheKey.getAppId());
- Assert.assertEquals("env", microserviceCacheKey.getEnv());
- Assert.assertEquals("svc@app@env@0.0.0.0+", microserviceCacheKey.toString());
+ Assertions.assertEquals("svc", microserviceCacheKey.getServiceName());
+ Assertions.assertEquals("app", microserviceCacheKey.getAppId());
+ Assertions.assertEquals("env", microserviceCacheKey.getEnv());
+ Assertions.assertEquals("svc@app@env@0.0.0.0+", microserviceCacheKey.toString());
microserviceCacheKey =
MicroserviceCacheKey.builder().serviceName("app:svc").appId("app").env("env").build();
- Assert.assertEquals("svc", microserviceCacheKey.getServiceName());
- Assert.assertEquals("app", microserviceCacheKey.getAppId());
- Assert.assertEquals("env", microserviceCacheKey.getEnv());
+ Assertions.assertEquals("svc", microserviceCacheKey.getServiceName());
+ Assertions.assertEquals("app", microserviceCacheKey.getAppId());
+ Assertions.assertEquals("env", microserviceCacheKey.getEnv());
microserviceCacheKey =
MicroserviceCacheKey.builder().serviceName("app2:svc").appId("app").env("env").build();
- Assert.assertEquals("svc", microserviceCacheKey.getServiceName());
- Assert.assertEquals("app2", microserviceCacheKey.getAppId());
- Assert.assertEquals("env", microserviceCacheKey.getEnv());
+ Assertions.assertEquals("svc", microserviceCacheKey.getServiceName());
+ Assertions.assertEquals("app2", microserviceCacheKey.getAppId());
+ Assertions.assertEquals("env", microserviceCacheKey.getEnv());
}
private void checkConstructorException(String env, String appId, String svc, String expectedMessage) {
try {
MicroserviceCacheKey.builder().env(env).appId(appId).serviceName(svc).build();
- fail("an Exception is expected!");
+ Assertions.fail("an Exception is expected!");
} catch (Exception e) {
- Assert.assertEquals(expectedMessage, e.getMessage());
+ Assertions.assertEquals(expectedMessage, e.getMessage());
}
}
@@ -65,24 +63,24 @@
MicroserviceCacheKey.builder().env("env").appId("app").serviceName("svc").build();
MicroserviceCacheKey microserviceCacheKey2 =
MicroserviceCacheKey.builder().env("env").appId("app").serviceName("svc").build();
- Assert.assertEquals(microserviceCacheKey, microserviceCacheKey2);
- Assert.assertEquals(microserviceCacheKey.hashCode(), microserviceCacheKey2.hashCode());
+ Assertions.assertEquals(microserviceCacheKey, microserviceCacheKey2);
+ Assertions.assertEquals(microserviceCacheKey.hashCode(), microserviceCacheKey2.hashCode());
microserviceCacheKey2 =
MicroserviceCacheKey.builder().env("env1").appId("app").serviceName("svc").build();
- Assert.assertNotEquals(microserviceCacheKey, microserviceCacheKey2);
+ Assertions.assertNotEquals(microserviceCacheKey, microserviceCacheKey2);
microserviceCacheKey2 =
MicroserviceCacheKey.builder().env("env").appId("app1").serviceName("svc").build();
- Assert.assertNotEquals(microserviceCacheKey, microserviceCacheKey2);
+ Assertions.assertNotEquals(microserviceCacheKey, microserviceCacheKey2);
microserviceCacheKey2 =
MicroserviceCacheKey.builder().env("env").appId("app").serviceName("svc1").build();
- Assert.assertNotEquals(microserviceCacheKey, microserviceCacheKey2);
+ Assertions.assertNotEquals(microserviceCacheKey, microserviceCacheKey2);
}
@Test
public void plainKey() {
MicroserviceCacheKey microserviceCacheKey =
MicroserviceCacheKey.builder().env("env").appId("app").serviceName("svc").build();
- Assert.assertEquals("svc@app@env@0.0.0.0+", microserviceCacheKey.plainKey());
+ Assertions.assertEquals("svc@app@env@0.0.0.0+", microserviceCacheKey.plainKey());
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java
index 3c73e63..24d2ec9 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableMicroserviceCacheTest.java
@@ -36,6 +36,7 @@
import mockit.Mock;
import mockit.MockUp;
+import org.junit.jupiter.api.Assertions;
public class RefreshableMicroserviceCacheTest {
@@ -88,11 +89,11 @@
ArrayList<MicroserviceInstance> instances = new ArrayList<>();
instances.add(microserviceInstance);
findServiceInstancesOprHolder.value = params -> {
- Assert.assertEquals("consumerId", params[0]);
- Assert.assertEquals("app", params[1]);
- Assert.assertEquals("svc", params[2]);
- Assert.assertEquals("0.0.0.0+", params[3]);
- Assert.assertNull(params[4]);
+ Assertions.assertEquals("consumerId", params[0]);
+ Assertions.assertEquals("app", params[1]);
+ Assertions.assertEquals("svc", params[2]);
+ Assertions.assertEquals("0.0.0.0+", params[3]);
+ Assertions.assertNull(params[4]);
MicroserviceInstances microserviceInstances = new MicroserviceInstances();
microserviceInstances.setNeedRefresh(true);
microserviceInstances.setRevision("rev2");
@@ -108,23 +109,23 @@
microserviceCache.revisionId = "rev";
microserviceCache.forceRefresh();
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
List<MicroserviceInstance> cachedInstances = microserviceCache.getInstances();
- Assert.assertEquals(1, cachedInstances.size());
+ Assertions.assertEquals(1, cachedInstances.size());
MicroserviceInstance instance = cachedInstances.iterator().next();
- Assert.assertEquals("instanceId00", instance.getInstanceId());
- Assert.assertEquals("rev2", microserviceCache.getRevisionId());
+ Assertions.assertEquals("instanceId00", instance.getInstanceId());
+ Assertions.assertEquals("rev2", microserviceCache.getRevisionId());
}
@Test
public void refresh() {
ArrayList<MicroserviceInstance> instances = new ArrayList<>();
findServiceInstancesOprHolder.value = params -> {
- Assert.assertEquals("consumerId", params[0]);
- Assert.assertEquals("app", params[1]);
- Assert.assertEquals("svc", params[2]);
- Assert.assertEquals("0.0.0.0+", params[3]);
- Assert.assertNull(params[4]);
+ Assertions.assertEquals("consumerId", params[0]);
+ Assertions.assertEquals("app", params[1]);
+ Assertions.assertEquals("svc", params[2]);
+ Assertions.assertEquals("0.0.0.0+", params[3]);
+ Assertions.assertNull(params[4]);
MicroserviceInstances microserviceInstances = new MicroserviceInstances();
microserviceInstances.setNeedRefresh(true);
microserviceInstances.setRevision("rev0");
@@ -139,8 +140,8 @@
// at the beginning, no instances in cache
List<MicroserviceInstance> cachedInstances = microserviceCache.getInstances();
- Assert.assertEquals(0, cachedInstances.size());
- Assert.assertNull(microserviceCache.getRevisionId());
+ Assertions.assertEquals(0, cachedInstances.size());
+ Assertions.assertNull(microserviceCache.getRevisionId());
// find 1 instance from sc
MicroserviceInstance microserviceInstance = new MicroserviceInstance();
@@ -148,13 +149,13 @@
microserviceInstance.setInstanceId("instanceId00");
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
cachedInstances = microserviceCache.getInstances();
- Assert.assertEquals(1, cachedInstances.size());
+ Assertions.assertEquals(1, cachedInstances.size());
MicroserviceInstance instance = cachedInstances.iterator().next();
- Assert.assertEquals("instanceId00", instance.getInstanceId());
- Assert.assertEquals("rev0", microserviceCache.getRevisionId());
+ Assertions.assertEquals("instanceId00", instance.getInstanceId());
+ Assertions.assertEquals("rev0", microserviceCache.getRevisionId());
// 2nd time, find 2 instances, one of them is the old instance
MicroserviceInstance microserviceInstance1 = new MicroserviceInstance();
@@ -162,11 +163,11 @@
microserviceInstance1.setInstanceId("instanceId01");
findServiceInstancesOprHolder.value = params -> {
- Assert.assertEquals("consumerId", params[0]);
- Assert.assertEquals("app", params[1]);
- Assert.assertEquals("svc", params[2]);
- Assert.assertEquals("0.0.0.0+", params[3]);
- Assert.assertEquals("rev0", params[4]);
+ Assertions.assertEquals("consumerId", params[0]);
+ Assertions.assertEquals("app", params[1]);
+ Assertions.assertEquals("svc", params[2]);
+ Assertions.assertEquals("0.0.0.0+", params[3]);
+ Assertions.assertEquals("rev0", params[4]);
MicroserviceInstances microserviceInstances = new MicroserviceInstances();
microserviceInstances.setNeedRefresh(true);
microserviceInstances.setRevision("rev1");
@@ -180,11 +181,11 @@
};
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
cachedInstances = microserviceCache.getInstances();
- Assert.assertEquals(2, cachedInstances.size());
- Assert.assertEquals("instanceId00", cachedInstances.get(0).getInstanceId());
- Assert.assertEquals("instanceId01", cachedInstances.get(1).getInstanceId());
+ Assertions.assertEquals(2, cachedInstances.size());
+ Assertions.assertEquals("instanceId00", cachedInstances.get(0).getInstanceId());
+ Assertions.assertEquals("instanceId01", cachedInstances.get(1).getInstanceId());
}
@Test
@@ -194,8 +195,8 @@
List<MicroserviceInstance> oldInstanceList = microserviceCache.getInstances();
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.CLIENT_ERROR, microserviceCache.getStatus());
- Assert.assertSame(oldInstanceList, microserviceCache.getInstances());
+ Assertions.assertEquals(MicroserviceCacheStatus.CLIENT_ERROR, microserviceCache.getStatus());
+ Assertions.assertSame(oldInstanceList, microserviceCache.getInstances());
}
@Test
@@ -209,8 +210,8 @@
List<MicroserviceInstance> oldInstanceList = microserviceCache.getInstances();
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, microserviceCache.getStatus());
- Assert.assertSame(oldInstanceList, microserviceCache.getInstances());
+ Assertions.assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, microserviceCache.getStatus());
+ Assertions.assertSame(oldInstanceList, microserviceCache.getInstances());
}
@Test
@@ -225,8 +226,8 @@
List<MicroserviceInstance> oldInstanceList = microserviceCache.getInstances();
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.NO_CHANGE, microserviceCache.getStatus());
- Assert.assertSame(oldInstanceList, microserviceCache.getInstances());
+ Assertions.assertEquals(MicroserviceCacheStatus.NO_CHANGE, microserviceCache.getStatus());
+ Assertions.assertSame(oldInstanceList, microserviceCache.getInstances());
}
@Test
@@ -243,14 +244,14 @@
};
List<MicroserviceInstance> oldInstanceList = microserviceCache.getInstances();
- Assert.assertEquals(MicroserviceCacheStatus.INIT, microserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.INIT, microserviceCache.getStatus());
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.SETTING_CACHE_ERROR, microserviceCache.getStatus());
+ Assertions.assertEquals(MicroserviceCacheStatus.SETTING_CACHE_ERROR, microserviceCache.getStatus());
List<MicroserviceInstance> newInstanceList = microserviceCache.getInstances();
- Assert.assertEquals(0, newInstanceList.size());
- Assert.assertSame(oldInstanceList, newInstanceList);
+ Assertions.assertEquals(0, newInstanceList.size());
+ Assertions.assertSame(oldInstanceList, newInstanceList);
}
@Test
@@ -263,8 +264,8 @@
pulledInstances = new ArrayList<>();
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
- Assert.assertEquals(0, microserviceCache.getInstances().size());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
+ Assertions.assertEquals(0, microserviceCache.getInstances().size());
}
@Test
@@ -289,9 +290,9 @@
pulledInstances = new ArrayList<>();
microserviceCache.refresh();
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
- Assert.assertEquals(1, microserviceCache.getInstances().size());
- Assert.assertEquals("instanceId0", microserviceCache.getInstances().get(0).getInstanceId());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
+ Assertions.assertEquals(1, microserviceCache.getInstances().size());
+ Assertions.assertEquals("instanceId0", microserviceCache.getInstances().get(0).getInstanceId());
}
@Test
@@ -299,7 +300,7 @@
Holder<Integer> assertCounter = new Holder<>(0);
Function<Object[], MicroserviceInstances> preservedLogic = findServiceInstancesOprHolder.value;
findServiceInstancesOprHolder.value = params -> {
- Assert.assertEquals("consumerId", params[0]);
+ Assertions.assertEquals("consumerId", params[0]);
assertCounter.value++;
return preservedLogic.apply(params);
};
@@ -308,11 +309,11 @@
consumerService.setServiceId("consumerId2");
findServiceInstancesOprHolder.value = params -> {
- Assert.assertEquals("consumerId2", params[0]);
+ Assertions.assertEquals("consumerId2", params[0]);
assertCounter.value++;
return preservedLogic.apply(params);
};
microserviceCache.refresh();
- Assert.assertEquals(Integer.valueOf(2), assertCounter.value);
+ Assertions.assertEquals(Integer.valueOf(2), assertCounter.value);
}
}
\ No newline at end of file
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java
index cbdfd68..e88ec04 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/registry/cache/RefreshableServiceRegistryCacheTest.java
@@ -30,6 +30,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
public class RefreshableServiceRegistryCacheTest {
@@ -72,12 +73,12 @@
MicroserviceCache microserviceCache = serviceRegistryCache
.findServiceCache(MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build());
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
- Assert.assertEquals(0, microserviceCache.getInstances().size());
- Assert.assertEquals(1, serviceRegistryCache.microserviceCache.size());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, microserviceCache.getStatus());
+ Assertions.assertEquals(0, microserviceCache.getInstances().size());
+ Assertions.assertEquals(1, serviceRegistryCache.microserviceCache.size());
Entry<MicroserviceCacheKey, RefreshableMicroserviceCache> cacheEntry =
serviceRegistryCache.microserviceCache.entrySet().iterator().next();
- Assert.assertEquals(MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build(),
+ Assertions.assertEquals(MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build(),
cacheEntry.getKey());
}
@@ -115,12 +116,12 @@
serviceRegistryCache.refreshCache();
- Assert.assertEquals(2, refreshedCaches.size());
- Assert.assertSame(microserviceCache.getKey(), refreshedCaches.get(0).getKey());
- Assert.assertSame(microserviceCache3.getKey(), refreshedCaches.get(1).getKey());
- Assert.assertEquals(2, serviceRegistryCache.microserviceCache.size());
- Assert.assertSame(microserviceCache, serviceRegistryCache.microserviceCache.get(microserviceCache.getKey()));
- Assert.assertSame(microserviceCache2, serviceRegistryCache.microserviceCache.get(microserviceCache2.getKey()));
+ Assertions.assertEquals(2, refreshedCaches.size());
+ Assertions.assertSame(microserviceCache.getKey(), refreshedCaches.get(0).getKey());
+ Assertions.assertSame(microserviceCache3.getKey(), refreshedCaches.get(1).getKey());
+ Assertions.assertEquals(2, serviceRegistryCache.microserviceCache.size());
+ Assertions.assertSame(microserviceCache, serviceRegistryCache.microserviceCache.get(microserviceCache.getKey()));
+ Assertions.assertSame(microserviceCache2, serviceRegistryCache.microserviceCache.get(microserviceCache2.getKey()));
}
@Test
@@ -130,10 +131,10 @@
MicroserviceCacheKey cacheKey = MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build();
MicroserviceCache serviceCache = serviceRegistryCache.findServiceCache(cacheKey);
- Assert.assertSame(cacheKey, serviceCache.getKey());
- Assert.assertEquals(MicroserviceCacheStatus.REFRESHED, serviceCache.getStatus());
- Assert.assertEquals(1, serviceRegistryCache.microserviceCache.size());
- Assert.assertSame(serviceCache, serviceRegistryCache.microserviceCache.get(cacheKey));
+ Assertions.assertSame(cacheKey, serviceCache.getKey());
+ Assertions.assertEquals(MicroserviceCacheStatus.REFRESHED, serviceCache.getStatus());
+ Assertions.assertEquals(1, serviceRegistryCache.microserviceCache.size());
+ Assertions.assertSame(serviceCache, serviceRegistryCache.microserviceCache.get(cacheKey));
}
@Test
@@ -143,10 +144,10 @@
MicroserviceCacheKey cacheKey = MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build();
MicroserviceCache serviceCache = serviceRegistryCache.findServiceCache(cacheKey);
- Assert.assertSame(cacheKey, serviceCache.getKey());
- Assert.assertEquals(MicroserviceCacheStatus.CLIENT_ERROR, serviceCache.getStatus());
- Assert.assertEquals(1, serviceRegistryCache.microserviceCache.size());
- Assert.assertSame(serviceCache, serviceRegistryCache.microserviceCache.get(cacheKey));
+ Assertions.assertSame(cacheKey, serviceCache.getKey());
+ Assertions.assertEquals(MicroserviceCacheStatus.CLIENT_ERROR, serviceCache.getStatus());
+ Assertions.assertEquals(1, serviceRegistryCache.microserviceCache.size());
+ Assertions.assertSame(serviceCache, serviceRegistryCache.microserviceCache.get(cacheKey));
}
@Test
@@ -156,9 +157,9 @@
MicroserviceCacheKey cacheKey = MicroserviceCacheKey.builder().serviceName("svc").appId("app").env("env").build();
MicroserviceCache serviceCache = serviceRegistryCache.findServiceCache(cacheKey);
- Assert.assertSame(cacheKey, serviceCache.getKey());
- Assert.assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, serviceCache.getStatus());
- Assert.assertTrue(serviceRegistryCache.microserviceCache.isEmpty());
+ Assertions.assertSame(cacheKey, serviceCache.getKey());
+ Assertions.assertEquals(MicroserviceCacheStatus.SERVICE_NOT_FOUND, serviceCache.getStatus());
+ Assertions.assertTrue(serviceRegistryCache.microserviceCache.isEmpty());
}
private Holder<MicroserviceCacheStatus> mockServiceRegistryHolder() {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java
index 87ae0f7..4718e93 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/swagger/TestSwaggerLoader.java
@@ -60,7 +60,7 @@
Microservice microservice = appManager.getOrCreateMicroserviceVersions(appId, serviceName)
.getVersions().values().iterator().next().getMicroservice();
- Assert.assertSame(swagger, RegistrationManager.INSTANCE
+ Assertions.assertSame(swagger, RegistrationManager.INSTANCE
.getSwaggerLoader().loadSwagger(microservice, null, schemaId));
}
@@ -80,8 +80,8 @@
.getVersions().values().iterator().next().getMicroservice();
Swagger loadedSwagger = RegistrationManager.INSTANCE
.getSwaggerLoader().loadSwagger(microservice, null, schemaId);
- Assert.assertNotSame(swagger, loadedSwagger);
- Assert.assertEquals(swagger, loadedSwagger);
+ Assertions.assertNotSame(swagger, loadedSwagger);
+ Assertions.assertEquals(swagger, loadedSwagger);
}
@Test
@@ -95,8 +95,8 @@
.getVersions().values().iterator().next().getMicroservice();
Swagger loadedSwagger = RegistrationManager.INSTANCE
.getSwaggerLoader().loadSwagger(microservice, null, schemaId);
- Assert.assertNotSame(swagger, loadedSwagger);
- Assert.assertEquals(swagger, loadedSwagger);
+ Assertions.assertNotSame(swagger, loadedSwagger);
+ Assertions.assertEquals(swagger, loadedSwagger);
}
@Test
@@ -110,8 +110,8 @@
.getVersions().values().iterator().next().getMicroservice();
Swagger loadedSwagger = RegistrationManager.INSTANCE
.getSwaggerLoader().loadSwagger(microservice, null, schemaId);
- Assert.assertNotSame(swagger, loadedSwagger);
- Assert.assertEquals(swagger, loadedSwagger);
+ Assertions.assertNotSame(swagger, loadedSwagger);
+ Assertions.assertEquals(swagger, loadedSwagger);
}
@Test
@@ -122,7 +122,7 @@
Microservice microservice = appManager.getOrCreateMicroserviceVersions("other", "ms3")
.getVersions().values().iterator().next().getMicroservice();
- Assert.assertNull(RegistrationManager.INSTANCE.getSwaggerLoader().loadSwagger(microservice, null, schemaId));
+ Assertions.assertNull(RegistrationManager.INSTANCE.getSwaggerLoader().loadSwagger(microservice, null, schemaId));
}
@Test
@@ -134,8 +134,8 @@
.getVersions().values().iterator().next().getMicroservice();
Swagger loadedSwagger = RegistrationManager.INSTANCE
.getSwaggerLoader().loadSwagger(microservice, null, schemaId);
- Assert.assertNotSame(swagger, loadedSwagger);
- Assert.assertEquals(swagger, loadedSwagger);
+ Assertions.assertNotSame(swagger, loadedSwagger);
+ Assertions.assertEquals(swagger, loadedSwagger);
}
private void mockLocalResource(Swagger swagger, String path) {
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java
index 7b1f2ed..cf4ad7c 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestAbstractRegisterTask.java
@@ -27,6 +27,7 @@
import com.google.common.eventbus.EventBus;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestAbstractRegisterTask {
private EventBus eventBus;
@@ -53,10 +54,10 @@
new MicroserviceInstanceHeartbeatTask(eventBus, srClient, microservice);
ReflectUtils.setField(heartbeatTask, "heartbeatResult", HeartbeatResult.SUCCESS);
- Assert.assertEquals(true, registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isRegistered());
eventBus.post(heartbeatTask);
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(eventBus, registerTask.getEventBus());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertEquals(eventBus, registerTask.getEventBus());
}
@Test
@@ -68,9 +69,9 @@
new MicroserviceInstanceHeartbeatTask(eventBus, srClient, microservice);
ReflectUtils.setField(heartbeatTask, "heartbeatResult", HeartbeatResult.INSTANCE_NOT_REGISTERED);
- Assert.assertEquals(true, registerTask.isRegistered());
+ Assertions.assertEquals(true, registerTask.isRegistered());
eventBus.post(heartbeatTask);
- Assert.assertEquals(false, registerTask.isRegistered());
+ Assertions.assertEquals(false, registerTask.isRegistered());
}
@Test
@@ -86,8 +87,8 @@
new MicroserviceInstanceHeartbeatTask(eventBus, srClient, otherMicroservice);
ReflectUtils.setField(heartbeatTask, "heartbeatResult", HeartbeatResult.INSTANCE_NOT_REGISTERED);
- Assert.assertEquals(true, registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isRegistered());
eventBus.post(heartbeatTask);
- Assert.assertEquals(true, registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isRegistered());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestCompositeTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestCompositeTask.java
index d63e986..6d012fc 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestCompositeTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestCompositeTask.java
@@ -16,8 +16,8 @@
*/
package org.apache.servicecomb.serviceregistry.task;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
public class TestCompositeTask {
private int count;
@@ -33,7 +33,7 @@
task.run();
- Assert.assertEquals(3, count);
- Assert.assertEquals(3, task.getTaskCount());
+ Assertions.assertEquals(3, count);
+ Assertions.assertEquals(3, task.getTaskCount());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceHeartbeatTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceHeartbeatTask.java
index 6f32740..028de98 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceHeartbeatTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceHeartbeatTask.java
@@ -24,7 +24,6 @@
import org.apache.servicecomb.serviceregistry.api.response.HeartbeatResponse;
import org.apache.servicecomb.serviceregistry.client.ServiceRegistryClient;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
-import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -33,6 +32,7 @@
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceInstanceHeartbeatTask {
private EventBus eventBus;
@@ -76,9 +76,9 @@
eventBus.post(registerTask);
task.run();
- Assert.assertNull(task.getHeartbeatResult());
- Assert.assertEquals(false, task.isNeedRegisterInstance());
- Assert.assertEquals(0, heartbeatTaskList.size());
+ Assertions.assertNull(task.getHeartbeatResult());
+ Assertions.assertFalse(task.isNeedRegisterInstance());
+ Assertions.assertEquals(0, heartbeatTaskList.size());
}
@Test
@@ -101,9 +101,9 @@
eventBus.post(watchTask);
heartbeatTask.run();
- Assert.assertNull(heartbeatTask.getHeartbeatResult());
- Assert.assertEquals(false, heartbeatTask.isNeedRegisterInstance());
- Assert.assertEquals(0, heartbeatTaskList.size());
+ Assertions.assertNull(heartbeatTask.getHeartbeatResult());
+ Assertions.assertFalse(heartbeatTask.isNeedRegisterInstance());
+ Assertions.assertEquals(0, heartbeatTaskList.size());
}
@Test
@@ -125,9 +125,9 @@
eventBus.post(watchTask);
heartbeatTask.run();
- Assert.assertEquals(HeartbeatResult.DISCONNECTED, heartbeatTask.getHeartbeatResult());
- Assert.assertEquals(false, heartbeatTask.isNeedRegisterInstance());
- Assert.assertEquals(1, heartbeatTaskList.size());
+ Assertions.assertEquals(HeartbeatResult.DISCONNECTED, heartbeatTask.getHeartbeatResult());
+ Assertions.assertFalse(heartbeatTask.isNeedRegisterInstance());
+ Assertions.assertEquals(1, heartbeatTaskList.size());
}
@Test
@@ -153,9 +153,9 @@
eventBus.post(watchTask);
heartbeatTask.run();
- Assert.assertEquals(HeartbeatResult.INSTANCE_NOT_REGISTERED, heartbeatTask.getHeartbeatResult());
- Assert.assertEquals(true, heartbeatTask.isNeedRegisterInstance());
- Assert.assertEquals(1, heartbeatTaskList.size());
+ Assertions.assertEquals(HeartbeatResult.INSTANCE_NOT_REGISTERED, heartbeatTask.getHeartbeatResult());
+ Assertions.assertTrue(heartbeatTask.isNeedRegisterInstance());
+ Assertions.assertEquals(1, heartbeatTaskList.size());
}
@Test
@@ -181,8 +181,8 @@
eventBus.post(watchTask);
heartbeatTask.run();
- Assert.assertEquals(HeartbeatResult.SUCCESS, heartbeatTask.getHeartbeatResult());
- Assert.assertEquals(false, heartbeatTask.isNeedRegisterInstance());
- Assert.assertEquals(1, heartbeatTaskList.size());
+ Assertions.assertEquals(HeartbeatResult.SUCCESS, heartbeatTask.getHeartbeatResult());
+ Assertions.assertFalse(heartbeatTask.isNeedRegisterInstance());
+ Assertions.assertEquals(1, heartbeatTaskList.size());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java
index 9cc4785..63f484b 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java
@@ -39,6 +39,7 @@
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceInstanceRegisterTask {
private EventBus eventBus;
@@ -91,8 +92,8 @@
new MicroserviceInstanceRegisterTask(eventBus, serviceRegistryConfig, null, microservice);
registerTask.run();
- Assert.assertEquals(false, registerTask.isRegistered());
- Assert.assertEquals(0, taskList.size());
+ Assertions.assertFalse(registerTask.isRegistered());
+ Assertions.assertEquals(0, taskList.size());
}
@Test
@@ -121,12 +122,12 @@
registerTask.taskStatus = TaskStatus.READY;
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals("127.0.0.1", instance.getHostName());
- Assert.assertEquals("instanceId", instance.getInstanceId());
- Assert.assertEquals(10, instance.getHealthCheck().getInterval());
- Assert.assertEquals(20, instance.getHealthCheck().getTimes());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertEquals("127.0.0.1", instance.getHostName());
+ Assertions.assertEquals("instanceId", instance.getInstanceId());
+ Assertions.assertEquals(10, instance.getHealthCheck().getInterval());
+ Assertions.assertEquals(20, instance.getHealthCheck().getTimes());
+ Assertions.assertEquals(1, taskList.size());
}
@Test
@@ -155,12 +156,12 @@
registerTask.taskStatus = TaskStatus.READY;
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals("hostName", instance.getHostName());
- Assert.assertEquals("instanceId", instance.getInstanceId());
- Assert.assertEquals(10, instance.getHealthCheck().getInterval());
- Assert.assertEquals(20, instance.getHealthCheck().getTimes());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertEquals("hostName", instance.getHostName());
+ Assertions.assertEquals("instanceId", instance.getInstanceId());
+ Assertions.assertEquals(10, instance.getHealthCheck().getInterval());
+ Assertions.assertEquals(20, instance.getHealthCheck().getTimes());
+ Assertions.assertEquals(1, taskList.size());
}
@Test
@@ -189,10 +190,10 @@
registerTask.taskStatus = TaskStatus.READY;
registerTask.run();
- Assert.assertEquals(false, registerTask.isRegistered());
- Assert.assertEquals("127.0.0.1", instance.getHostName());
- Assert.assertEquals(10, instance.getHealthCheck().getInterval());
- Assert.assertEquals(20, instance.getHealthCheck().getTimes());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertFalse(registerTask.isRegistered());
+ Assertions.assertEquals("127.0.0.1", instance.getHostName());
+ Assertions.assertEquals(10, instance.getHealthCheck().getInterval());
+ Assertions.assertEquals(20, instance.getHealthCheck().getTimes());
+ Assertions.assertEquals(1, taskList.size());
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
index ba7ed2d..eb40e38 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
@@ -39,6 +39,7 @@
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceRegisterTask {
private EventBus eventBus;
@@ -88,10 +89,10 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(false, registerTask.isRegistered());
- Assert.assertEquals(false, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals(null, microservice.getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertFalse(registerTask.isRegistered());
+ Assertions.assertFalse(registerTask.isSchemaIdSetMatch());
+ Assertions.assertNull(microservice.getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
@Test
@@ -112,14 +113,14 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals("serviceId", microservice.getInstance().getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals("serviceId", microservice.getInstance().getServiceId());
+ Assertions.assertEquals(1, taskList.size());
registerTask.run();
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertEquals(1, taskList.size());
}
/**
@@ -155,11 +156,11 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(false, registerTask.isRegistered());
- Assert.assertEquals(false, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals("serviceId", microservice.getInstance().getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertEquals(false, registerTask.isRegistered());
+ Assertions.assertEquals(false, registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals("serviceId", microservice.getInstance().getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
/**
@@ -191,11 +192,11 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals("serviceId", microservice.getInstance().getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals("serviceId", microservice.getInstance().getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
@Test
@@ -216,12 +217,12 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals("serviceId", microservice.getInstance().getServiceId());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals("serviceId", microservice.getInstance().getServiceId());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals(1, taskList.size());
}
@Test(expected = IllegalStateException.class)
@@ -272,10 +273,10 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(false, registerTask.isRegistered());
- Assert.assertEquals(false, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertFalse(registerTask.isRegistered());
+ Assertions.assertFalse(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
@Test
@@ -313,10 +314,10 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
/**
@@ -356,10 +357,10 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
/**
@@ -479,10 +480,10 @@
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();
- Assert.assertEquals(true, registerTask.isRegistered());
- Assert.assertEquals(true, registerTask.isSchemaIdSetMatch());
- Assert.assertEquals("serviceId", microservice.getServiceId());
- Assert.assertEquals(1, taskList.size());
+ Assertions.assertTrue(registerTask.isRegistered());
+ Assertions.assertTrue(registerTask.isSchemaIdSetMatch());
+ Assertions.assertEquals("serviceId", microservice.getServiceId());
+ Assertions.assertEquals(1, taskList.size());
}
/**
@@ -596,17 +597,17 @@
microservice.setEnvironment("prod");
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
- Boolean isIlleagalException = false;
+ boolean isIllegalException = false;
try {
registerTask.run();
} catch (IllegalStateException exception) {
- isIlleagalException = true;
+ isIllegalException = true;
List<LoggingEvent> events = collector.getEvents().stream().filter(e -> {
return MicroserviceRegisterTask.class.getName().equals(e.getLoggerName());
}).collect(Collectors.toList());
- Assert.assertEquals("service center schema and local schema both are different:\n" +
+ Assertions.assertEquals("service center schema and local schema both are different:\n" +
" service center schema:\n" +
"[swagger: \"2.0\"\n" +
"info:\n" +
@@ -686,7 +687,7 @@
" maximum: 20\n" +
" x-java-class: \"org.apache.servicecomb.demo.validator.Student\"]", events.get(4).getMessage());
- Assert.assertEquals("The difference in local schema:\n" +
+ Assertions.assertEquals("The difference in local schema:\n" +
"[type: \"string\"\n" +
"definitions:\n" +
" Student:\n" +
@@ -703,7 +704,7 @@
" x-java-class: \"org.apache.servicecomb.demo.validator.Student\"]", events.get(5).getMessage());
}
- Assert.assertEquals(true, isIlleagalException);
+ Assertions.assertTrue(isIllegalException);
}
@Test
@@ -817,15 +818,15 @@
microservice.setEnvironment("prod");
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
- Boolean isIlleagalException = false;
+ boolean isIllegalException = false;
try {
registerTask.run();
} catch (IllegalStateException exception) {
- isIlleagalException = true;
+ isIllegalException = true;
}
- Assert.assertEquals(false, isIlleagalException);
+ Assertions.assertFalse(isIllegalException);
}
@Test
@@ -935,13 +936,13 @@
" x-java-class: \"org.apache.servicecomb.demo.validator.Student\"");
microservice.setEnvironment("prod");
MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
- Boolean isIlleagalException = false;
+ boolean isIllegalException = false;
try {
registerTask.run();
} catch (IllegalStateException exception) {
- isIlleagalException = true;
+ isIllegalException = true;
}
- Assert.assertEquals(false, isIlleagalException);
+ Assertions.assertFalse(isIllegalException);
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceWatchTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceWatchTask.java
index b538495..ecdefce 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceWatchTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceWatchTask.java
@@ -27,7 +27,6 @@
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
import org.apache.servicecomb.serviceregistry.event.ExceptionEvent;
import org.apache.servicecomb.serviceregistry.event.RecoveryEvent;
-import org.junit.Assert;
import org.junit.Test;
import com.google.common.eventbus.EventBus;
@@ -37,6 +36,7 @@
import mockit.Mock;
import mockit.MockUp;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestMicroserviceWatchTask {
EventBus eventBus = new EventBus();
@@ -78,9 +78,9 @@
openHolder.value = true;
}
});
- Assert.assertNull(openHolder.value);
+ Assertions.assertNull(openHolder.value);
microserviceWatchTask.run();
- Assert.assertTrue(openHolder.value);
+ Assertions.assertTrue(openHolder.value);
}
@Test
@@ -104,9 +104,9 @@
holder.value = event.getThrowable();
}
});
- Assert.assertNull(holder.value);
+ Assertions.assertNull(holder.value);
microserviceWatchTask.run();
- Assert.assertEquals("test failed", holder.value.getMessage());
+ Assertions.assertEquals("test failed", holder.value.getMessage());
}
@Test
@@ -141,15 +141,15 @@
changedEvent.setAction(WatchAction.CREATE);
microserviceWatchTask.run();
- Assert.assertEquals(WatchAction.CREATE, holder.value.getAction());
+ Assertions.assertEquals(WatchAction.CREATE, holder.value.getAction());
changedEvent.setAction(WatchAction.DELETE);
microserviceWatchTask.run();
- Assert.assertEquals(WatchAction.DELETE, holder.value.getAction());
+ Assertions.assertEquals(WatchAction.DELETE, holder.value.getAction());
changedEvent.setAction(WatchAction.UPDATE);
microserviceWatchTask.run();
- Assert.assertEquals(WatchAction.UPDATE, holder.value.getAction());
+ Assertions.assertEquals(WatchAction.UPDATE, holder.value.getAction());
}
@Test
@@ -180,7 +180,7 @@
try {
microserviceWatchTask.run();
} catch (Throwable e) {
- Assert.fail("must do not watch");
+ Assertions.fail("must do not watch");
}
new Expectations() {
@@ -194,7 +194,7 @@
microserviceWatchTask.run();
} catch (Throwable e) {
// ready state, service id can not be null , will always watch
- Assert.assertEquals("called watch", e.getMessage());
+ Assertions.assertEquals("called watch", e.getMessage());
}
new Expectations() {
@@ -208,7 +208,7 @@
microserviceWatchTask.run();
} catch (Throwable e) {
// ready state, service id can not be null , will always watch
- Assert.assertEquals("called watch", e.getMessage());
+ Assertions.assertEquals("called watch", e.getMessage());
}
new Expectations() {
@@ -222,9 +222,9 @@
// watch
try {
microserviceWatchTask.run();
- Assert.fail("must watch");
+ Assertions.fail("must watch");
} catch (Throwable e) {
- Assert.assertEquals("called watch", e.getMessage());
+ Assertions.assertEquals("called watch", e.getMessage());
}
}
}
diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java
index 9134f26..d30053d 100644
--- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java
+++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestServiceCenterTask.java
@@ -28,6 +28,7 @@
import mockit.Expectations;
import mockit.Mocked;
+import org.junit.jupiter.api.Assertions;
public class TestServiceCenterTask {
private final EventBus eventBus = new EventBus();
@@ -67,10 +68,10 @@
};
serviceCenterTask.init();
eventBus.post(instanceEvent);
- Assert.assertTrue(serviceCenterTask.isRegisterInstanceSuccess());
+ Assertions.assertTrue(serviceCenterTask.isRegisterInstanceSuccess());
eventBus.post(heartBeatEvent);
- Assert.assertFalse(serviceCenterTask.isRegisterInstanceSuccess());
+ Assertions.assertFalse(serviceCenterTask.isRegisterInstanceSuccess());
}
@Test
@@ -86,9 +87,9 @@
};
serviceCenterTask.init();
eventBus.post(instanceEvent);
- Assert.assertTrue(serviceCenterTask.isRegisterInstanceSuccess());
+ Assertions.assertTrue(serviceCenterTask.isRegisterInstanceSuccess());
eventBus.post(heartBeatEvent);
- Assert.assertTrue(serviceCenterTask.isRegisterInstanceSuccess());
+ Assertions.assertTrue(serviceCenterTask.isRegisterInstanceSuccess());
}
}
