You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/10/16 14:58:37 UTC
[1/3] camel git commit: Correction to multicast route in unit test
Repository: camel
Updated Branches:
refs/heads/master 51f6253de -> bd749da7b
Correction to multicast route in unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7aa2273
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7aa2273
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7aa2273
Branch: refs/heads/master
Commit: d7aa2273ef66d93e2b8df7e33939d709ce5d3c23
Parents: 021eef6
Author: jonmcewen <jo...@hotmail.com>
Authored: Thu Oct 15 14:35:49 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 16 14:58:02 2015 +0200
----------------------------------------------------------------------
.../MetricsRoutePolicyMulticastSubRouteTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/d7aa2273/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
index 3febfa0..09fb389 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
@@ -48,10 +48,10 @@ public class MetricsRoutePolicyMulticastSubRouteTest extends CamelTestSupport {
@Test
public void testMetricsRoutePolicy() throws Exception {
getMockEndpoint("mock:foo").expectedMessageCount(1);
- getMockEndpoint("mock:bar").expectedMessageCount(1);
- getMockEndpoint("mock:end").expectedMessageCount(1);
+ getMockEndpoint("mock:bar1").expectedMessageCount(1);
+ getMockEndpoint("mock:bar2").expectedMessageCount(1);
- template.sendBody("seda:multicast", "Hello World");
+ template.sendBody("direct:multicast", "Hello World");
assertMockEndpointsSatisfied();
@@ -76,9 +76,9 @@ public class MetricsRoutePolicyMulticastSubRouteTest extends CamelTestSupport {
public void configure() throws Exception {
from("direct:foo").routeId("foo").to("mock:foo");
- from("direct:bar").routeId("bar").to("mock:bar");
+ from("direct:bar").routeId("bar").multicast().to("mock:bar1", "mock:bar2");
- from("seda:multicast").routeId("multicast").multicast().to("direct:foo").to("direct:bar").end().to("mock:end");
+ from("direct:multicast").routeId("multicast").multicast().to("direct:foo", "direct:bar");
}
};
[3/3] camel git commit: Fixes #644. Fixed CS.
Posted by da...@apache.org.
Fixes #644. Fixed CS.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd749da7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd749da7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd749da7
Branch: refs/heads/master
Commit: bd749da7b390b84310d051f757459af2e0e41d46
Parents: d7aa227
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 16 15:00:56 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 16 15:00:56 2015 +0200
----------------------------------------------------------------------
.../routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bd749da7/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
index 09fb389..562f3eb 100644
--- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
@@ -18,14 +18,13 @@ package org.apache.camel.component.metrics.routepolicy;
import java.util.Map;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.Timer;
-
/**
* CAMEL-9226 - check metrics are counted correctly in multicast sub-routes
*/
[2/3] camel git commit: Added test for multicast,
but passes when I was expecting fail
Posted by da...@apache.org.
Added test for multicast, but passes when I was expecting fail
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/021eef6f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/021eef6f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/021eef6f
Branch: refs/heads/master
Commit: 021eef6f68f7f7f9024f2af096b29ca65d18be75
Parents: 51f6253
Author: unknown <jo...@WDTBH00675.hq.pinstripe.co.uk>
Authored: Thu Oct 15 10:57:09 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 16 14:58:02 2015 +0200
----------------------------------------------------------------------
...MetricsRoutePolicyMulticastSubRouteTest.java | 86 ++++++++++++++++++++
1 file changed, 86 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/021eef6f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
new file mode 100644
index 0000000..3febfa0
--- /dev/null
+++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/routepolicy/MetricsRoutePolicyMulticastSubRouteTest.java
@@ -0,0 +1,86 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.metrics.routepolicy;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
+
+/**
+ * CAMEL-9226 - check metrics are counted correctly in multicast sub-routes
+ */
+public class MetricsRoutePolicyMulticastSubRouteTest extends CamelTestSupport {
+
+ private MetricRegistry registry = new MetricRegistry();
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+
+ MetricsRoutePolicyFactory factory = new MetricsRoutePolicyFactory();
+ factory.setUseJmx(false);
+ factory.setMetricsRegistry(registry);
+ context.addRoutePolicyFactory(factory);
+
+ return context;
+ }
+
+ @Test
+ public void testMetricsRoutePolicy() throws Exception {
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:bar").expectedMessageCount(1);
+ getMockEndpoint("mock:end").expectedMessageCount(1);
+
+ template.sendBody("seda:multicast", "Hello World");
+
+ assertMockEndpointsSatisfied();
+
+ // there should be 3 names
+ assertEquals(3, registry.getNames().size());
+
+ // there should be 3 Counters
+ assertEquals(3, registry.getTimers().size());
+
+ for (Map.Entry<String, Timer> timerEntry : registry.getTimers().entrySet()) {
+ String metricName = timerEntry.getKey();
+ Timer timer = timerEntry.getValue();
+ // each count should be 1
+ assertEquals("Count is wrong for " + metricName, 1, timer.getCount());
+ }
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:foo").routeId("foo").to("mock:foo");
+
+ from("direct:bar").routeId("bar").to("mock:bar");
+
+ from("seda:multicast").routeId("multicast").multicast().to("direct:foo").to("direct:bar").end().to("mock:end");
+
+ }
+ };
+ }
+}