Author: davsclaus
Date: Tue Oct 16 12:36:12 2012
New Revision: 1398761
URL: http://svn.apache.org/viewvc?rev=1398761&view=rev
Log:
Fixed test to shutdown faster.
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1398760
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java?rev=1398761&r1=1398760&r2=1398761&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPAsyncTest.java
Tue Oct 16 12:36:12 2012
@@ -23,24 +23,19 @@ import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.converter.IOConverter;
import org.apache.camel.util.IOHelper;
-
import org.junit.Test;
public class NettyUDPAsyncTest extends BaseNettyTest {
@EndpointInject(uri = "mock:result")
protected MockEndpoint resultEndpoint;
- @Produce(uri = "direct:start")
- protected ProducerTemplate producerTemplate;
-
+
private void sendFile(String uri) throws Exception {
- producerTemplate.send(uri, new Processor() {
+ template.send(uri, new Processor() {
public void process(Exchange exchange) throws Exception {
// Read from an input stream
InputStream is = IOHelper.buffered(new
FileInputStream("./src/test/resources/test.txt"));
Modified:
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java?rev=1398761&r1=1398760&r2=1398761&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPObjectSyncTest.java
Tue Oct 16 12:36:12 2012
@@ -18,20 +18,15 @@ package org.apache.camel.component.netty
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
public class NettyUDPObjectSyncTest extends BaseNettyTest {
- @Produce(uri = "direct:start")
- protected ProducerTemplate producerTemplate;
-
@Test
public void testUDPObjectInOutWithNettyConsumer() throws Exception {
Poetry poetry = new Poetry();
- Poetry response =
producerTemplate.requestBody("netty:udp://localhost:{{port}}?sync=true",
poetry, Poetry.class);
+ Poetry response =
template.requestBody("netty:udp://localhost:{{port}}?sync=true", poetry,
Poetry.class);
assertEquals("Dr. Sarojini Naidu", response.getPoet());
}
Modified:
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java?rev=1398761&r1=1398760&r2=1398761&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyUDPSyncTest.java
Tue Oct 16 12:36:12 2012
@@ -18,20 +18,15 @@ package org.apache.camel.component.netty
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
import org.apache.camel.builder.RouteBuilder;
import org.junit.Test;
public class NettyUDPSyncTest extends BaseNettyTest {
- @Produce(uri = "direct:start")
- protected ProducerTemplate producerTemplate;
-
@Test
public void testUDPStringInOutWithNettyConsumer() throws Exception {
for (int i = 0; i < 5; i++) {
- String response = producerTemplate.requestBody(
+ String response = template.requestBody(
"netty:udp://localhost:{{port}}?sync=true",
"After the Battle of Thermopylae in 480 BC - Simonides of Ceos
(c. 556 BC-468 BC), Greek lyric poet wrote ?", String.class);
assertEquals("Go tell the Spartans, thou that passest by, That
faithful to their precepts here we lie.", response);
