You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2018/11/15 16:07:54 UTC
[camel] branch sandbox/camel-3.x updated: Fix management tests
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch sandbox/camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/sandbox/camel-3.x by this push:
new 5aabbc0 Fix management tests
5aabbc0 is described below
commit 5aabbc0ccafae6c692e8af2bcbe82f131ffff75a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Thu Nov 15 17:07:26 2018 +0100
Fix management tests
---
.../management/ManagedNonManagedServiceTest.java | 6 +-
.../management/ManagedRouteAddRemoveTest.java | 86 +++++++++++-----------
2 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
index a3b2dab..dc38e93 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedNonManagedServiceTest.java
@@ -29,6 +29,8 @@ import org.junit.Test;
public class ManagedNonManagedServiceTest extends ManagementTestSupport {
+ private static final int SERVICES = 11;
+
@Test
public void testService() throws Exception {
// JMX tests dont work well on AIX CI servers (hangs them)
@@ -48,7 +50,7 @@ public class ManagedNonManagedServiceTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- assertEquals(11, set.size());
+ assertEquals(SERVICES + 1, set.size());
}
@Test
@@ -70,7 +72,7 @@ public class ManagedNonManagedServiceTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
- assertEquals(10, set.size());
+ assertEquals(SERVICES, set.size());
}
@Override
diff --git a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
index 7ff7cf0..3f05450 100644
--- a/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
+++ b/camel-management-impl/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java
@@ -33,7 +33,7 @@ import org.junit.Test;
*/
public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
- private int services = 10;
+ private static final int SERVICES = 11;
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -57,10 +57,10 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
- // number of services
+ // number of SERVICES
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -83,9 +83,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
template.sendBody("direct:bar", "Hello World");
bar.assertIsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// but we should have one more producer
namesP = mbeanServer.queryNames(onP, null);
@@ -98,9 +98,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// and the 2nd producer should be removed
namesP = mbeanServer.queryNames(onP, null);
@@ -119,9 +119,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
- // number of services
+ // number of SERVICES
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -144,9 +144,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
template.sendBodyAndHeader("direct:bar", "Hello World", "bar", "mock:bar");
bar.assertIsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// but as its recipient list which is dynamic-to we do not add a new producer
namesP = mbeanServer.queryNames(onP, null);
@@ -159,9 +159,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// and we still have the original producer
namesP = mbeanServer.queryNames(onP, null);
@@ -180,9 +180,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
- // number of services
+ // number of SERVICES
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// number of producers
ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*");
@@ -205,9 +205,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
template.sendBodyAndHeader("direct:bar", "Hello World", "bar", "mock:bar");
bar.assertIsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// but as its recipient list which is dynamic-to we do not add a new producer
namesP = mbeanServer.queryNames(onP, null);
@@ -220,9 +220,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// and we still have the original producer
namesP = mbeanServer.queryNames(onP, null);
@@ -241,9 +241,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
- // number of services
+ // number of SERVICES
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Adding 2nd route");
@@ -271,9 +271,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
assertMockEndpointsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -283,9 +283,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Shutting down...");
}
@@ -300,9 +300,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
- // number of services
+ // number of SERVICES
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Adding 2nd route");
@@ -331,9 +331,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
assertMockEndpointsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -343,9 +343,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Shutting down...");
}
@@ -360,9 +360,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
- // number of services
+ // number of SERVICES
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Adding 2nd route");
@@ -389,9 +389,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
assertMockEndpointsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -401,9 +401,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Shutting down...");
}
@@ -418,9 +418,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*");
- // number of services
+ // number of SERVICES
Set<ObjectName> names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Adding 2nd route");
@@ -448,9 +448,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
assertMockEndpointsSatisfied();
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
// now stop and remove the 2nd route
log.info("Stopping 2nd route");
@@ -460,9 +460,9 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport {
boolean removed = context.removeRoute("bar");
assertTrue(removed);
- // there should still be the same number of services
+ // there should still be the same number of SERVICES
names = mbeanServer.queryNames(on, null);
- assertEquals(services, names.size());
+ assertEquals(SERVICES, names.size());
log.info("Shutting down...");
}