You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/08/04 22:19:47 UTC

git commit: added unit test based on user forum reported issue

Updated Branches:
  refs/heads/master 8be1574bf -> 8fbf00d07


added unit test based on user forum reported issue


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fbf00d0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fbf00d0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fbf00d0

Branch: refs/heads/master
Commit: 8fbf00d07ec7436ce85184ae480e4bbff1b381a8
Parents: 8be1574
Author: cmueller <cm...@apache.org>
Authored: Sun Aug 4 22:19:20 2013 +0200
Committer: cmueller <cm...@apache.org>
Committed: Sun Aug 4 22:19:20 2013 +0200

----------------------------------------------------------------------
 .../src/test/java/org/apache/camel/processor/MDCTest.java   | 9 +++++++--
 .../java/org/apache/camel/processor/MDCWireTapTest.java     | 7 ++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8fbf00d0/camel-core/src/test/java/org/apache/camel/processor/MDCTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/MDCTest.java b/camel-core/src/test/java/org/apache/camel/processor/MDCTest.java
index df3e3d4..9b75a65 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/MDCTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/MDCTest.java
@@ -61,9 +61,12 @@ public class MDCTest extends ContextTestSupport {
                                 assertEquals("route-a", MDC.get("camel.routeId"));
                                 assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
                                 assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+
+                                MDC.put("custom.id", "1");
                             }
                         })
-                        .to("log:foo").to("direct:b");
+                        .to("log:foo")
+                        .to("direct:b");
 
                 from("direct:b").routeId("route-b")
                         .process(new Processor() {
@@ -71,9 +74,11 @@ public class MDCTest extends ContextTestSupport {
                                 assertEquals("route-b", MDC.get("camel.routeId"));
                                 assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
                                 assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.messageId"));
+                                assertEquals("1", MDC.get("custom.id"));
                             }
                         })
-                        .to("log:bar").to("mock:result");
+                        .to("log:bar")
+                        .to("mock:result");
             }
         };
     }

http://git-wip-us.apache.org/repos/asf/camel/blob/8fbf00d0/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java b/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
index 753c9f2..1de6c74 100644
--- a/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
+++ b/camel-core/src/test/java/org/apache/camel/processor/MDCWireTapTest.java
@@ -49,6 +49,8 @@ public class MDCWireTapTest extends ContextTestSupport {
                         public void process(Exchange exchange) throws Exception {
                             assertEquals("route-a", MDC.get("camel.routeId"));
                             assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+
+                            MDC.put("custom.id", "1");
                         }
                     })
                     .to("log:before-wiretap")
@@ -58,6 +60,7 @@ public class MDCWireTapTest extends ContextTestSupport {
                             public void process(Exchange exchange) throws Exception {
                                 assertEquals("route-a", MDC.get("camel.routeId"));
                                 assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+                                assertEquals("1", MDC.get("custom.id"));
                             }
                         })
                     .to("log:a-done")
@@ -68,9 +71,11 @@ public class MDCWireTapTest extends ContextTestSupport {
                             public void process(Exchange exchange) throws Exception {
                                 assertEquals("route-b", MDC.get("camel.routeId"));
                                 assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+                                assertEquals("1", MDC.get("custom.id"));
                             }
                         })
-                    .to("log:b-done").to("mock:b");
+                    .to("log:b-done")
+                    .to("mock:b");
             }
         };
     }