You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/11/05 01:09:49 UTC
svn commit: r1405680 - in /camel/branches/camel-2.9.x: ./
camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
Author: bvahdat
Date: Mon Nov 5 00:09:48 2012
New Revision: 1405680
URL: http://svn.apache.org/viewvc?rev=1405680&view=rev
Log:
Merged revisions 1405679 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................
r1405679 | bvahdat | 2012-11-05 01:03:17 +0100 (Mo, 05 Nov 2012) | 9 lines
Merged revisions 1405678 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1405678 | bvahdat | 2012-11-05 01:00:07 +0100 (Mo, 05 Nov 2012) | 1 line
Fixed the failed test on the CI-Server (Enricher EIP should store TO_ENDPOINT as property like the others do).
........
................
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1405678
Merged /camel/branches/camel-2.10.x:r1405679
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java?rev=1405680&r1=1405679&r2=1405680&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java (original)
+++ camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/enricher/EnricherTest.java Mon Nov 5 00:09:48 2012
@@ -35,18 +35,13 @@ public class EnricherTest extends Contex
mock = getMockEndpoint("mock:mock");
}
- @Override
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
// -------------------------------------------------------------
// InOnly routes
// -------------------------------------------------------------
public void testEnrichInOnly() throws InterruptedException {
mock.expectedBodiesReceived("test:blah");
- mock.expectedHeaderReceived(Exchange.TO_ENDPOINT, "direct://enricher-constant-resource");
+ mock.message(0).property(Exchange.TO_ENDPOINT).isEqualTo("mock://mock");
template.sendBody("direct:enricher-test-1", "test");
mock.assertIsSatisfied();
}
@@ -62,7 +57,7 @@ public class EnricherTest extends Contex
assertEquals("test", exchange.getIn().getBody());
assertTrue(exchange.getOut() != null && exchange.getOut().isFault());
assertEquals("failed", exchange.getOut().getBody());
- assertEquals("direct://enricher-fault-resource", exchange.getOut().getHeader(Exchange.TO_ENDPOINT));
+ assertEquals("direct://enricher-fault-resource", exchange.getProperty(Exchange.TO_ENDPOINT));
assertNull(exchange.getException());
}