Repository: camel Updated Branches: refs/heads/master 5f59322fb -> 780b41b47
CAMEL-8576 Updated the syslog unit tests with the new added option Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dfdaed52 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dfdaed52 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dfdaed52 Branch: refs/heads/master Commit: dfdaed5245fc191ee323a22e6b5f381367ee3a22 Parents: 277aa22 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Mar 31 17:41:40 2015 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Mar 31 17:42:44 2015 +0800 ---------------------------------------------------------------------- .../camel/component/syslog/NettyDataFormatTest.java | 15 +++++++++++++++ .../syslog/NettyRfc5425LongMessageTest.java | 6 ++++-- .../camel/component/syslog/NettyRfc5425Test.java | 6 ++++-- 3 files changed, 23 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dfdaed52/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java ---------------------------------------------------------------------- diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java index 81564b7..0f18568 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyDataFormatTest.java @@ -69,6 +69,20 @@ public class NettyDataFormatTest extends CamelTestSupport { assertMockEndpointsSatisfied(); } + + @Test + public void testSendingRawUDPFromNetty() throws IOException, InterruptedException { + + MockEndpoint mock = getMockEndpoint("mock:syslogReceiver"); + MockEndpoint mock2 = getMockEndpoint("mock:syslogReceiver2"); + mock.expectedMessageCount(1); + mock2.expectedMessageCount(1); + mock2.expectedBodiesReceived(message); + + template.sendBody("netty:udp://127.0.0.1:" + serverPort + "?sync=false&allowDefaultCodec=false&useChannelBuffer=true", message); + + assertMockEndpointsSatisfied(); + } @Override protected RouteBuilder createRouteBuilder() throws Exception { @@ -83,6 +97,7 @@ public class NettyDataFormatTest extends CamelTestSupport { .process(new Processor() { public void process(Exchange ex) { assertTrue(ex.getIn().getBody() instanceof SyslogMessage); + SyslogMessage message = ex.getIn().getBody(SyslogMessage.class); } }).to("mock:syslogReceiver"). marshal(syslogDataFormat).to("mock:syslogReceiver2"); http://git-wip-us.apache.org/repos/asf/camel/blob/dfdaed52/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java ---------------------------------------------------------------------- diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java index 54b2c9d..0b7166c 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425LongMessageTest.java @@ -26,7 +26,7 @@ import org.apache.camel.impl.JndiRegistry; import org.apache.camel.spi.DataFormat; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; -import org.jboss.netty.buffer.BigEndianHeapChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffer; import org.junit.BeforeClass; import org.junit.Test; @@ -70,7 +70,7 @@ public class NettyRfc5425LongMessageTest extends CamelTestSupport { mock2.expectedMessageCount(1); mock2.expectedBodiesReceived(MESSAGE); - template.sendBody(uri, new BigEndianHeapChannelBuffer(MESSAGE.getBytes("UTF8"))); + template.sendBody("direct:start", MESSAGE.getBytes("UTF8")); assertMockEndpointsSatisfied(); } @@ -92,6 +92,8 @@ public class NettyRfc5425LongMessageTest extends CamelTestSupport { assertTrue(ex.getIn().getBody() instanceof SyslogMessage); } }).to("mock:syslogReceiver").marshal(syslogDataFormat).to("mock:syslogReceiver2"); + // Here we need to turn the request body into channelbuffer + from("direct:start").convertBodyTo(ChannelBuffer.class).to(uri); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/dfdaed52/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java ---------------------------------------------------------------------- diff --git a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java index 81134b8..05eca0f 100644 --- a/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java +++ b/components/camel-syslog/src/test/java/org/apache/camel/component/syslog/NettyRfc5425Test.java @@ -33,6 +33,7 @@ import org.junit.Test; public class NettyRfc5425Test extends CamelTestSupport { private static String uri; + private static String uriClient; private static int serverPort; private final String rfc3164Message = "<165>Aug 4 05:34:00 mymachine myproc[10]: %% It's\n time to make the do-nuts. %% Ingredients: Mix=OK, Jelly=OK #\n" + " Devices: Mixer=OK, Jelly_Injector=OK, Frier=OK # Transport:\n" + " Conveyer1=OK, Conveyer2=OK # %%"; @@ -42,6 +43,7 @@ public class NettyRfc5425Test extends CamelTestSupport { public static void initPort() { serverPort = AvailablePortFinder.getNextAvailable(); uri = "netty:tcp://localhost:" + serverPort + "?sync=false&allowDefaultCodec=false&decoders=#decoder&encoder=#encoder"; + uriClient = uri + "&useChannelBuffer=true"; } @Override @@ -61,8 +63,8 @@ public class NettyRfc5425Test extends CamelTestSupport { mock2.expectedMessageCount(2); mock2.expectedBodiesReceived(rfc3164Message, rfc5424Message); - template.sendBody(uri, new BigEndianHeapChannelBuffer(rfc3164Message.getBytes("UTF8"))); - template.sendBody(uri, new BigEndianHeapChannelBuffer(rfc5424Message.getBytes("UTF8"))); + template.sendBody(uriClient , rfc3164Message.getBytes("UTF8")); + template.sendBody(uriClient, rfc5424Message.getBytes("UTF8")); assertMockEndpointsSatisfied(); }
