svn commit: r811997 - in /camel/trunk/components/camel-spring/src/test: java/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.java resources/org/apache/camel/spring/issues/SpringC
Author: davsclaus
Date: Mon Sep 7 05:10:34 2009
New Revision: 811997
URL: http://svn.apache.org/viewvc?rev=811997&view=rev
Log:
Added unit test based on user forum issue
Added:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.java
- copied, changed from r811825,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.xml
(contents, props changed)
- copied, changed from r811825,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml
Copied:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.java
(from r811825,
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java&r1=811825&r2=811997&rev=811997&view=diff
==
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.java
Mon Sep 7 05:10:34 2009
@@ -16,17 +16,55 @@
*/
package org.apache.camel.spring.issues;
-import org.apache.camel.CamelContext;
-import org.apache.camel.issues.CharlesSplitAndTryCatchRollbackIssueTest;
-import static
org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringTestSupport;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version $Revision$
*/
-public class SpringCharlesSplitAndTryCatchRollbackIssueTest extends
CharlesSplitAndTryCatchRollbackIssueTest {
+public class SpringChristianDLCLoseMessageIssueTest extends SpringTestSupport {
-protected CamelContext createCamelContext() throws Exception {
-return createSpringCamelContext(this,
"org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml");
+protected AbstractXmlApplicationContext createApplicationContext() {
+return new
ClassPathXmlApplicationContext("org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.xml");
}
-}
+public void testDLCThrowException() throws Exception {
+MockEndpoint result = getMockEndpoint("mock:result");
+result.expectedMessageCount(2);
+
+MockEndpoint error = getMockEndpoint("mock:error");
+error.expectedMessageCount(2);
+
+// should newer get a message as DLC handles it
+MockEndpoint kaboom = getMockEndpoint("mock:kaboom");
+kaboom.expectedMessageCount(0);
+
+template.sendBody("direct:start", "Hello World");
+template.sendBody("direct:start", "Kaboom");
+
+template.sendBody("direct:start", "Hello World");
+template.sendBody("direct:start", "Kaboom");
+
+assertMockEndpointsSatisfied();
+}
+
+public void testDLCQueueFull() throws Exception {
+MockEndpoint result = getMockEndpoint("mock:result");
+result.expectedMessageCount(2);
+
+// should get 1 message when seda:bye is full
+MockEndpoint error = getMockEndpoint("mock:error");
+error.expectedMessageCount(1);
+
+template.sendBody("direct:start", "Hello World");
+template.sendBody("direct:start", "Bye World");
+
+template.sendBody("direct:start", "Hello World");
+template.sendBody("direct:start", "Bye World");
+
+assertMockEndpointsSatisfied();
+}
+
+}
\ No newline at end of file
Copied:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.xml
(from r811825,
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringCharlesSplitAndTryCatchRollbackIssueTest.xml)
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/issues/SpringChristianDLCLoseMessageIssueTest.xml?p2=camel/trunk/components/camel-spring/src/test/resource
svn commit: r811980 - in /camel/trunk/components: camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyAsyncWithThreadsTest.java camel-jms/src/test/java/org/apache/camel/component/jms/JmsBi
Author: ningjiang
Date: Mon Sep 7 03:21:24 2009
New Revision: 811980
URL: http://svn.apache.org/viewvc?rev=811980&view=rev
Log:
Fixed the CS and typo errors
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyAsyncWithThreadsTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
Modified:
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyAsyncWithThreadsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyAsyncWithThreadsTest.java?rev=811980&r1=811979&r2=811980&view=diff
==
---
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyAsyncWithThreadsTest.java
(original)
+++
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyAsyncWithThreadsTest.java
Mon Sep 7 03:21:24 2009
@@ -31,7 +31,7 @@
public class JettyAsyncWithThreadsTest extends CamelTestSupport {
private static final String ENDPOINT_NAME =
"http://localhost:9876/asyncRouteTest";;
- private static String route = "";
+private static String route = "";
@Before
public void setUp() throws Exception {
@@ -119,14 +119,14 @@
.transform(body().append(" World"))
// now turn the route into async from this point
forward
// the caller will have a Future
returned as response in OUT
-// to be used to grap the async response when he
fell like it
+// to be used to grab the async response when he
fell like it
// we do not want to wait for tasks to be complete
so we instruct Camel
// to not wait, and therefore Camel returns the
Future handle we
// can use to get the result when we want
.threads().waitForTaskToComplete(WaitForTaskToComplete.Never)
// from this point forward this is the async route
doing its work
// so we do a bit of delay to simulate heavy work
that takes time
- .to("mock:foo")
+.to("mock:foo")
.delay(100)
// and we also work with the message so we can
prepare a response
.process(new MyProcessor())
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java?rev=811980&r1=811979&r2=811980&view=diff
==
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBindingTest.java
Mon Sep 7 03:21:24 2009
@@ -16,11 +16,11 @@
*/
package org.apache.camel.component.jms;
-import static org.junit.Assert.assertNull;
-
import org.apache.activemq.command.ActiveMQBlobMessage;
import org.junit.Test;
+import static org.junit.Assert.assertNull;
+
/**
* @version $Revision$
*/
svn commit: r811972 - /camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Author: wtam
Date: Mon Sep 7 01:50:35 2009
New Revision: 811972
URL: http://svn.apache.org/viewvc?rev=811972&view=rev
Log:
Add SNIPPET tags
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=811972&r1=811971&r2=811972&view=diff
==
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Mon Sep 7 01:50:35 2009
@@ -582,10 +582,9 @@
.equals(hdrToTest.get(1).getHdrAttribute()));
}
-// START SNIPPET: InsertRequestOutHeaderProcessor
+// START SNIPPET: SOAPHeaderProcessors
public static class InsertRequestOutHeaderProcessor implements Processor {
-
public void process(Exchange exchange) throws Exception {
CxfMessage message = exchange.getIn().getBody(CxfMessage.class);
Message cxf = message.getMessage();
@@ -605,16 +604,9 @@
soapHeaders.add(newHeader);
}
-
}
-// END SNIPPET: InsertRequestOutHeaderProcessor
-
-
-// START SNIPPET: InsertResponseOutHeaderProcessor
-
public static class InsertResponseOutHeaderProcessor implements Processor {
-
public void process(Exchange exchange) throws Exception {
CxfMessage message = exchange.getIn().getBody(CxfMessage.class);
Map responseContext =
(Map)message.getMessage().get(Client.RESPONSE_CONTEXT);
@@ -634,7 +626,6 @@
}
}
-
-// END SNIPPET: InsertResponseOutHeaderProcessor
+// END SNIPPET: SOAPHeaderProcessors
}
svn commit: r811969 - /camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Author: wtam Date: Mon Sep 7 01:43:29 2009 New Revision: 811969 URL: http://svn.apache.org/viewvc?rev=811969&view=rev Log: Add SNIPPET tags Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Modified: camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=811969&r1=811968&r2=811969&view=diff == --- camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java (original) +++ camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java Mon Sep 7 01:43:29 2009 @@ -608,7 +608,7 @@ } -// END SNIPPET: InsertResponseOutHeaderProcessor +// END SNIPPET: InsertRequestOutHeaderProcessor // START SNIPPET: InsertResponseOutHeaderProcessor
svn commit: r811968 - /camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Author: wtam
Date: Mon Sep 7 01:40:34 2009
New Revision: 811968
URL: http://svn.apache.org/viewvc?rev=811968&view=rev
Log:
Add SNIPPET tags
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Modified:
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=811968&r1=811967&r2=811968&view=diff
==
---
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/branches/camel-1.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Mon Sep 7 01:40:34 2009
@@ -581,6 +581,8 @@
+ hdrToTest.get(1).getHdrAttribute(), "testHdrAttribute"
.equals(hdrToTest.get(1).getHdrAttribute()));
}
+
+// START SNIPPET: InsertRequestOutHeaderProcessor
public static class InsertRequestOutHeaderProcessor implements Processor {
@@ -606,6 +608,11 @@
}
+// END SNIPPET: InsertResponseOutHeaderProcessor
+
+
+// START SNIPPET: InsertResponseOutHeaderProcessor
+
public static class InsertResponseOutHeaderProcessor implements Processor {
public void process(Exchange exchange) throws Exception {
@@ -627,4 +634,7 @@
}
}
+
+// END SNIPPET: InsertResponseOutHeaderProcessor
+
}
svn commit: r811967 - in /camel/trunk/components/camel-cxf/src/test: java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java resources/org/apache/camel/component/cxf/soap/head
Author: wtam
Date: Mon Sep 7 01:39:30 2009
New Revision: 811967
URL: http://svn.apache.org/viewvc?rev=811967&view=rev
Log:
add SNIPPET tags
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=811967&r1=811966&r2=811967&view=diff
==
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Mon Sep 7 01:39:30 2009
@@ -634,6 +634,8 @@
}
+// START SNIPPET: InsertResponseOutHeaderProcessor
+
public static class InsertResponseOutHeaderProcessor implements Processor {
public void process(Exchange exchange) throws Exception {
@@ -652,6 +654,10 @@
soapHeaders.add(newHeader);
}
+
}
+
+// END SNIPPET: InsertResponseOutHeaderProcessor
+
}
Modified:
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml?rev=811967&r1=811966&r2=811967&view=diff
==
---
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
(original)
+++
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
Mon Sep 7 01:39:30 2009
@@ -138,12 +138,14 @@
+
-
+
+
svn commit: r811839 - in /camel/trunk/components/camel-cxf/src/test: java/org/apache/camel/component/cxf/soap/headers/ resources/ resources/org/apache/camel/component/cxf/soap/headers/
Author: wtam
Date: Sun Sep 6 17:16:23 2009
New Revision: 811839
URL: http://svn.apache.org/viewvc?rev=811839&view=rev
Log:
[CAMEL-1983] port unit test from 1.x
Added:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterWithInsertionImpl.java
(with props)
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/HeaderTesterImpl.java
camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest-context.xml
camel/trunk/components/camel-cxf/src/test/resources/soap_header.wsdl
Modified:
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java?rev=811839&r1=811838&r2=811839&view=diff
==
---
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
(original)
+++
camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/soap/headers/CxfMessageHeadersRelayTest.java
Sun Sep 6 17:16:23 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.cxf.soap.headers;
+import java.io.StringReader;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
@@ -37,6 +38,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.cxf.CxfConstants;
import org.apache.camel.component.cxf.CxfEndpoint;
@@ -46,7 +48,9 @@
import org.apache.cxf.binding.soap.SoapHeader;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.headers.Header;
+import org.apache.cxf.headers.Header.Direction;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.jaxb.JAXBDataBinding;
import org.apache.cxf.message.MessageContentsList;
import org.apache.cxf.outofband.header.OutofBandHeader;
@@ -78,13 +82,17 @@
private Endpoint relayEndpoint;
private Endpoint noRelayEndpoint;
-
+private Endpoint relayEndpointWithInsertion;
+
@Before
public void setUp() throws Exception {
template = context.createProducerTemplate();
relayEndpoint =
Endpoint.publish("http://localhost:9091/HeaderService/";, new
HeaderTesterImpl());
noRelayEndpoint =
Endpoint.publish("http://localhost:7070/HeaderService/";, new
HeaderTesterImpl(false));
+relayEndpointWithInsertion =
Endpoint.publish("http://localhost:5091/HeaderService/";,
+ new
HeaderTesterWithInsertionImpl());
+
}
@After
@@ -99,6 +107,11 @@
noRelayEndpoint.stop();
noRelayEndpoint = null;
}
+
+if (relayEndpointWithInsertion != null) {
+relayEndpointWithInsertion.stop();
+relayEndpointWithInsertion = null;
+}
}
protected static void addOutOfBoundHeader(HeaderTester proxy, boolean
invalid) throws JAXBException {
@@ -190,6 +203,32 @@
response.getFirstName().equals("pass"));
validateReturnedOutOfBandHeader(proxy);
}
+
+
+@Test
+public void testInoutOutOfBandHeaderCXFClientRelayWithHeaderInsertion()
throws Exception {
+HeaderService s = new
HeaderService(getClass().getClassLoader().getResource("soap_header.wsdl"),
+HeaderService.SERVICE);
+HeaderTester proxy = s.getSoapPortRelayWithInsertion();
+addOutOfBoundHeader(proxy, false);
+Me me = new Me();
+me.setFirstName("john");
+me.setLastName("Doh");
+Me response = proxy.inoutOutOfBandHeader(me);
+assertTrue("Expected the out of band header to propagate but it
didn't",
+ response.getFirstName().equals("pass"));
+
+InvocationHandler handler = Proxy.getInvocationHandler(proxy);
+BindingProvider bp = null;
+if (!(handler instanceof BindingProvider)) {
+fail("Unable to cast dynamic proxy InocationHandler to
BindingProvider type");
+}
+
+bp = (BindingProvider)handler;
+Map responseContext = bp.getResponseContext();
+validateReturnedOutOfBandHeaderWithInsertion(responseContext, true);
+}
+
@Test
public void testOutOutOfBandHeaderCXFClientRelay() throws Exception {
@@ -517,4 +556,102 @@
headers.a
