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 2010/12/09 11:16:18 UTC
svn commit: r1043882 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/component/mock/ test/java/org/apache/camel/
test/java/org/apache/camel/builder/
test/java/org/apache/camel/component/browse/
test/java/org/apache/camel/component/file/ te...
Author: davsclaus
Date: Thu Dec 9 10:16:17 2010
New Revision: 1043882
URL: http://svn.apache.org/viewvc?rev=1043882&view=rev
Log:
CAMEL-3411: Cut down on thread sleep in unit tests.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCurrentDirTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveDeleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveNoopTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileEagerDeleteTargetFileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaTimeoutTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/InflightRepositoryRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileRollbackOnCompletionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout3Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteNoAutoStartupTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownSedaAndDirectEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Thu Dec 9 10:16:17 2010
@@ -173,6 +173,10 @@ public class MockEndpoint extends Defaul
Collection<Endpoint> endpoints = context.getEndpoints();
long millis = unit.toMillis(timeout);
for (Endpoint endpoint : endpoints) {
+ // if the endpoint was intercepted we should get the delegate
+ if (endpoint instanceof InterceptSendToEndpoint) {
+ endpoint = ((InterceptSendToEndpoint) endpoint).getDelegate();
+ }
if (endpoint instanceof MockEndpoint) {
MockEndpoint mockEndpoint = (MockEndpoint) endpoint;
mockEndpoint.setResultWaitTime(millis);
@@ -190,6 +194,10 @@ public class MockEndpoint extends Defaul
ObjectHelper.notNull(context, "camelContext");
Collection<Endpoint> endpoints = context.getEndpoints();
for (Endpoint endpoint : endpoints) {
+ // if the endpoint was intercepted we should get the delegate
+ if (endpoint instanceof InterceptSendToEndpoint) {
+ endpoint = ((InterceptSendToEndpoint) endpoint).getDelegate();
+ }
if (endpoint instanceof MockEndpoint) {
MockEndpoint mockEndpoint = (MockEndpoint) endpoint;
mockEndpoint.reset();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Thu Dec 9 10:16:17 2010
@@ -20,6 +20,7 @@ import java.util.Map;
import javax.naming.Context;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
@@ -39,6 +40,7 @@ public abstract class ContextTestSupport
protected volatile CamelContext context;
protected volatile ProducerTemplate template;
protected volatile ConsumerTemplate consumer;
+ protected volatile NotifyBuilder oneExchangeDone;
private boolean useRouteBuilder = true;
private Service camelContextService;
@@ -81,6 +83,9 @@ public abstract class ContextTestSupport
consumer = context.createConsumerTemplate();
consumer.start();
+ // create a default notifier when 1 exchange is done which is the most common caase
+ oneExchangeDone = new NotifyBuilder(context).whenDone(1).create();
+
if (isUseRouteBuilder()) {
RouteBuilder[] builders = createRouteBuilders();
for (RouteBuilder builder : builders) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/NotifyBuilderTest.java Thu Dec 9 10:16:17 2010
@@ -41,22 +41,18 @@ public class NotifyBuilderTest extends C
assertEquals(true, notify.matches());
}
- public void testSedaWhenExchangeDoneSimple() throws Exception {
+ public void testDirectBeerWhenExchangeDoneSimple() throws Exception {
NotifyBuilder notify = new NotifyBuilder(context)
- .from("seda:beer").whenDone(1)
+ .from("direct:beer").whenDone(1)
.create();
- assertEquals("from(seda:beer).whenDone(1)", notify.toString());
+ assertEquals("from(direct:beer).whenDone(1)", notify.toString());
assertEquals(false, notify.matches());
- template.sendBody("seda:beer", "A");
+ template.sendBody("direct:beer", "A");
- // wait up till 5 sec as it should be routed completed now
- assertEquals(true, notify.matches(5, TimeUnit.SECONDS));
-
- SedaEndpoint confirm = context.getEndpoint("seda:done", SedaEndpoint.class);
- assertEquals(1, confirm.getExchanges().size());
+ assertEquals(true, notify.matches());
}
public void testDirectFromRoute() throws Exception {
@@ -440,58 +436,6 @@ public class NotifyBuilderTest extends C
assertEquals(true, notify.matches());
}
- public void testWhenExchangeReceivedWithDelay() throws Exception {
- NotifyBuilder notify = new NotifyBuilder(context)
- .whenReceived(1)
- .create();
-
- long start = System.currentTimeMillis();
- template.sendBody("seda:cheese", "Hello Cheese");
- long end = System.currentTimeMillis();
- assertTrue("Should be faster than: " + (end - start), (end - start) < 2000);
-
- // should be quick as its when received and NOT when done
- assertEquals(true, notify.matches(5, TimeUnit.SECONDS));
- long end2 = System.currentTimeMillis();
-
- assertTrue("Should be faster than: " + (end2 - start), (end2 - start) < 2000);
- }
-
- public void testWhenExchangeDoneWithDelay() throws Exception {
- NotifyBuilder notify = new NotifyBuilder(context)
- .whenDone(1)
- .create();
-
- long start = System.currentTimeMillis();
- template.sendBody("seda:cheese", "Hello Cheese");
- long end = System.currentTimeMillis();
- assertTrue("Should be faster than: " + (end - start), (end - start) < 2000);
-
- assertEquals(false, notify.matches());
-
- // should NOT be quick as its when DONE
- assertEquals(true, notify.matches(5, TimeUnit.SECONDS));
- long end2 = System.currentTimeMillis();
-
- assertTrue("Should be slower than: " + (end2 - start), (end2 - start) > 2900);
- }
-
- public void testWhenExchangeDoneAndTimeoutWithDelay() throws Exception {
- NotifyBuilder notify = new NotifyBuilder(context)
- .whenDone(1)
- .create();
-
- template.sendBody("seda:cheese", "Hello Cheese");
-
- assertEquals(false, notify.matches());
-
- // should timeout
- assertEquals(false, notify.matches(1, TimeUnit.SECONDS));
-
- // should NOT timeout
- assertEquals(true, notify.matches(5, TimeUnit.SECONDS));
- }
-
public void testWhenExchangeExactlyDone() throws Exception {
NotifyBuilder notify = new NotifyBuilder(context)
.whenExactlyDone(5)
@@ -917,13 +861,11 @@ public class NotifyBuilderTest extends C
from("direct:bar").routeId("bar").to("mock:bar");
- from("direct:fail").throwException(new IllegalArgumentException("Damn"));
-
- from("seda:cheese").delay(3000).to("mock:cheese");
+ from("direct:fail").routeId("fail").throwException(new IllegalArgumentException("Damn"));
from("direct:cake").routeId("cake").transform(body().prepend("Bye ")).to("log:cake");
- from("seda:beer").to("mock:beer").delay(3000).to("seda:done");
+ from("direct:beer").routeId("beer").to("log:beer").to("mock:beer");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/browse/BrowseTest.java Thu Dec 9 10:16:17 2010
@@ -42,16 +42,11 @@ public class BrowseTest extends ContextT
Collection<Endpoint> list = context.getEndpoints();
assertEquals("number of endpoints", 2, list.size());
- Thread.sleep(2000);
-
for (Endpoint endpoint : list) {
-
List<Exchange> exchanges = ((BrowseEndpoint) endpoint).getExchanges();
-
LOG.debug(">>>> " + endpoint + " has: " + exchanges);
assertEquals("Exchanges received on " + endpoint, 2, exchanges.size());
-
assertInMessageBodyEquals(exchanges.get(0), body1);
assertInMessageBodyEquals(exchanges.get(1), body2);
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeAsyncTest.java Thu Dec 9 10:16:17 2010
@@ -40,9 +40,6 @@ public class FileConsumeAsyncTest extend
before.expectedMessageCount(1);
before.assertIsSatisfied();
- // give a little extra time for consumer to stop
- Thread.sleep(1000);
-
// file should still exist as its the async done that will complete it
assertTrue("File should not have been deleted", new File("target/files/report.txt").getAbsoluteFile().exists());
@@ -50,8 +47,8 @@ public class FileConsumeAsyncTest extend
mock.expectedMessageCount(1);
mock.assertIsSatisfied();
- // give a little time for on completion to delete the file
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
+
assertFalse("File should been deleted", new File("target/files/report.txt").getAbsoluteFile().exists());
}
@@ -63,7 +60,7 @@ public class FileConsumeAsyncTest extend
.convertBodyTo(String.class)
.threads()
.to("mock:before")
- .delay(3000)
+ .delay(1000)
.to("mock:result");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeCharsetTest.java Thu Dec 9 10:16:17 2010
@@ -41,8 +41,7 @@ public class FileConsumeCharsetTest exte
assertMockEndpointsSatisfied();
- // give time to delete files
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
// file should not exists
assertFalse("File should been deleted", new File("target/files/report.txt").getAbsoluteFile().exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFilesAndDeleteTest.java Thu Dec 9 10:16:17 2010
@@ -43,8 +43,7 @@ public class FileConsumeFilesAndDeleteTe
assertMockEndpointsSatisfied();
- // give time to delete files
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
// file should not exists
assertFalse("File should been deleted", new File("target/files/report.txt").getAbsoluteFile().exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeNoopIdempotentEnabledTest.java Thu Dec 9 10:16:17 2010
@@ -39,7 +39,7 @@ public class FileConsumeNoopIdempotentEn
mock.expectedMessageCount(1);
// give some time to let consumer try to read the file multiple times
- Thread.sleep(2000);
+ Thread.sleep(250);
assertMockEndpointsSatisfied();
}
@@ -49,7 +49,7 @@ public class FileConsumeNoopIdempotentEn
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/noop?noop=true&idempotent=true").convertBodyTo(String.class).to("mock:result");
+ from("file://target/noop?noop=true&idempotent=true&delay=10").convertBodyTo(String.class).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCommitRenameStrategyTest.java Thu Dec 9 10:16:17 2010
@@ -66,8 +66,7 @@ public class FileConsumerCommitRenameStr
mock.assertIsSatisfied();
- // sleep to let the file consumer do its renaming
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
// content of file should be Hello London
String content = IOConverter.toString(new File("./target/done/london.txt"), null);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCurrentDirTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCurrentDirTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCurrentDirTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerCurrentDirTest.java Thu Dec 9 10:16:17 2010
@@ -26,7 +26,7 @@ public class FileConsumerCurrentDirTest
public void testCurrentDir() throws Exception {
// just see if the route can be started and poll in files
- Thread.sleep(1000);
+ Thread.sleep(500);
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentTest.java Thu Dec 9 10:16:17 2010
@@ -52,7 +52,7 @@ public class FileConsumerIdempotentTest
assertMockEndpointsSatisfied();
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
// reset mock and set new expectations
mock.reset();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerMoveExpressionTest.java Thu Dec 9 10:16:17 2010
@@ -64,8 +64,7 @@ public class FileConsumerMoveExpressionT
template.sendBodyAndHeader("file://target/filelanguage/", "Hello World", Exchange.FILE_NAME, "report.txt");
assertMockEndpointsSatisfied();
- // give time for consumer to rename file
- Thread.sleep(500);
+ oneExchangeDone.matchesMockWaitTime();
String id = mock.getExchanges().get(0).getIn().getMessageId();
File file = new File("target/filelanguage/" + id + ".bak");
@@ -89,8 +88,7 @@ public class FileConsumerMoveExpressionT
template.sendBodyAndHeader("file://target/filelanguage/", "Bye World", Exchange.FILE_NAME, "report2.txt");
assertMockEndpointsSatisfied();
- // give time for consumer to rename file
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
String id = mock.getExchanges().get(0).getIn().getMessageId();
File file = new File("target/filelanguage/backup-" + id + "-report2.bak");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java Thu Dec 9 10:16:17 2010
@@ -42,7 +42,7 @@ public class FileConsumerNoopTest extend
assertMockEndpointsSatisfied();
// wait a little to let file consumer run some more
- Thread.sleep(2000);
+ Thread.sleep(250);
File file = new File("target/filenoop").getAbsoluteFile();
assertEquals("There should be 2 files", 2, file.list().length);
@@ -56,7 +56,7 @@ public class FileConsumerNoopTest extend
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/filenoop?noop=true").convertBodyTo(String.class).to("mock:result");
+ from("file://target/filenoop?noop=true&delay=10").convertBodyTo(String.class).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyNotBeginTest.java Thu Dec 9 10:16:17 2010
@@ -31,7 +31,7 @@ import org.apache.camel.spi.PollingConsu
public class FileConsumerPollStrategyNotBeginTest extends ContextTestSupport {
private static int counter;
- private static String event = "";
+ private static volatile String event = "";
private String fileUrl = "file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true";
@@ -55,8 +55,10 @@ public class FileConsumerPollStrategyNot
assertMockEndpointsSatisfied();
- // give file consumer a bit time
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
+
+ // the poll strategy commit is executed after the exchange is done
+ Thread.sleep(100);
assertTrue(event.startsWith("beginbegincommit"));
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyRollbackThrowExceptionTest.java Thu Dec 9 10:16:17 2010
@@ -21,17 +21,15 @@ import org.apache.camel.ContextTestSuppo
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.PollingConsumerPollStrategy;
-import org.apache.camel.util.ObjectHelper;
/**
* Unit test for poll strategy
*/
public class FileConsumerPollStrategyRollbackThrowExceptionTest extends ContextTestSupport {
- private static String event = "";
+ private static volatile String event = "";
private String fileUrl = "file://target/pollstrategy/?pollStrategy=#myPoll";
@@ -50,14 +48,9 @@ public class FileConsumerPollStrategyRol
}
public void testRollbackThrowException() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(0);
-
// let it run for a little, but it fails all the time
Thread.sleep(2000);
- assertMockEndpointsSatisfied();
-
// and we should rollback X number of times
assertTrue(event.startsWith("rollback"));
}
@@ -73,14 +66,6 @@ public class FileConsumerPollStrategyRol
private class MyPollStrategy implements PollingConsumerPollStrategy {
public boolean begin(Consumer consumer, Endpoint endpoint) {
- // start consumer as we simulate the fail in begin
- // and thus before camel lazy start it itself
- try {
- consumer.start();
- } catch (Exception e) {
- ObjectHelper.wrapRuntimeCamelException(e);
- }
-
// simulate an error on first poll
throw new IllegalArgumentException("Damn I cannot do this");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java Thu Dec 9 10:16:17 2010
@@ -33,7 +33,7 @@ public class FileConsumerPollStrategyTes
private static int counter;
private static String event = "";
- private String fileUrl = "file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true";
+ private String fileUrl = "file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -56,7 +56,7 @@ public class FileConsumerPollStrategyTes
assertMockEndpointsSatisfied();
// give file consumer a bit time
- Thread.sleep(1500);
+ Thread.sleep(250);
assertTrue(event.startsWith("rollbackcommit"));
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveDeleteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveDeleteTest.java Thu Dec 9 10:16:17 2010
@@ -43,8 +43,7 @@ public class FileConsumerPreMoveDeleteTe
assertMockEndpointsSatisfied();
- // and file should still be deleted
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File pre = new File("target/premove/work/hello.txt").getAbsoluteFile();
assertFalse("Pre move file should have been deleted", pre.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveNoopTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveNoopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveNoopTest.java Thu Dec 9 10:16:17 2010
@@ -43,8 +43,7 @@ public class FileConsumerPreMoveNoopTest
assertMockEndpointsSatisfied();
- // and file should still be there in premove directory
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File pre = new File("target/premove/work/hello.txt").getAbsoluteFile();
assertTrue("Pre move file should exist", pre.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileEagerDeleteTargetFileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileEagerDeleteTargetFileTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileEagerDeleteTargetFileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileEagerDeleteTargetFileTest.java Thu Dec 9 10:16:17 2010
@@ -37,7 +37,7 @@ public class FileEagerDeleteTargetFileTe
template.sendBodyAndHeader("file://target/eagerdelete?tempFileName=inprogress-${file:name}&eagerDeleteTargetFile=true",
"Bye World", Exchange.FILE_NAME, "world.txt");
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File file = new File("target/eagerdelete/world.txt").getAbsoluteFile();
assertTrue("File should exist", file.exists());
@@ -48,7 +48,7 @@ public class FileEagerDeleteTargetFileTe
template.sendBodyAndHeader("file://target/eagerdelete?tempFileName=inprogress-${file:name}&eagerDeleteTargetFile=false",
"Bye World", Exchange.FILE_NAME, "world.txt");
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File file = new File("target/eagerdelete/world.txt").getAbsoluteFile();
assertTrue("File should exist", file.exists());
@@ -59,7 +59,7 @@ public class FileEagerDeleteTargetFileTe
template.sendBodyAndHeader("file://target/eagerdelete?tempFileName=inprogress-${file:name}",
"Bye World", Exchange.FILE_NAME, "world.txt");
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File file = new File("target/eagerdelete/world.txt").getAbsoluteFile();
assertTrue("File should exist", file.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaTimeoutTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaTimeoutTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaTimeoutTest.java Thu Dec 9 10:16:17 2010
@@ -35,7 +35,7 @@ public class SedaTimeoutTest extends Con
}
public void testSedaTineout() throws Exception {
- Future<String> out = template.asyncRequestBody("seda:foo?timeout=1000", "World", String.class);
+ Future<String> out = template.asyncRequestBody("seda:foo?timeout=100", "World", String.class);
try {
out.get();
fail("Should have thrown an exception");
@@ -50,7 +50,7 @@ public class SedaTimeoutTest extends Con
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:foo").to("mock:before").delay(3000).transform(body().prepend("Bye ")).to("mock:result");
+ from("seda:foo").to("mock:before").delay(250).transform(body().prepend("Bye ")).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaUnitOfWorkTest.java Thu Dec 9 10:16:17 2010
@@ -31,8 +31,8 @@ import org.apache.camel.spi.Synchronizat
*/
public class SedaUnitOfWorkTest extends ContextTestSupport {
- private static String sync;
- private static String lastOne;
+ private static volatile String sync;
+ private static volatile String lastOne;
public void testSedaUOW() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
@@ -42,8 +42,7 @@ public class SedaUnitOfWorkTest extends
assertMockEndpointsSatisfied();
- // give time for on completiom to run
- Thread.sleep(100);
+ oneExchangeDone.matchesMockWaitTime();
assertEquals("onCompleteA", sync);
assertEquals("onCompleteA", lastOne);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/vm/VmInOutChainedTimeoutTest.java Thu Dec 9 10:16:17 2010
@@ -28,20 +28,18 @@ import org.apache.camel.util.StopWatch;
public class VmInOutChainedTimeoutTest extends ContextTestSupport {
public void testVmInOutChainedTimeout() throws Exception {
- // time timeout after 2 sec should trigger a immediately reply
StopWatch watch = new StopWatch();
try {
- template.requestBody("vm:a?timeout=5000", "Hello World");
+ template.requestBody("vm:a?timeout=1000", "Hello World");
fail("Should have thrown an exception");
} catch (CamelExecutionException e) {
+ // the chained vm caused the timeout
ExchangeTimedOutException cause = assertIsInstanceOf(ExchangeTimedOutException.class, e.getCause());
- assertEquals(2000, cause.getTimeout());
+ assertEquals(200, cause.getTimeout());
}
long delta = watch.stop();
- assertTrue("Should be faster than 4000 millis, was: " + delta, delta < 4000);
-
- Thread.sleep(2000);
+ assertTrue("Should be faster than 1 sec, was: " + delta, delta < 1100);
}
@Override
@@ -54,12 +52,12 @@ public class VmInOutChainedTimeoutTest e
from("vm:a")
.to("mock:a")
// this timeout will trigger an exception to occur
- .to("vm:b?timeout=2000")
+ .to("vm:b?timeout=200")
.to("mock:a2");
from("vm:b")
.to("mock:b")
- .delay(3000)
+ .delay(500)
.transform().constant("Bye World");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileDeleteTest.java Thu Dec 9 10:16:17 2010
@@ -40,8 +40,7 @@ public class GzipDataFormatFileDeleteTes
assertMockEndpointsSatisfied();
- //give a bit time
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File in = new File("target/gzip/hello.txt").getAbsoluteFile();
assertFalse("Should have been deleted " + in, in.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/GzipDataFormatFileUnmarshalDeleteTest.java Thu Dec 9 10:16:17 2010
@@ -40,8 +40,7 @@ public class GzipDataFormatFileUnmarshal
assertMockEndpointsSatisfied();
- //give a bit time
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
File in = new File("target/gzip/hello.txt").getAbsoluteFile();
assertFalse("Should have been deleted " + in, in.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/InflightRepositoryRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/InflightRepositoryRouteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/InflightRepositoryRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/InflightRepositoryRouteTest.java Thu Dec 9 10:16:17 2010
@@ -17,11 +17,9 @@
package org.apache.camel.impl;
import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -32,24 +30,15 @@ public class InflightRepositoryRouteTest
private final CountDownLatch latch = new CountDownLatch(1);
public void testInflight() throws Exception {
- assertEquals(0, context.getInflightRepository().size());
-
- template.asyncSendBody("direct:start", "Hello World");
- latch.await(5, TimeUnit.SECONDS);
-
- assertEquals(1, context.getInflightRepository().size());
-
- // must be 1 in flight from this endpoint
- assertEquals(1, context.getInflightRepository().size(context.getEndpoint("direct:start")));
+ context.setInflightRepository(new MyInflightRepo());
- // but 0 from this endpoint
- assertEquals(0, context.getInflightRepository().size(context.getEndpoint("mock:result")));
+ assertEquals(0, context.getInflightRepository().size());
- // wait to be sure its done
- Thread.sleep(2000);
+ template.sendBody("direct:start", "Hello World");
assertEquals(0, context.getInflightRepository().size());
assertEquals(0, context.getInflightRepository().size(context.getEndpoint("direct:start")));
+ assertEquals(0, context.getInflightRepository().size(context.getEndpoint("mock:result")));
}
@Override
@@ -57,13 +46,28 @@ public class InflightRepositoryRouteTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- latch.countDown();
- }
- }).delay(1000).to("mock:result");
+ from("direct:start").to("mock:result");
}
};
}
+
+ private class MyInflightRepo extends DefaultInflightRepository {
+
+ @Override
+ public void add(Exchange exchange) {
+ super.add(exchange);
+
+ assertEquals(1, context.getInflightRepository().size());
+
+ assertEquals(1, size(context.getEndpoint("direct:start")));
+
+ // but 0 from this endpoint
+ assertEquals(0, size(context.getEndpoint("mock:result")));
+ }
+
+ @Override
+ public void remove(Exchange exchange) {
+ super.remove(exchange);
+ }
+ }
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileDeleteTest.java Thu Dec 9 10:16:17 2010
@@ -35,13 +35,11 @@ public class ZipDataFormatFileDeleteTest
public void testZipFileDelete() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
-
template.sendBodyAndHeader("file:target/zip", "Hello World", Exchange.FILE_NAME, "hello.txt");
-
assertMockEndpointsSatisfied();
- //give a bit time
- Thread.sleep(1000);
+ // wait till the exchange is done which means the file should then have been deleted
+ oneExchangeDone.matchesMockWaitTime();
File in = new File("target/zip/hello.txt").getAbsoluteFile();
assertFalse("Should have been deleted " + in, in.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ZipDataFormatFileUnmarshalDeleteTest.java Thu Dec 9 10:16:17 2010
@@ -20,6 +20,7 @@ import java.io.File;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -34,14 +35,14 @@ public class ZipDataFormatFileUnmarshalD
}
public void testZipFileUnmarshalDelete() throws Exception {
- getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
+ // there are 2 exchanges
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
+ getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
template.sendBodyAndHeader("file:target/zip", "Hello World", Exchange.FILE_NAME, "hello.txt");
-
assertMockEndpointsSatisfied();
- //give a bit time
- Thread.sleep(1000);
+ notify.matchesMockWaitTime();
File in = new File("target/zip/hello.txt").getAbsoluteFile();
assertFalse("Should have been deleted " + in, in.exists());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathRouteConcurrentTest.java Thu Dec 9 10:16:17 2010
@@ -49,7 +49,7 @@ public class XPathRouteConcurrentTest ex
template.sendBody("seda:foo", "<person><name>Claus</name></person>");
- Thread.sleep(1000);
+ Thread.sleep(100);
template.sendBody("seda:foo", "<person><name>James</name></person>");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java Thu Dec 9 10:16:17 2010
@@ -86,13 +86,13 @@ public class EventNotifierExchangeSentTe
assertEquals("log://foo", e0.getEndpoint().getEndpointUri());
assertEquals("direct://bar", e1.getEndpoint().getEndpointUri());
long time = e1.getTimeTaken();
- assertTrue("Should take about 1 sec, was: " + time, time > 900);
+ assertTrue("Should take about 0.5 sec, was: " + time, time > 400);
assertEquals("mock://result", e2.getEndpoint().getEndpointUri());
assertEquals("direct://start", e3.getEndpoint().getEndpointUri());
time = e3.getTimeTaken();
- assertTrue("Should take about 1 sec, was: " + time, time > 900);
+ assertTrue("Should take about 0.5 sec, was: " + time, time > 400);
}
public void testExchangeSentRecipient() throws Exception {
@@ -103,7 +103,7 @@ public class EventNotifierExchangeSentTe
assertMockEndpointsSatisfied();
// give it time to complete
- Thread.sleep(1000);
+ Thread.sleep(100);
assertEquals(6, events.size());
ExchangeSentEvent e0 = assertIsInstanceOf(ExchangeSentEvent.class, events.get(0));
@@ -128,11 +128,11 @@ public class EventNotifierExchangeSentTe
public void configure() throws Exception {
from("direct:start").to("log:foo").to("direct:bar").to("mock:result");
- from("direct:bar").delay(1000);
+ from("direct:bar").delay(500);
from("direct:foo").recipientList().header("foo");
- from("direct:cool").delay(2000);
+ from("direct:cool").delay(1000);
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierRedeliveryEventsTest.java Thu Dec 9 10:16:17 2010
@@ -78,7 +78,7 @@ public class EventNotifierRedeliveryEven
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(4).redeliveryDelay(100));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(4).redeliveryDelay(0));
from("direct:start").throwException(new IllegalArgumentException("Damn"));
}
@@ -110,7 +110,7 @@ public class EventNotifierRedeliveryEven
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(4).asyncDelayedRedelivery().redeliveryDelay(100));
+ errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(4).asyncDelayedRedelivery().redeliveryDelay(10));
from("direct:start").throwException(new IllegalArgumentException("Damn"));
}
@@ -121,7 +121,7 @@ public class EventNotifierRedeliveryEven
template.sendBody("direct:start", "Hello World");
assertMockEndpointsSatisfied();
- Thread.sleep(500);
+ Thread.sleep(250);
assertEquals(9, events.size());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/CustomRoutePolicyTest.java Thu Dec 9 10:16:17 2010
@@ -58,7 +58,7 @@ public class CustomRoutePolicyTest exten
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- template.sendBody("seda:foo", "Hello World");
+ template.sendBody("direct:foo", "Hello World");
assertMockEndpointsSatisfied();
@@ -66,13 +66,10 @@ public class CustomRoutePolicyTest exten
mock.expectedBodiesReceived("stop");
// we send stop command so we should only get 1 message
- template.sendBody("seda:foo", "stop");
+ template.sendBody("direct:foo", "stop");
assertMockEndpointsSatisfied();
- // give time for slow boxes
- Thread.sleep(500);
-
assertTrue("Should be stopped", policy.isStopped());
}
@@ -81,7 +78,7 @@ public class CustomRoutePolicyTest exten
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:foo").routeId("foo").routePolicy(policy).to("mock:result");
+ from("direct:foo").routeId("foo").routePolicy(policy).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileRollbackOnCompletionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileRollbackOnCompletionTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileRollbackOnCompletionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/FileRollbackOnCompletionTest.java Thu Dec 9 10:16:17 2010
@@ -59,7 +59,7 @@ public class FileRollbackOnCompletionTes
// simulate CPU processing of the order by sleeping a bit
try {
- Thread.sleep(1000);
+ Thread.sleep(250);
} catch (InterruptedException e) {
// ignore
}
@@ -90,9 +90,10 @@ public class FileRollbackOnCompletionTes
assertEquals("Simulated fatal error", e.getCause().getMessage());
}
- // give time for onCompletion to execute
- // as its being executed asynchronously in another thread
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
+
+ // onCompletion is async so we gotta wait a bit for the file to be deleted
+ Thread.sleep(250);
File file = new File("target/mail/backup/");
String[] files = file.list();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout2Test.java Thu Dec 9 10:16:17 2010
@@ -38,10 +38,6 @@ public class MulticastParallelTimeout2Te
template.sendBody("direct:start", "Hello");
- // wait at least longer than the delay in B so we can ensure its being cancelled
- // and wont continue routing
- Thread.sleep(4000);
-
assertMockEndpointsSatisfied();
}
@@ -63,16 +59,16 @@ public class MulticastParallelTimeout2Te
return oldExchange;
}
})
- .parallelProcessing().timeout(1000).to("direct:a", "direct:b", "direct:c")
+ .parallelProcessing().timeout(250).to("direct:a", "direct:b", "direct:c")
// use end to indicate end of multicast route
.end()
.to("mock:result");
from("direct:a").to("mock:A").setBody(constant("A"));
- from("direct:b").delay(3000).to("mock:B").setBody(constant("B"));
+ from("direct:b").delay(500).to("mock:B").setBody(constant("B"));
- from("direct:c").delay(500).to("mock:C").setBody(constant("C"));
+ from("direct:c").to("mock:C").setBody(constant("C"));
// END SNIPPET: e1
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout3Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout3Test.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout3Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeout3Test.java Thu Dec 9 10:16:17 2010
@@ -29,8 +29,8 @@ public class MulticastParallelTimeout3Te
public void testMulticastParallelTimeout() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- // C will timeout so we only get A and B
- mock.expectedBodiesReceived("AB");
+ // C will timeout so we only get A and/or B
+ mock.message(0).body().not(body().contains("C"));
getMockEndpoint("mock:A").expectedMessageCount(1);
getMockEndpoint("mock:B").expectedMessageCount(1);
@@ -38,10 +38,6 @@ public class MulticastParallelTimeout3Te
template.sendBody("direct:start", "Hello");
- // wait at least longer than the delay in C so we can ensure its being cancelled
- // and wont continue routing
- Thread.sleep(3000);
-
assertMockEndpointsSatisfied();
}
@@ -63,16 +59,16 @@ public class MulticastParallelTimeout3Te
return oldExchange;
}
})
- .parallelProcessing().timeout(4000).to("direct:a", "direct:b", "direct:c")
+ .parallelProcessing().timeout(250).to("direct:a", "direct:b", "direct:c")
// use end to indicate end of multicast route
.end()
.to("mock:result");
- from("direct:a").delay(2000).to("mock:A").setBody(constant("A"));
+ from("direct:a").to("mock:A").setBody(constant("A"));
- from("direct:b").delay(3000).to("mock:B").setBody(constant("B"));
+ from("direct:b").to("mock:B").setBody(constant("B"));
- from("direct:c").delay(6000).to("mock:C").setBody(constant("C"));
+ from("direct:c").delay(500).to("mock:C").setBody(constant("C"));
// END SNIPPET: e1
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelTimeoutTest.java Thu Dec 9 10:16:17 2010
@@ -38,10 +38,6 @@ public class MulticastParallelTimeoutTes
template.sendBody("direct:start", "Hello");
- // wait at least longer than the delay in A so we can ensure its being cancelled
- // and wont continue routing
- Thread.sleep(4000);
-
assertMockEndpointsSatisfied();
}
@@ -63,16 +59,16 @@ public class MulticastParallelTimeoutTes
return oldExchange;
}
})
- .parallelProcessing().timeout(1000).to("direct:a", "direct:b", "direct:c")
+ .parallelProcessing().timeout(250).to("direct:a", "direct:b", "direct:c")
// use end to indicate end of multicast route
.end()
.to("mock:result");
- from("direct:a").delay(3000).to("mock:A").setBody(constant("A"));
+ from("direct:a").delay(500).to("mock:A").setBody(constant("A"));
from("direct:b").to("mock:B").setBody(constant("B"));
- from("direct:c").delay(500).to("mock:C").setBody(constant("C"));
+ from("direct:c").to("mock:C").setBody(constant("C"));
// END SNIPPET: e1
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteNoAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteNoAutoStartupTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteNoAutoStartupTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RouteNoAutoStartupTest.java Thu Dec 9 10:16:17 2010
@@ -31,7 +31,7 @@ public class RouteNoAutoStartupTest exte
template.sendBody("direct:start", "Hello World");
- Thread.sleep(1000);
+ Thread.sleep(100);
assertMockEndpointsSatisfied();
}
@@ -42,7 +42,7 @@ public class RouteNoAutoStartupTest exte
template.sendBody("direct:start", "Hello World");
- Thread.sleep(1000);
+ Thread.sleep(100);
assertMockEndpointsSatisfied();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java Thu Dec 9 10:16:17 2010
@@ -24,6 +24,7 @@ import org.apache.camel.ContextTestSuppo
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.dataset.SimpleDataSet;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.StopWatch;
/**
* A route for simple performance testing that can be used when we suspect
@@ -36,7 +37,7 @@ public class RoutePerformanceTest extend
private String uri = "mock:results";
public void testPerformance() throws Exception {
- long start = System.currentTimeMillis();
+ StopWatch watch = new StopWatch();
MockEndpoint endpoint = getMockEndpoint(uri);
endpoint.expectedMessageCount((int) dataSet.getSize());
@@ -46,9 +47,7 @@ public class RoutePerformanceTest extend
assertMockEndpointsSatisfied();
- long delta = System.currentTimeMillis() - start;
-
- System.out.println("RoutePerformanceTest: Sent: " + size + " Took: " + delta + " ms");
+ System.out.println("RoutePerformanceTest: Sent: " + size + " Took: " + watch.taken() + " ms");
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDeferTest.java Thu Dec 9 10:16:17 2010
@@ -48,7 +48,7 @@ public class ShutdownDeferTest extends C
assertMockEndpointsSatisfied();
- Thread.sleep(500);
+ Thread.sleep(50);
context.stop();
@@ -64,7 +64,7 @@ public class ShutdownDeferTest extends C
public void configure() throws Exception {
from("seda:foo")
.startupOrder(1)
- .delay(1000).to("file://target/deferred");
+ .to("file://target/deferred");
// use file component to transfer files from route 1 -> route 2 as it
// will normally suspend, but by deferring this we can let route 1
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownDirectEndpointTest.java Thu Dec 9 10:16:17 2010
@@ -36,7 +36,7 @@ public class ShutdownDirectEndpointTest
template.asyncSendBody("direct:bar", "D");
template.asyncSendBody("direct:bar", "E");
- Thread.sleep(1000);
+ Thread.sleep(10);
context.stop();
@@ -49,7 +49,7 @@ public class ShutdownDirectEndpointTest
@Override
public void configure() throws Exception {
from("direct:bar")
- .delay(2000)
+ .delay(25)
.to("mock:bar");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownSedaAndDirectEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownSedaAndDirectEndpointTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownSedaAndDirectEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ShutdownSedaAndDirectEndpointTest.java Thu Dec 9 10:16:17 2010
@@ -37,7 +37,7 @@ public class ShutdownSedaAndDirectEndpoi
template.sendBody("seda:foo", "D");
template.sendBody("seda:foo", "E");
- Thread.sleep(250);
+ Thread.sleep(10);
context.stop();
@@ -54,7 +54,7 @@ public class ShutdownSedaAndDirectEndpoi
.to("direct:bar");
from("direct:bar")
- .delay(500)
+ .delay(25)
.to("mock:bar");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java Thu Dec 9 10:16:17 2010
@@ -42,6 +42,7 @@ public class SplitterParallelNoStopOnExc
public void testSplitParallelNoStopOnExceptionStop() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
+ mock.expectedMinimumMessageCount(0);
// we do NOT stop so we receive all messages except the one that goes kaboom
mock.allMessages().body().isNotEqualTo("Kaboom");
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Goodday World", "Bye World");
@@ -73,8 +74,6 @@ public class SplitterParallelNoStopOnExc
if ("Kaboom".equals(body)) {
throw new IllegalArgumentException("Forced");
}
- // need to let ok body sleep so when we fail we do not have all tasks running
- Thread.sleep(1000);
}
}).to("mock:split");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java Thu Dec 9 10:16:17 2010
@@ -44,6 +44,7 @@ public class SplitterParallelStopOnExcep
public void testSplitParallelStopOnExceptionStop() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
+ mock.expectedMinimumMessageCount(0);
mock.allMessages().body().isNotEqualTo("Kaboom");
try {
@@ -76,8 +77,6 @@ public class SplitterParallelStopOnExcep
if ("Kaboom".equals(body)) {
throw new IllegalArgumentException("Forced");
}
- // need to let ok body sleep so when we fail we do not have all tasks running
- Thread.sleep(1000);
}
}).to("mock:split");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterStreamingUoWIssueTest.java Thu Dec 9 10:16:17 2010
@@ -59,11 +59,6 @@ public class SplitterStreamingUoWIssueTe
from("file:target/splitter?delete=true&sortBy=file:name")
.split(body().tokenize(",")).streaming()
.to("seda:queue")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- Thread.sleep(200);
- }
- })
.end()
.log("End of file ${file:name}")
.to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterUoWIssueTest.java Thu Dec 9 10:16:17 2010
@@ -59,11 +59,6 @@ public class SplitterUoWIssueTest extend
from("file:target/splitter?delete=true&sortBy=file:name")
.split(body().tokenize(","))
.to("seda:queue")
- .process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- Thread.sleep(200);
- }
- })
.end()
.log("End of file ${file:name}")
.to("mock:result");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/UnitOfWorkProducerTest.java Thu Dec 9 10:16:17 2010
@@ -71,7 +71,7 @@ public class UnitOfWorkProducerTest exte
assertMockEndpointsSatisfied();
- Thread.sleep(500);
+ oneExchangeDone.matchesMockWaitTime();
// there should be 2 completed events
// one for the producer template, and another for the Camel route
@@ -86,7 +86,7 @@ public class UnitOfWorkProducerTest exte
assertMockEndpointsSatisfied();
- Thread.sleep(500);
+ oneExchangeDone.matchesMockWaitTime();
// there should be 1 completed events as direct endpoint will be like a direct method call
// and the UoW will be re-used
@@ -98,9 +98,9 @@ public class UnitOfWorkProducerTest exte
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:foo").delay(500).to("mock:result");
+ from("seda:foo").to("mock:result");
- from("direct:bar").delay(500).to("mock:result");
+ from("direct:bar").to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java Thu Dec 9 10:16:17 2010
@@ -67,11 +67,11 @@ public class PollEnricherTest extends Co
}
public void testPollEnrichInOnlyWaitNoTimeout() throws InterruptedException {
- // use another thread to send it after 2 seconds
+ // use another thread to send it a bit later
Thread t = new Thread(new Runnable() {
public void run() {
try {
- Thread.sleep(1000);
+ Thread.sleep(250);
} catch (InterruptedException e) {
// ignore
}
@@ -86,7 +86,7 @@ public class PollEnricherTest extends Co
// should take approx 1 sec to complete as the other thread is sending a bit later and we wait
mock.assertIsSatisfied();
long delta = System.currentTimeMillis() - start;
- assertTrue("Should take approx 1 sec: was " + delta, delta > 900);
+ assertTrue("Should take approx 0.25 sec: was " + delta, delta > 150);
}
// -------------------------------------------------------------
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java?rev=1043882&r1=1043881&r2=1043882&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/resequencer/ResequencerFileNameTest.java Thu Dec 9 10:16:17 2010
@@ -36,23 +36,22 @@ public class ResequencerFileNameTest ext
return new RouteBuilder() {
public void configure() {
// START SNIPPET: example
- from("direct:start").resequence(new MyFileNameExpression()).stream().timeout(500).to("mock:result");
+ from("direct:start").resequence(new MyFileNameExpression()).stream().timeout(100).to("mock:result");
// END SNIPPET: example
}
};
}
public void testStreamResequence() throws Exception {
- resultEndpoint.expectedBodiesReceived("20090612-D001", "20090612-D003", "20090612-D002", "20090615-D001");
-
+ resultEndpoint.expectedBodiesReceived("20090612-D001", "20090612-D003");
template.requestBody("direct:start", "20090612-D003");
template.requestBody("direct:start", "20090612-D001");
+ resultEndpoint.assertIsSatisfied();
- Thread.sleep(2000);
-
+ resultEndpoint.reset();
+ resultEndpoint.expectedBodiesReceived("20090612-D002", "20090615-D001");
template.requestBody("direct:start", "20090615-D001");
template.requestBody("direct:start", "20090612-D002");
-
resultEndpoint.assertIsSatisfied();
}
}