CAMEL-4596: enrich supports dynamic uris.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b07edd0a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b07edd0a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b07edd0a Branch: refs/heads/master Commit: b07edd0a2f535ebb9d73bd31736ac838523e078b Parents: 39c5170 Author: Claus Ibsen <[email protected]> Authored: Mon Jul 13 12:48:20 2015 +0200 Committer: Claus Ibsen <[email protected]> Committed: Mon Jul 13 12:48:20 2015 +0200 ---------------------------------------------------------------------- .../impl/MultipleLifecycleStrategyTest.java | 2 +- ...roducerRouteAddRemoveRegisterAlwaysTest.java | 6 +-- .../management/ManagedRouteAddRemoveTest.java | 42 ++++++++++---------- .../model/GatherAllStaticEndpointUrisTest.java | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/b07edd0a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java index a3cf751..f39a1ba 100644 --- a/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java +++ b/camel-core/src/test/java/org/apache/camel/impl/MultipleLifecycleStrategyTest.java @@ -50,7 +50,7 @@ public class MultipleLifecycleStrategyTest extends TestSupport { context.removeComponent("log"); context.stop(); - List<String> expectedEvents = Arrays.asList("onContextStart", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", + List<String> expectedEvents = Arrays.asList("onContextStart", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onServiceAdd", "onComponentAdd", "onEndpointAdd", "onComponentRemove", "onContextStop"); assertEquals(expectedEvents, dummy1.getEvents()); http://git-wip-us.apache.org/repos/asf/camel/blob/b07edd0a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java index 86ec502..606be4b 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedProducerRouteAddRemoveRegisterAlwaysTest.java @@ -47,7 +47,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -72,7 +72,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // but as its recipient list which is dynamic-to we add new producers because we have register always namesP = mbeanServer.queryNames(onP, null); @@ -87,7 +87,7 @@ public class ManagedProducerRouteAddRemoveRegisterAlwaysTest extends ManagementT // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // and we still have the other producers, but not the one from the 2nd route that was removed namesP = mbeanServer.queryNames(onP, null); http://git-wip-us.apache.org/repos/asf/camel/blob/b07edd0a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java index 46656de..ededf75 100644 --- a/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java +++ b/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAddRemoveTest.java @@ -59,7 +59,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services ObjectName on = ObjectName.getInstance("org.apache.camel:context=camel-1,type=services,*"); Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -84,7 +84,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // but we should have one more producer namesP = mbeanServer.queryNames(onP, null); @@ -99,7 +99,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // and the 2nd producer should be removed namesP = mbeanServer.queryNames(onP, null); @@ -119,7 +119,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -144,7 +144,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // but as its recipient list which is dynamic-to we do not add a new producer namesP = mbeanServer.queryNames(onP, null); @@ -159,7 +159,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // and we still have the original producer namesP = mbeanServer.queryNames(onP, null); @@ -179,7 +179,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // number of producers ObjectName onP = ObjectName.getInstance("org.apache.camel:context=camel-1,type=producers,*"); @@ -204,7 +204,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // but as its recipient list which is dynamic-to we do not add a new producer namesP = mbeanServer.queryNames(onP, null); @@ -219,7 +219,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // and we still have the original producer namesP = mbeanServer.queryNames(onP, null); @@ -239,7 +239,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Adding 2nd route"); @@ -269,7 +269,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -281,7 +281,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Shutting down..."); } @@ -297,7 +297,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Adding 2nd route"); @@ -328,7 +328,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -340,7 +340,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Shutting down..."); } @@ -356,7 +356,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Adding 2nd route"); @@ -385,7 +385,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -397,7 +397,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Shutting down..."); } @@ -413,7 +413,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // number of services Set<ObjectName> names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Adding 2nd route"); @@ -443,7 +443,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); // now stop and remove the 2nd route log.info("Stopping 2nd route"); @@ -455,7 +455,7 @@ public class ManagedRouteAddRemoveTest extends ManagementTestSupport { // there should still be the same number of services names = mbeanServer.queryNames(on, null); - assertEquals(9, names.size()); + assertEquals(10, names.size()); log.info("Shutting down..."); } http://git-wip-us.apache.org/repos/asf/camel/blob/b07edd0a/camel-core/src/test/java/org/apache/camel/model/GatherAllStaticEndpointUrisTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/model/GatherAllStaticEndpointUrisTest.java b/camel-core/src/test/java/org/apache/camel/model/GatherAllStaticEndpointUrisTest.java index 4713c61..f423c84 100644 --- a/camel-core/src/test/java/org/apache/camel/model/GatherAllStaticEndpointUrisTest.java +++ b/camel-core/src/test/java/org/apache/camel/model/GatherAllStaticEndpointUrisTest.java @@ -27,7 +27,7 @@ public class GatherAllStaticEndpointUrisTest extends ContextTestSupport { RouteDefinition route = context.getRouteDefinition("foo"); Set<String> uris = RouteDefinitionHelper.gatherAllStaticEndpointUris(context, route, true, true); assertNotNull(uris); - assertEquals(5, uris.size()); + assertEquals(4, uris.size()); RouteDefinition route2 = context.getRouteDefinition("bar"); Set<String> uris2 = RouteDefinitionHelper.gatherAllStaticEndpointUris(context, route2, true, true);
