Author: davsclaus
Date: Mon Feb 4 14:34:04 2013
New Revision: 1442137
URL: http://svn.apache.org/viewvc?rev=1442137&view=rev
Log:
Fixed test
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1442098
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java?rev=1442137&r1=1442136&r2=1442137&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/cxfbean/CxfBeanTest.java
Mon Feb 4 14:34:04 2013
@@ -88,10 +88,12 @@ public class CxfBeanTest extends Abstrac
public void testMessageHeadersAfterCxfBeanEndpoint() throws Exception {
MockEndpoint endpoint =
(MockEndpoint)camelContext.getEndpoint("mock:endpointA");
endpoint.reset();
- invokeRsService("http://localhost:"; + PORT1 +
"/customerservice/customers/123",
- "{\"Customer\":{\"id\":123,\"name\":\"John\"}}");
endpoint.expectedMessageCount(1);
endpoint.expectedHeaderReceived("key", "customer");
+
+ invokeRsService("http://localhost:"; + PORT1 +
"/customerservice/customers/123",
+ "{\"Customer\":{\"id\":123,\"name\":\"John\"}}");
+
endpoint.assertIsSatisfied();
}
Modified:
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml?rev=1442137&r1=1442136&r2=1442137&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
(original)
+++
camel/branches/camel-2.10.x/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/cxfbean/CxfBeanTest-context.xml
Mon Feb 4 14:34:04 2013
@@ -52,18 +52,7 @@
xmlns:person="http://camel.apache.org/wsdl-first";>
</cxf:cxfEndpoint>
- <!-- setup our error handler as the deal letter channel -->
- <bean id="errorHandler"
class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <property name="deadLetterUri" value="mock:error"/>
- <property name="redeliveryPolicy" ref="myRedeliveryPolicy"/>
- </bean>
-
- <bean id="myRedeliveryPolicy"
class="org.apache.camel.processor.RedeliveryPolicy">
- <property name="maximumRedeliveries" value="5"/>
- <property name="redeliveryDelay" value="0"/>
- </bean>
-
- <camelContext errorHandlerRef="errorHandler" id="camel"
xmlns="http://camel.apache.org/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
<endpoint id="ep1"
uri="jetty:http://localhost:${CxfBeanTest.1}/?matchOnUriPrefix=true"/>
<endpoint id="ep2"
uri="jetty:http://localhost:${CxfBeanTest.2}/?matchOnUriPrefix=true"/>
