This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 378d84d3bb4bb27ded36d295230ccf29691150ad
Author: Guillaume Nodet <gno...@gmail.com>
AuthorDate: Tue Jun 2 13:47:24 2020 +0200
[CAMEL-11807] Upgrade camel-cloud to junit5
---
core/camel-cloud/pom.xml | 14 +++-
.../impl/cloud/CombinedServiceDiscoveryTest.java | 28 +++----
.../impl/cloud/CombinedServiceFilterTest.java | 23 +++---
.../apache/camel/impl/cloud/LoadBalancerTest.java | 15 ++--
.../impl/cloud/ServiceCallConfigurationTest.java | 85 +++++++++++-----------
.../camel/impl/cloud/ServiceDefinitionTest.java | 10 +--
.../camel/impl/cloud/ServiceRegistryTest.java | 71 +++++++++---------
7 files changed, 134 insertions(+), 112 deletions(-)
diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml
index ebc8fe6..52e99e9 100644
--- a/core/camel-cloud/pom.xml
+++ b/core/camel-cloud/pom.xml
@@ -52,8 +52,18 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryTest.java
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryTest.java
index bf14c41..fa2d5b6 100644
---
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryTest.java
+++
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceDiscoveryTest.java
@@ -21,10 +21,12 @@ import java.util.Arrays;
import org.apache.camel.ContextTestSupport;
import
org.apache.camel.model.cloud.CombinedServiceCallServiceDiscoveryConfiguration;
import
org.apache.camel.model.cloud.StaticServiceCallServiceDiscoveryConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class CombinedServiceDiscoveryTest extends ContextTestSupport {
+
@Test
public void testCombinedServiceDiscovery() throws Exception {
StaticServiceDiscovery discovery1 = new StaticServiceDiscovery();
@@ -36,8 +38,8 @@ public class CombinedServiceDiscoveryTest extends
ContextTestSupport {
discovery2.addServer(new DefaultServiceDefinition("discovery2",
"localhost", 1114));
CombinedServiceDiscovery discovery =
CombinedServiceDiscovery.wrap(discovery1, discovery2);
- Assert.assertEquals(3, discovery.getServices("discovery1").size());
- Assert.assertEquals(1, discovery.getServices("discovery2").size());
+ assertEquals(3, discovery.getServices("discovery1").size());
+ assertEquals(1, discovery.getServices("discovery2").size());
}
@Test
@@ -52,9 +54,9 @@ public class CombinedServiceDiscoveryTest extends
ContextTestSupport {
multiConf.setServiceDiscoveryConfigurations(Arrays.asList(staticConf1,
staticConf2));
CombinedServiceDiscovery discovery =
(CombinedServiceDiscovery)multiConf.newInstance(context);
- Assert.assertEquals(2, discovery.getDelegates().size());
- Assert.assertEquals(3, discovery.getServices("discovery1").size());
- Assert.assertEquals(1, discovery.getServices("discovery2").size());
+ assertEquals(2, discovery.getDelegates().size());
+ assertEquals(3, discovery.getServices("discovery1").size());
+ assertEquals(1, discovery.getServices("discovery2").size());
}
@Test
@@ -64,9 +66,9 @@ public class CombinedServiceDiscoveryTest extends
ContextTestSupport {
multiConf.staticServiceDiscovery().setServers(Arrays.asList("discovery1@localhost:1113",
"discovery2@localhost:1114"));
CombinedServiceDiscovery discovery =
(CombinedServiceDiscovery)multiConf.newInstance(context);
- Assert.assertEquals(2, discovery.getDelegates().size());
- Assert.assertEquals(3, discovery.getServices("discovery1").size());
- Assert.assertEquals(1, discovery.getServices("discovery2").size());
+ assertEquals(2, discovery.getDelegates().size());
+ assertEquals(3, discovery.getServices("discovery1").size());
+ assertEquals(1, discovery.getServices("discovery2").size());
}
@Test
@@ -79,8 +81,8 @@ public class CombinedServiceDiscoveryTest extends
ContextTestSupport {
multiConf.staticServiceDiscovery().servers("{{svc-list-2}}");
CombinedServiceDiscovery discovery =
(CombinedServiceDiscovery)multiConf.newInstance(context);
- Assert.assertEquals(2, discovery.getDelegates().size());
- Assert.assertEquals(3, discovery.getServices("discovery1").size());
- Assert.assertEquals(1, discovery.getServices("discovery2").size());
+ assertEquals(2, discovery.getDelegates().size());
+ assertEquals(3, discovery.getServices("discovery1").size());
+ assertEquals(1, discovery.getServices("discovery2").size());
}
}
diff --git
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
index 1489bac..57ef717 100644
---
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
+++
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/CombinedServiceFilterTest.java
@@ -23,8 +23,11 @@ import java.util.stream.Collectors;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.cloud.ServiceDefinition;
import
org.apache.camel.model.cloud.CombinedServiceCallServiceFilterConfiguration;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class CombinedServiceFilterTest extends ContextTestSupport {
@Test
@@ -35,9 +38,9 @@ public class CombinedServiceFilterTest extends
ContextTestSupport {
.passThrough();
CombinedServiceFilter filter =
(CombinedServiceFilter)conf.newInstance(context);
- Assert.assertEquals(2, filter.getDelegates().size());
- Assert.assertTrue(filter.getDelegates().get(0) instanceof
HealthyServiceFilter);
- Assert.assertTrue(filter.getDelegates().get(1) instanceof
PassThroughServiceFilter);
+ assertEquals(2, filter.getDelegates().size());
+ assertTrue(filter.getDelegates().get(0) instanceof
HealthyServiceFilter);
+ assertTrue(filter.getDelegates().get(1) instanceof
PassThroughServiceFilter);
}
@@ -57,10 +60,10 @@ public class CombinedServiceFilterTest extends
ContextTestSupport {
new DefaultServiceDefinition("no-name", "127.0.0.1", 2001, new
DefaultServiceHealth(false))
));
- Assert.assertEquals(2, services.size());
- Assert.assertFalse(services.stream().anyMatch(s ->
!s.getHealth().isHealthy()));
- Assert.assertFalse(services.stream().anyMatch(s -> s.getPort() >
2000));
- Assert.assertTrue(services.stream().anyMatch(s -> s.getPort() ==
1000));
- Assert.assertTrue(services.stream().anyMatch(s -> s.getPort() ==
1002));
+ assertEquals(2, services.size());
+ assertFalse(services.stream().anyMatch(s ->
!s.getHealth().isHealthy()));
+ assertFalse(services.stream().anyMatch(s -> s.getPort() > 2000));
+ assertTrue(services.stream().anyMatch(s -> s.getPort() == 1000));
+ assertTrue(services.stream().anyMatch(s -> s.getPort() == 1002));
}
}
diff --git
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
index 8616576..24572c9 100644
---
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
+++
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/LoadBalancerTest.java
@@ -20,16 +20,17 @@ import java.util.concurrent.RejectedExecutionException;
import java.util.stream.Collectors;
import org.apache.camel.impl.DefaultCamelContext;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
public class LoadBalancerTest {
private static StaticServiceDiscovery serviceDiscovery = new
StaticServiceDiscovery();
- @BeforeClass
+ @BeforeAll
public static void setUp() {
serviceDiscovery.addServer("no-name@127.0.0.1:2001");
serviceDiscovery.addServer("no-name@127.0.0.1:2002");
@@ -54,13 +55,15 @@ public class LoadBalancerTest {
});
}
- @Test(expected = RejectedExecutionException.class)
+ @Test
public void testNoActiveServices() throws Exception {
DefaultServiceLoadBalancer loadBalancer = new
DefaultServiceLoadBalancer();
loadBalancer.setCamelContext(new DefaultCamelContext());
loadBalancer.setServiceDiscovery(serviceDiscovery);
loadBalancer.setServiceFilter(services -> services.stream().filter(s
-> s.getPort() < 1000).collect(Collectors.toList()));
loadBalancer.setServiceChooser(new RoundRobinServiceChooser());
- loadBalancer.process("no-name", service -> false);
+ assertThrows(RejectedExecutionException.class, () -> {
+ loadBalancer.process("no-name", service -> false);
+ });
}
}
diff --git
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
index 20a1de3..6046e41 100644
---
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
+++
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceCallConfigurationTest.java
@@ -31,8 +31,11 @@ import
org.apache.camel.model.cloud.ServiceCallDefinitionConstants;
import org.apache.camel.model.cloud.ServiceCallExpressionConfiguration;
import org.apache.camel.model.language.SimpleExpression;
import org.apache.camel.processor.channel.DefaultChannel;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ServiceCallConfigurationTest {
@@ -68,11 +71,11 @@ public class ServiceCallConfigurationTest {
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer)proc.getLoadBalancer();
- Assert.assertEquals(sd, loadBalancer.getServiceDiscovery());
+ assertEquals(sd, loadBalancer.getServiceDiscovery());
// call the route
context.createFluentProducerTemplate().to("direct:start").withHeader("customerId",
"123").send();
@@ -114,12 +117,12 @@ public class ServiceCallConfigurationTest {
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer)proc.getLoadBalancer();
- Assert.assertEquals(sd, loadBalancer.getServiceDiscovery());
- Assert.assertEquals(sf, loadBalancer.getServiceFilter());
+ assertEquals(sd, loadBalancer.getServiceDiscovery());
+ assertEquals(sf, loadBalancer.getServiceFilter());
context.stop();
}
@@ -156,12 +159,12 @@ public class ServiceCallConfigurationTest {
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer)proc.getLoadBalancer();
- Assert.assertEquals(sd, loadBalancer.getServiceDiscovery());
- Assert.assertEquals(sf, loadBalancer.getServiceFilter());
+ assertEquals(sd, loadBalancer.getServiceDiscovery());
+ assertEquals(sf, loadBalancer.getServiceFilter());
context.stop();
}
@@ -199,12 +202,12 @@ public class ServiceCallConfigurationTest {
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer)proc.getLoadBalancer();
- Assert.assertEquals(sd, loadBalancer.getServiceDiscovery());
- Assert.assertEquals(sf, loadBalancer.getServiceFilter());
+ assertEquals(sd, loadBalancer.getServiceDiscovery());
+ assertEquals(sf, loadBalancer.getServiceFilter());
context.stop();
}
@@ -280,36 +283,36 @@ public class ServiceCallConfigurationTest {
// Default
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer) proc.getLoadBalancer();
- Assert.assertEquals(defaultServiceDiscovery,
loadBalancer.getServiceDiscovery());
- Assert.assertEquals(defaultServiceFilter,
loadBalancer.getServiceFilter());
+ assertEquals(defaultServiceDiscovery,
loadBalancer.getServiceDiscovery());
+ assertEquals(defaultServiceFilter,
loadBalancer.getServiceFilter());
}
{
// Named
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("named"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer) proc.getLoadBalancer();
- Assert.assertEquals(defaultServiceDiscovery,
loadBalancer.getServiceDiscovery());
- Assert.assertEquals(namedServiceFilter,
loadBalancer.getServiceFilter());
+ assertEquals(defaultServiceDiscovery,
loadBalancer.getServiceDiscovery());
+ assertEquals(namedServiceFilter, loadBalancer.getServiceFilter());
}
{
// Local
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("local"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
DefaultServiceLoadBalancer loadBalancer =
(DefaultServiceLoadBalancer) proc.getLoadBalancer();
- Assert.assertEquals(localServiceDiscovery,
loadBalancer.getServiceDiscovery());
- Assert.assertEquals(namedServiceFilter,
loadBalancer.getServiceFilter());
+ assertEquals(localServiceDiscovery,
loadBalancer.getServiceDiscovery());
+ assertEquals(namedServiceFilter, loadBalancer.getServiceFilter());
}
context.stop();
@@ -356,26 +359,26 @@ public class ServiceCallConfigurationTest {
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
- Assert.assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
- Assert.assertEquals("service-name", proc.getName());
- Assert.assertEquals("file", proc.getScheme());
- Assert.assertEquals("direct:service-name", proc.getUri());
+ assertNotNull(proc);
+ assertTrue(proc.getLoadBalancer() instanceof
DefaultServiceLoadBalancer);
+ assertEquals("service-name", proc.getName());
+ assertEquals("file", proc.getScheme());
+ assertEquals("direct:service-name", proc.getUri());
DefaultServiceLoadBalancer lb =
(DefaultServiceLoadBalancer)proc.getLoadBalancer();
- Assert.assertTrue(lb.getServiceFilter() instanceof
BlacklistServiceFilter);
+ assertTrue(lb.getServiceFilter() instanceof
BlacklistServiceFilter);
BlacklistServiceFilter filter =
(BlacklistServiceFilter)lb.getServiceFilter();
List<ServiceDefinition> blacklist =
filter.getBlacklistedServices();
- Assert.assertEquals(1, blacklist.size());
+ assertEquals(1, blacklist.size());
- Assert.assertTrue(lb.getServiceDiscovery() instanceof
StaticServiceDiscovery);
+ assertTrue(lb.getServiceDiscovery() instanceof
StaticServiceDiscovery);
List<ServiceDefinition> services1 =
lb.getServiceDiscovery().getServices("hello-service");
- Assert.assertEquals(2, filter.apply(services1).size());
+ assertEquals(2, filter.apply(services1).size());
List<ServiceDefinition> services2 =
lb.getServiceDiscovery().getServices("hello-svc");
- Assert.assertEquals(1, filter.apply(services2).size());
+ assertEquals(1, filter.apply(services2).size());
} finally {
if (context != null) {
@@ -425,8 +428,8 @@ public class ServiceCallConfigurationTest {
DefaultServiceCallProcessor proc =
findServiceCallProcessor(context.getRoute("default"));
- Assert.assertNotNull(proc);
-
Assert.assertEquals("file:${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}",
+ assertNotNull(proc);
+
assertEquals("file:${header.CamelServiceCallServiceHost}:${header.CamelServiceCallServicePort}",
proc.getExpression().toString());
} finally {
diff --git
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
index 1471053..24ff1c7 100644
---
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
+++
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceDefinitionTest.java
@@ -21,12 +21,12 @@ import java.util.List;
import java.util.stream.Collectors;
import org.apache.camel.cloud.ServiceDefinition;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertFalse;
-import static junit.framework.TestCase.assertNull;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
public class ServiceDefinitionTest {
@Test
diff --git
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
index e954db2..cb6be3b 100644
---
a/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
+++
b/core/camel-cloud/src/test/java/org/apache/camel/impl/cloud/ServiceRegistryTest.java
@@ -26,8 +26,9 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.cloud.ServiceDefinition;
import org.apache.camel.model.RouteDefinition;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
public class ServiceRegistryTest extends ContextTestSupport {
@@ -71,21 +72,21 @@ public class ServiceRegistryTest extends ContextTestSupport
{
final Map<String, ServiceDefinition> defs = sr.getDefinitions();
- Assertions.assertThat(defs).hasSize(1);
+ assertThat(defs).hasSize(1);
// basic properties
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("name",
serviceName);
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("id",
serviceId);
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("host",
"localhost");
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("port",
port);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("name",
serviceName);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("id",
serviceId);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("host",
"localhost");
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("port",
port);
// metadata
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_NAME,
serviceName);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_ID,
serviceId);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_HOST,
"localhost");
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_PORT,
"" + port);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry("service.meta1",
"meta1");
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).doesNotContainKeys("meta2");
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_NAME,
serviceName);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_ID,
serviceId);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_HOST,
"localhost");
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_PORT,
"" + port);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry("service.meta1",
"meta1");
+
assertThat(defs.get(serviceId).getMetadata()).doesNotContainKeys("meta2");
}
@Test
@@ -116,21 +117,21 @@ public class ServiceRegistryTest extends
ContextTestSupport {
final Map<String, ServiceDefinition> defs = sr.getDefinitions();
- Assertions.assertThat(defs).hasSize(1);
+ assertThat(defs).hasSize(1);
// basic properties
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("name",
serviceName);
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("id",
serviceId);
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("host",
"localhost");
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("port",
port);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("name",
serviceName);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("id",
serviceId);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("host",
"localhost");
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("port",
port);
// metadata
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_NAME,
serviceName);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_ID,
serviceId);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_HOST,
"localhost");
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_PORT,
"" + port);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry("service.meta1",
"meta1");
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).doesNotContainKeys("meta2");
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_NAME,
serviceName);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_ID,
serviceId);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_HOST,
"localhost");
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_PORT,
"" + port);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry("service.meta1",
"meta1");
+
assertThat(defs.get(serviceId).getMetadata()).doesNotContainKeys("meta2");
}
// *********************
@@ -163,21 +164,21 @@ public class ServiceRegistryTest extends
ContextTestSupport {
final Map<String, ServiceDefinition> defs = sr.getDefinitions();
- Assertions.assertThat(defs).hasSize(1);
+ assertThat(defs).hasSize(1);
// basic properties
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("name",
serviceName);
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("id",
serviceId);
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("host",
"localhost");
-
Assertions.assertThat(defs.values()).first().hasFieldOrPropertyWithValue("port",
port);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("name",
serviceName);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("id",
serviceId);
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("host",
"localhost");
+ assertThat(defs.values()).first().hasFieldOrPropertyWithValue("port",
port);
// metadata
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_NAME,
serviceName);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_ID,
serviceId);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_HOST,
"localhost");
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_PORT,
"" + port);
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).containsEntry("service.meta1",
"meta1");
-
Assertions.assertThat(defs.get(serviceId).getMetadata()).doesNotContainKeys("meta2");
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_NAME,
serviceName);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_ID,
serviceId);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_HOST,
"localhost");
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry(ServiceDefinition.SERVICE_META_PORT,
"" + port);
+
assertThat(defs.get(serviceId).getMetadata()).containsEntry("service.meta1",
"meta1");
+
assertThat(defs.get(serviceId).getMetadata()).doesNotContainKeys("meta2");
}
// *********************
