camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1296789 - in /camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring: SpringMDCTest.java SpringMDCWithBreadcrumbDisabledTest.java SpringMDCWithBreadcrumbTest.java interceptor/TransactionalClientDataSourceMDCTest.java
Date Sun, 04 Mar 2012 12:48:33 GMT
Author: davsclaus
Date: Sun Mar  4 12:48:32 2012
New Revision: 1296789

URL: http://svn.apache.org/viewvc?rev=1296789&view=rev
Log:
CAMEL-5047: MDC logging keys has been prefixed with camel. Adjusted tests.

Modified:
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
    camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java?rev=1296789&r1=1296788&r2=1296789&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCTest.java
Sun Mar  4 12:48:32 2012
@@ -55,16 +55,16 @@ public class SpringMDCTest extends Sprin
     public static class ProcessorA implements Processor {
 
         public void process(Exchange exchange) throws Exception {
-            assertEquals("route-a", MDC.get("routeId"));
-            assertEquals(exchange.getExchangeId(), MDC.get("exchangeId"));
+            assertEquals("route-a", MDC.get("camel.routeId"));
+            assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
         }
     }
 
     public static class ProcessorB implements Processor {
 
         public void process(Exchange exchange) throws Exception {
-            assertEquals("route-b", MDC.get("routeId"));
-            assertEquals(exchange.getExchangeId(), MDC.get("exchangeId"));
+            assertEquals("route-b", MDC.get("camel.routeId"));
+            assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
         }
     }
 

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java?rev=1296789&r1=1296788&r2=1296789&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbDisabledTest.java
Sun Mar  4 12:48:32 2012
@@ -35,16 +35,16 @@ public class SpringMDCWithBreadcrumbDisa
     public static class ProcessorA implements Processor {
 
         public void process(Exchange exchange) throws Exception {
-            assertEquals("route-a", MDC.get("routeId"));
-            assertNull("Should not have breadcrumb", exchange.getIn().getHeader("breadcrumbId"));
+            assertEquals("route-a", MDC.get("camel.routeId"));
+            assertNull("Should not have breadcrumb", exchange.getIn().getHeader("camel.breadcrumbId"));
         }
     }
 
     public static class ProcessorB implements Processor {
 
         public void process(Exchange exchange) throws Exception {
-            assertEquals("route-b", MDC.get("routeId"));
-            assertNull("Should not have breadcrumb", exchange.getIn().getHeader("breadcrumbId"));
+            assertEquals("route-b", MDC.get("camel.routeId"));
+            assertNull("Should not have breadcrumb", exchange.getIn().getHeader("camel.breadcrumbId"));
         }
     }
 

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java?rev=1296789&r1=1296788&r2=1296789&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringMDCWithBreadcrumbTest.java
Sun Mar  4 12:48:32 2012
@@ -35,17 +35,17 @@ public class SpringMDCWithBreadcrumbTest
     public static class ProcessorA implements Processor {
 
         public void process(Exchange exchange) throws Exception {
-            assertEquals("route-a", MDC.get("routeId"));
-            assertEquals(exchange.getExchangeId(), MDC.get("exchangeId"));
-            assertEquals(exchange.getIn().getMessageId(), MDC.get("breadcrumbId"));
+            assertEquals("route-a", MDC.get("camel.routeId"));
+            assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+            assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.breadcrumbId"));
         }
     }
 
     public static class ProcessorB implements Processor {
 
         public void process(Exchange exchange) throws Exception {
-            assertEquals("route-b", MDC.get("routeId"));
-            assertEquals(exchange.getIn().getMessageId(), MDC.get("breadcrumbId"));
+            assertEquals("route-b", MDC.get("camel.routeId"));
+            assertEquals(exchange.getIn().getMessageId(), MDC.get("camel.breadcrumbId"));
         }
     }
 

Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java?rev=1296789&r1=1296788&r2=1296789&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
(original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceMDCTest.java
Sun Mar  4 12:48:32 2012
@@ -36,9 +36,9 @@ public class TransactionalClientDataSour
                     .transacted()
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
-                                assertEquals("route-a", MDC.get("routeId"));
-                                assertEquals(exchange.getExchangeId(), MDC.get("exchangeId"));
-                                assertNotNull(MDC.get("transactionKey"));
+                                assertEquals("route-a", MDC.get("camel.routeId"));
+                                assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+                                assertNotNull(MDC.get("camel.transactionKey"));
                             }
                         })
                     .to("log:foo")
@@ -51,9 +51,9 @@ public class TransactionalClientDataSour
                     .transacted()
                         .process(new Processor() {
                             public void process(Exchange exchange) throws Exception {
-                                assertEquals("route-b", MDC.get("routeId"));
-                                assertEquals(exchange.getExchangeId(), MDC.get("exchangeId"));
-                                assertNotNull(MDC.get("transactionKey"));
+                                assertEquals("route-b", MDC.get("camel.routeId"));
+                                assertEquals(exchange.getExchangeId(), MDC.get("camel.exchangeId"));
+                                assertNotNull(MDC.get("camel.transactionKey"));
                             }
                         })
                     .to("log:foo2")



Mime
View raw message