You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/06/12 14:29:39 UTC
svn commit: r1134920 [2/2] -
/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaTransferExchangeOptionTest.java Sun Jun 12 12:29:37 2011
@@ -26,7 +26,6 @@ import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
@@ -34,9 +33,7 @@ import org.junit.Test;
*
* @version
*/
-public class MinaTransferExchangeOptionTest extends CamelTestSupport {
-
- protected String uri = "mina:tcp://localhost:6321?sync=true&encoding=UTF-8&transferExchange=true";
+public class MinaTransferExchangeOptionTest extends BaseMinaTest {
@Test
public void testMinaTransferExchangeOptionWithoutException() throws Exception {
@@ -51,7 +48,7 @@ public class MinaTransferExchangeOptionT
}
private Exchange sendExchange(boolean setException) throws Exception {
- Endpoint endpoint = context.getEndpoint(uri);
+ Endpoint endpoint = context.getEndpoint("mina:tcp://localhost:{{port}}?sync=true&encoding=UTF-8&transferExchange=true");
Exchange exchange = endpoint.createExchange();
Message message = exchange.getIn();
@@ -97,7 +94,7 @@ public class MinaTransferExchangeOptionT
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(uri).process(new Processor() {
+ from("mina:tcp://localhost:{{port}}?sync=true&encoding=UTF-8&transferExchange=true").process(new Processor() {
public void process(Exchange e) throws InterruptedException {
Assert.assertNotNull(e.getIn().getBody());
Assert.assertNotNull(e.getIn().getHeaders());
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpTest.java Sun Jun 12 12:29:37 2011
@@ -22,15 +22,13 @@ import java.net.InetAddress;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class MinaUdpTest extends CamelTestSupport {
+public class MinaUdpTest extends BaseMinaTest {
protected int messageCount = 3;
- protected int port = 4445;
@Test
public void testMinaRoute() throws Exception {
@@ -50,7 +48,7 @@ public class MinaUdpTest extends CamelTe
String text = "Hello Message: " + i;
byte[] data = text.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, port);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, getPort());
socket.send(packet);
Thread.sleep(100);
}
@@ -62,9 +60,11 @@ public class MinaUdpTest extends CamelTe
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("mina:udp://127.0.0.1:" + port + "?sync=false").to("mina:udp://127.0.0.1:9000?sync=false");
+ int port2 = getNextPort();
- from("mina:udp://127.0.0.1:9000?sync=false").to("mock:result");
+ from("mina:udp://127.0.0.1:{{port}}?sync=false").to("mina:udp://127.0.0.1:" + port2 + "?sync=false");
+
+ from("mina:udp://127.0.0.1:" + port2 + "?sync=false").to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpUsingTemplateTest.java Sun Jun 12 12:29:37 2011
@@ -21,13 +21,12 @@ import java.util.List;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class MinaUdpUsingTemplateTest extends CamelTestSupport {
+public class MinaUdpUsingTemplateTest extends BaseMinaTest {
private int messageCount = 3;
@@ -46,7 +45,7 @@ public class MinaUdpUsingTemplateTest ex
protected void sendUdpMessages() throws Exception {
for (int i = 0; i < messageCount; i++) {
- template.sendBody("mina:udp://127.0.0.1:4445?sync=false", "Hello Message: " + i);
+ template.sendBody("mina:udp://127.0.0.1:{{port}}?sync=false", "Hello Message: " + i);
}
}
@@ -56,7 +55,7 @@ public class MinaUdpUsingTemplateTest ex
endpoint.expectedMessageCount(1);
byte[] in = "Hello from bytes".getBytes();
- template.sendBody("mina:udp://127.0.0.1:4445?sync=false", in);
+ template.sendBody("mina:udp://127.0.0.1:{{port}}?sync=false", in);
// sleeping for while to let the mock endpoint get all the message
Thread.sleep(2000);
@@ -73,7 +72,7 @@ public class MinaUdpUsingTemplateTest ex
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("mina:udp://127.0.0.1:4445?sync=false&minaLogger=true").to("mock:result");
+ from("mina:udp://127.0.0.1:{{port}}?sync=false&minaLogger=true").to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaUdpWithInOutUsingPlainSocketTest.java Sun Jun 12 12:29:37 2011
@@ -23,7 +23,6 @@ import java.net.InetAddress;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -31,10 +30,9 @@ import org.slf4j.LoggerFactory;
/**
* To test InOut exchange for the UDP protocol.
*/
-public class MinaUdpWithInOutUsingPlainSocketTest extends CamelTestSupport {
+public class MinaUdpWithInOutUsingPlainSocketTest extends BaseMinaTest {
private static final transient Logger LOG = LoggerFactory.getLogger(MinaUdpWithInOutUsingPlainSocketTest.class);
- private static final int PORT = 4445;
@Test
public void testSendAndReceiveOnce() throws Exception {
@@ -49,15 +47,15 @@ public class MinaUdpWithInOutUsingPlainS
byte[] data = input.getBytes();
- DatagramPacket packet = new DatagramPacket(data, data.length, address, PORT);
+ DatagramPacket packet = new DatagramPacket(data, data.length, address, getPort());
LOG.debug("+++ Sending data +++");
socket.send(packet);
Thread.sleep(1000);
byte[] buf = new byte[128];
- DatagramPacket receive = new DatagramPacket(buf, buf.length, address, PORT);
- LOG.debug("+++ Receving data +++");
+ DatagramPacket receive = new DatagramPacket(buf, buf.length, address, getPort());
+ LOG.debug("+++ Receiveing data +++");
socket.receive(receive);
socket.close();
@@ -68,7 +66,7 @@ public class MinaUdpWithInOutUsingPlainS
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("mina:udp://127.0.0.1:" + PORT + "?sync=true").process(new Processor() {
+ from("mina:udp://127.0.0.1:{{port}}?sync=true").process(new Processor() {
public void process(Exchange exchange) throws Exception {
String s = exchange.getIn().getBody(String.class);
exchange.getOut().setBody("Hello " + s);
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMCustomCodecTest.java Sun Jun 12 12:29:37 2011
@@ -16,16 +16,116 @@
*/
package org.apache.camel.component.mina;
+import org.apache.camel.ResolveEndpointFailedException;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.mina.common.ByteBuffer;
+import org.apache.mina.common.IoSession;
+import org.apache.mina.filter.codec.CumulativeProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolCodecFactory;
+import org.apache.mina.filter.codec.ProtocolDecoder;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.ProtocolEncoder;
+import org.apache.mina.filter.codec.ProtocolEncoderOutput;
+import org.junit.Test;
+
/**
* Unit test with custom codec using the VM protocol.
*/
-public class MinaVMCustomCodecTest extends MinaCustomCodecTest {
+public class MinaVMCustomCodecTest extends BaseMinaTest {
+
+ @Test
+ public void testMyCodec() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.expectedBodiesReceived("Bye World");
+
+ Object out = template.requestBody("mina:vm://localhost:{{port}}?sync=true&codec=#myCodec", "Hello World");
+ assertEquals("Bye World", out);
+
+ mock.assertIsSatisfied();
+ }
+
+ @Test
+ public void testTCPEncodeUTF8InputIsString() throws Exception {
+ final String myUri = "mina:vm://localhost:" + getNextPort() + "?encoding=UTF-8&sync=false";
+ context.addRoutes(new RouteBuilder() {
+ public void configure() {
+ from(myUri).to("mock:result");
+ }
+ });
+
+ MockEndpoint endpoint = getMockEndpoint("mock:result");
+
+ // include a UTF-8 char in the text \u0E08 is a Thai elephant
+ String body = "Hello Thai Elephant \u0E08";
+
+ endpoint.expectedMessageCount(1);
+ endpoint.expectedBodiesReceived(body);
+
+ template.sendBody(myUri, body);
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testBadConfiguration() throws Exception {
+ try {
+ template.sendBody("mina:vm://localhost:{{port}}?sync=true&codec=#XXX", "Hello World");
+ fail("Should have thrown a ResolveEndpointFailedException");
+ } catch (ResolveEndpointFailedException e) {
+ // ok
+ }
+ }
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+ jndi.bind("myCodec", new MyCodec());
+ return jndi;
+ }
+
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("mina:vm://localhost:{{port}}?sync=true&codec=#myCodec").transform(constant("Bye World")).to("mock:result");
+ }
+ };
+ }
+
+ private class MyCodec implements ProtocolCodecFactory {
+
+ public ProtocolEncoder getEncoder() throws Exception {
+ return new ProtocolEncoder() {
+ public void encode(IoSession ioSession, Object message, ProtocolEncoderOutput out)
+ throws Exception {
+ ByteBuffer bb = ByteBuffer.allocate(32).setAutoExpand(true);
+ String s = (String) message;
+ bb.put(s.getBytes("US-ASCII"));
+ bb.flip();
+ out.write(bb);
+ }
+
+ public void dispose(IoSession ioSession) throws Exception {
+ // do nothing
+ }
+ };
+
+ }
- @Override
- public void setUp() throws Exception {
- uri = "mina:vm://localhost:11301?sync=true&codec=#myCodec";
- badUri = "mina:vm://localhost:11301?sync=true&codec=#XXX";
- super.setUp();
+ public ProtocolDecoder getDecoder() throws Exception {
+ return new CumulativeProtocolDecoder() {
+ protected boolean doDecode(IoSession session, ByteBuffer in, ProtocolDecoderOutput out) throws Exception {
+ if (in.remaining() > 0) {
+ byte[] buf = new byte[in.remaining()];
+ in.get(buf);
+ out.write(new String(buf, "US-ASCII"));
+ return true;
+ } else {
+ return false;
+ }
+ }
+ };
+ }
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMFileTcpTest.java Sun Jun 12 12:29:37 2011
@@ -18,13 +18,12 @@ package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class MinaVMFileTcpTest extends CamelTestSupport {
+public class MinaVMFileTcpTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -39,11 +38,11 @@ public class MinaVMFileTcpTest extends C
return new RouteBuilder() {
public void configure() {
// lets setup a server
- from("mina:vm://localhost:9123?sync=false&textline=true")
+ from("mina:vm://localhost:{{port}}?sync=false&textline=true")
.to("mock:results");
from("file:src/test/data?noop=true&fileName=message1.txt").
- to("mina:vm://localhost:9123?sync=false&textline=true");
+ to("mina:vm://localhost:{{port}}?sync=false&textline=true");
}
};
}
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTextlineProtocolTest.java Sun Jun 12 12:29:37 2011
@@ -16,14 +16,33 @@
*/
package org.apache.camel.component.mina;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Test;
+
/**
* @version
*/
-public class MinaVMTextlineProtocolTest extends MinaVmTest {
+public class MinaVMTextlineProtocolTest extends BaseMinaTest {
+
+ @Test
+ public void testMinaRoute() throws Exception {
+ MockEndpoint endpoint = getMockEndpoint("mock:result");
+ Object body = "Hello there!";
+ endpoint.expectedBodiesReceived(body);
+
+ template.sendBodyAndHeader("mina:vm://localhost:{{port}}?textline=true&sync=false", body, "cheese", 123);
- @Override
- public void setUp() throws Exception {
- uri = "mina:vm://localhost:6124?textline=true&sync=false";
- super.setUp();
+ assertMockEndpointsSatisfied();
}
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("mina:vm://localhost:{{port}}?textline=true&sync=false")
+ .to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
+ }
+ };
+ }
+
}
\ No newline at end of file
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVMTransferExchangeOptionTest.java Sun Jun 12 12:29:37 2011
@@ -16,17 +16,109 @@
*/
package org.apache.camel.component.mina;
+import java.nio.charset.Charset;
+
+import junit.framework.Assert;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Test;
+
/**
* Unit test for the <tt>transferExchange=true</tt> option.
*
* @version
*/
-public class MinaVMTransferExchangeOptionTest extends MinaTransferExchangeOptionTest {
+public class MinaVMTransferExchangeOptionTest extends BaseMinaTest {
+
+ @Test
+ public void testMinaTransferExchangeOptionWithoutException() throws Exception {
+ Exchange exchange = sendExchange(false);
+ assertExchange(exchange, false);
+ }
+
+ @Test
+ public void testMinaTransferExchangeOptionWithException() throws Exception {
+ Exchange exchange = sendExchange(true);
+ assertExchange(exchange, true);
+ }
+
+ private Exchange sendExchange(boolean setException) throws Exception {
+ Endpoint endpoint = context.getEndpoint("mina:vm://localhost:{{port}}?sync=true&encoding=UTF-8&transferExchange=true");
+ Exchange exchange = endpoint.createExchange();
+
+ Message message = exchange.getIn();
+ message.setBody("Hello!");
+ message.setHeader("cheese", "feta");
+ exchange.setProperty("ham", "old");
+ exchange.setProperty("setException", setException);
+
+ Producer producer = endpoint.createProducer();
+ producer.start();
+ producer.process(exchange);
+
+ return exchange;
+ }
+
+ private void assertExchange(Exchange exchange, boolean hasFault) {
+ if (!hasFault) {
+ Message out = exchange.getOut();
+ assertNotNull(out);
+ assertFalse(out.isFault());
+ assertEquals("Goodbye!", out.getBody());
+ assertEquals("cheddar", out.getHeader("cheese"));
+ } else {
+ Message fault = exchange.getOut();
+ assertNotNull(fault);
+ assertTrue(fault.isFault());
+ assertNotNull(fault.getBody());
+ assertTrue("Should get the InterrupteException exception", fault.getBody() instanceof InterruptedException);
+ assertEquals("nihao", fault.getHeader("hello"));
+ }
+
+
+ // in should stay the same
+ Message in = exchange.getIn();
+ assertNotNull(in);
+ assertEquals("Hello!", in.getBody());
+ assertEquals("feta", in.getHeader("cheese"));
+ // however the shared properties have changed
+ assertEquals("fresh", exchange.getProperty("salami"));
+ assertNull(exchange.getProperty("Charset"));
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("mina:vm://localhost:{{port}}?sync=true&encoding=UTF-8&transferExchange=true").process(new Processor() {
+ public void process(Exchange e) throws InterruptedException {
+ Assert.assertNotNull(e.getIn().getBody());
+ Assert.assertNotNull(e.getIn().getHeaders());
+ Assert.assertNotNull(e.getProperties());
+ Assert.assertEquals("Hello!", e.getIn().getBody());
+ Assert.assertEquals("feta", e.getIn().getHeader("cheese"));
+ Assert.assertEquals("old", e.getProperty("ham"));
+ Assert.assertEquals(ExchangePattern.InOut, e.getPattern());
+ Boolean setException = (Boolean) e.getProperty("setException");
- @Override
- public void setUp() throws Exception {
- uri = "mina:vm://localhost:6321?sync=true&encoding=UTF-8&transferExchange=true";
- super.setUp();
+ if (setException) {
+ e.getOut().setFault(true);
+ e.getOut().setBody(new InterruptedException());
+ e.getOut().setHeader("hello", "nihao");
+ } else {
+ e.getOut().setBody("Goodbye!");
+ e.getOut().setHeader("cheese", "cheddar");
+ }
+ e.setProperty("salami", "fresh");
+ e.setProperty("Charset", Charset.defaultCharset());
+ }
+ });
+ }
+ };
}
}
\ No newline at end of file
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaVmTest.java Sun Jun 12 12:29:37 2011
@@ -18,14 +18,12 @@ package org.apache.camel.component.mina;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
* @version
*/
-public class MinaVmTest extends CamelTestSupport {
- protected String uri = "mina:vm://localhost:8080?sync=false&minaLogger=true";
+public class MinaVmTest extends BaseMinaTest {
@Test
public void testMinaRoute() throws Exception {
@@ -33,7 +31,7 @@ public class MinaVmTest extends CamelTes
Object body = "Hello there!";
endpoint.expectedBodiesReceived(body);
- template.sendBodyAndHeader(uri, body, "cheese", 123);
+ template.sendBodyAndHeader("mina:vm://localhost:{{port}}?sync=false&minaLogger=true", body, "cheese", 123);
assertMockEndpointsSatisfied();
}
@@ -41,7 +39,8 @@ public class MinaVmTest extends CamelTes
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from(uri).to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
+ from("mina:vm://localhost:{{port}}?sync=false&minaLogger=true")
+ .to("log:before?showAll=true").to("mock:result").to("log:after?showAll=true");
}
};
}
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/ReverserServer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/ReverserServer.java?rev=1134920&r1=1134919&r2=1134920&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/ReverserServer.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/ReverserServer.java Sun Jun 12 12:29:37 2011
@@ -33,6 +33,10 @@ public class ReverserServer {
protected int port = 6321;
private IoAcceptor acceptor;
+ public ReverserServer(int port) {
+ this.port = port;
+ }
+
public void start() throws Exception {
acceptor = new SocketAcceptor();