Author: davsclaus
Date: Thu Dec 9 15:17:51 2010
New Revision: 1044001
URL: http://svn.apache.org/viewvc?rev=1044001&view=rev
Log:
CAMEL-3411: Reduced test times.
Removed:
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/MoveFilesToDirectoryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryWithNoopTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.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/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/FileConsumerPreMoveTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadNoneStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollEnrichTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFilePollThirdTimeOkTest.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/impl/GzipDataFormatFileUnmarshalDeleteTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerBeginExpressionRenameStrategyTest.java
Thu Dec 9 15:17:51 2010
@@ -44,8 +44,6 @@ public class FileConsumerBeginExpression
template.sendBodyAndHeader("file:target/reports", "Hello Paris",
Exchange.FILE_NAME, "paris.txt");
- Thread.sleep(100);
-
mock.assertIsSatisfied();
}
@@ -72,7 +70,7 @@ public class FileConsumerBeginExpression
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("file://target/reports?preMove=../inprogress/${file:name.noext}.bak&consumer.delay=5000")
+
from("file://target/reports?preMove=../inprogress/${file:name.noext}.bak")
.process(new Processor() {
@SuppressWarnings("unchecked")
public void process(Exchange exchange) throws
Exception {
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerFailureHandledTest.java
Thu Dec 9 15:17:51 2010
@@ -45,8 +45,7 @@ public class FileConsumerFailureHandledT
template.sendBodyAndHeader("file:target/messages/input/", "Paris",
Exchange.FILE_NAME, "paris.txt");
mock.assertIsSatisfied();
- // sleep otherwise the file assertions below could fail
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
assertFiles("paris.txt", true);
}
@@ -59,8 +58,7 @@ public class FileConsumerFailureHandledT
template.sendBodyAndHeader("file:target/messages/input/", "London",
Exchange.FILE_NAME, "london.txt");
mock.assertIsSatisfied();
- // sleep otherwise the file assertions below could fail
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
// london should be deleted as we have failure handled it
assertFiles("london.txt", true);
@@ -74,8 +72,7 @@ public class FileConsumerFailureHandledT
template.sendBodyAndHeader("file:target/messages/input/", "Dublin",
Exchange.FILE_NAME, "dublin.txt");
mock.assertIsSatisfied();
- // sleep otherwise the file assertions below could fail
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
// dublin should NOT be deleted, but should be retired on next consumer
assertFiles("dublin.txt", false);
@@ -89,8 +86,7 @@ public class FileConsumerFailureHandledT
template.sendBodyAndHeader("file:target/messages/input/", "Madrid",
Exchange.FILE_NAME, "madrid.txt");
mock.assertIsSatisfied();
- // sleep otherwise the file assertions below could fail
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
// madrid should NOT be deleted, but should be retired on next consumer
assertFiles("madrid.txt", false);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerIdempotentRefTest.java
Thu Dec 9 15:17:51 2010
@@ -30,7 +30,7 @@ import org.apache.camel.spi.IdempotentRe
*/
public class FileConsumerIdempotentRefTest extends ContextTestSupport {
- private static boolean invoked;
+ private static volatile boolean invoked;
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -50,7 +50,7 @@ public class FileConsumerIdempotentRefTe
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("file://target/idempotent/?idempotent=true&idempotentRepository=#myRepo&move=done/${file:name}")
+
from("file://target/idempotent/?idempotent=true&idempotentRepository=#myRepo&move=done/${file:name}&delay=10")
.convertBodyTo(String.class).to("mock:result");
}
};
@@ -64,7 +64,7 @@ public class FileConsumerIdempotentRefTe
assertMockEndpointsSatisfied();
- Thread.sleep(100);
+ oneExchangeDone.matchesMockWaitTime();
// reset mock and set new expectations
mock.reset();
@@ -76,8 +76,8 @@ public class FileConsumerIdempotentRefTe
file = file.getAbsoluteFile();
file.renameTo(renamed.getAbsoluteFile());
- // should NOT consume the file again, let 2 secs pass to let the
consumer try to consume it but it should not
- Thread.sleep(2000);
+ // should NOT consume the file again, let a bit time go
+ Thread.sleep(100);
assertMockEndpointsSatisfied();
assertTrue("MyIdempotentRepository should have been invoked", invoked);
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=1044001&r1=1044000&r2=1044001&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 15:17:51 2010
@@ -39,7 +39,7 @@ public class FileConsumerIdempotentTest
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("file://target/idempotent/?idempotent=true&move=done/${file:name}")
+
from("file://target/idempotent/?idempotent=true&move=done/${file:name}&delay=10")
.convertBodyTo(String.class).to("mock:result");
}
};
@@ -64,8 +64,8 @@ public class FileConsumerIdempotentTest
file = file.getAbsoluteFile();
file.renameTo(renamed.getAbsoluteFile());
- // should NOT consume the file again, let 2 secs pass to let the
consumer try to consume it but it should not
- Thread.sleep(2000);
+ // should NOT consume the file again, let a bit time pass to let the
consumer try to consume it but it should not
+ Thread.sleep(100);
assertMockEndpointsSatisfied();
}
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=1044001&r1=1044000&r2=1044001&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 15:17:51 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;
import org.apache.camel.component.mock.MockEndpoint;
@@ -37,18 +38,16 @@ public class FileConsumerNoopTest extend
}
public void testNoop() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
+
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
assertMockEndpointsSatisfied();
- // wait a little to let file consumer run some more
- Thread.sleep(250);
+ notify.matchesMockWaitTime();
File file = new File("target/filenoop").getAbsoluteFile();
assertEquals("There should be 2 files", 2, file.list().length);
-
- // should not come new files since
- assertMockEndpointsSatisfied();
}
@Override
@@ -56,7 +55,7 @@ public class FileConsumerNoopTest extend
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("file://target/filenoop?noop=true&delay=10").convertBodyTo(String.class).to("mock:result");
+
from("file://target/filenoop?noop=true&initialDelay=0&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=1044001&r1=1044000&r2=1044001&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 15:17:51 2010
@@ -33,7 +33,7 @@ public class FileConsumerPollStrategyNot
private static int counter;
private static volatile String event = "";
- private String fileUrl =
"file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true";
+ private String fileUrl =
"file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true&initialDelay=0&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
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=1044001&r1=1044000&r2=1044001&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 15:17:51 2010
@@ -31,7 +31,7 @@ public class FileConsumerPollStrategyRol
private static volatile String event = "";
- private String fileUrl =
"file://target/pollstrategy/?pollStrategy=#myPoll";
+ private String fileUrl =
"file://target/pollstrategy/?pollStrategy=#myPoll&initialDelay=0&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -49,7 +49,7 @@ public class FileConsumerPollStrategyRol
public void testRollbackThrowException() throws Exception {
// let it run for a little, but it fails all the time
- Thread.sleep(2000);
+ Thread.sleep(20);
// and we should rollback X number of times
assertTrue(event.startsWith("rollback"));
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=1044001&r1=1044000&r2=1044001&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 15:17:51 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&delay=10";
+ private String fileUrl =
"file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true&initialDelay=0&delay=10";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -55,8 +55,10 @@ public class FileConsumerPollStrategyTes
assertMockEndpointsSatisfied();
+ oneExchangeDone.matchesMockWaitTime();
+
// give file consumer a bit time
- Thread.sleep(250);
+ Thread.sleep(20);
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=1044001&r1=1044000&r2=1044001&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 15:17:51 2010
@@ -55,14 +55,14 @@ public class FileConsumerPreMoveDeleteTe
template.sendBodyAndHeader("file://target/premove", "Hello World",
Exchange.FILE_NAME, "hello.txt");
// give time for consumer to process this file before we drop the next
file
- Thread.sleep(2000);
+ Thread.sleep(100);
template.sendBodyAndHeader("file://target/premove", "Hello Again
World", Exchange.FILE_NAME, "hello.txt");
// give time for consumer to process this file before we drop the next
file
assertMockEndpointsSatisfied();
// and file should still be deleted
- Thread.sleep(1000);
+ Thread.sleep(250);
File pre = new File("target/premove/work/hello.txt").getAbsoluteFile();
assertFalse("Pre move file should have been deleted", pre.exists());
@@ -73,7 +73,7 @@ public class FileConsumerPreMoveDeleteTe
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("file://target/premove?preMove=work&delete=true&idempotent=false")
+
from("file://target/premove?preMove=work&delete=true&idempotent=false&initialDelay=0&delay=10")
.process(new MyPreMoveCheckerProcessor())
.to("mock:result");
}
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=1044001&r1=1044000&r2=1044001&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 15:17:51 2010
@@ -55,14 +55,14 @@ public class FileConsumerPreMoveNoopTest
template.sendBodyAndHeader("file://target/premove", "Hello World",
Exchange.FILE_NAME, "hello.txt");
// give time for consumer to process this file before we drop the next
file
- Thread.sleep(2000);
+ Thread.sleep(100);
template.sendBodyAndHeader("file://target/premove", "Hello Again
World", Exchange.FILE_NAME, "hello.txt");
// give time for consumer to process this file before we drop the next
file
assertMockEndpointsSatisfied();
// and file should still be there in premove directory
- Thread.sleep(1000);
+ Thread.sleep(250);
File pre = new File("target/premove/work/hello.txt").getAbsoluteFile();
assertTrue("Pre move file should exist", pre.exists());
@@ -73,7 +73,7 @@ public class FileConsumerPreMoveNoopTest
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("file://target/premove?preMove=work&noop=true&idempotent=false")
+
from("file://target/premove?preMove=work&noop=true&idempotent=false&initialDelay=0&delay=10")
.process(new MyPreMoveCheckerProcessor())
.to("mock:result");
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPreMoveTest.java
Thu Dec 9 15:17:51 2010
@@ -50,7 +50,7 @@ public class FileConsumerPreMoveTest ext
template.sendBodyAndHeader("file://target/premove", "Hello World",
Exchange.FILE_NAME, "hello.txt");
// give time for consumer to process this file before we drop the next
file
- Thread.sleep(2000);
+ Thread.sleep(100);
template.sendBodyAndHeader("file://target/premove", "Hello Again
World", Exchange.FILE_NAME, "hello.txt");
// give time for consumer to process this file before we drop the next
file
assertMockEndpointsSatisfied();
@@ -61,7 +61,7 @@ public class FileConsumerPreMoveTest ext
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://target/premove?preMove=work/work-${file:name}")
+
from("file://target/premove?preMove=work/work-${file:name}&initialDelay=0&delay=10")
.process(new MyPreMoveCheckerProcessor())
.to("mock:result");
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendAndResumeTest.java
Thu Dec 9 15:17:51 2010
@@ -33,9 +33,13 @@ public class FileConsumerSuspendAndResum
private MyPolicy myPolicy = new MyPolicy();
- public void testConsumeSuspendAndResumeFile() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/suspended");
+ super.setUp();
+ }
+ public void testConsumeSuspendAndResumeFile() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -44,7 +48,7 @@ public class FileConsumerSuspendAndResum
assertMockEndpointsSatisfied();
- Thread.sleep(1000);
+ Thread.sleep(100);
// the route is suspended by the policy so we should only receive one
String[] files = new
File("target/suspended/").getAbsoluteFile().list();
@@ -52,6 +56,7 @@ public class FileConsumerSuspendAndResum
assertEquals("The file should exists", 1, files.length);
// reset mock
+ oneExchangeDone.reset();
mock.reset();
mock.expectedMessageCount(1);
@@ -59,8 +64,7 @@ public class FileConsumerSuspendAndResum
myPolicy.resumeConsumer();
assertMockEndpointsSatisfied();
-
- Thread.sleep(500);
+ oneExchangeDone.matchesMockWaitTime();
// and the file is now deleted
files = new File("target/suspended/").getAbsoluteFile().list();
@@ -73,7 +77,7 @@ public class FileConsumerSuspendAndResum
return new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("file://target/suspended?maxMessagesPerPoll=1&delete=true")
+
from("file://target/suspended?maxMessagesPerPoll=1&delete=true&initialDelay=0&delay=10")
.routePolicy(myPolicy).id("myRoute")
.convertBodyTo(String.class).to("mock:result");
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerSuspendTest.java
Thu Dec 9 15:17:51 2010
@@ -30,9 +30,13 @@ import org.apache.camel.impl.RoutePolicy
*/
public class FileConsumerSuspendTest extends ContextTestSupport {
- public void testConsumeSuspendFile() throws Exception {
+ @Override
+ protected void setUp() throws Exception {
deleteDirectory("target/suspended");
+ super.setUp();
+ }
+ public void testConsumeSuspendFile() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -40,8 +44,7 @@ public class FileConsumerSuspendTest ext
template.sendBodyAndHeader("file://target/suspended", "Hello World",
Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
-
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
// the route is suspended by the policy so we should only receive one
String[] files = new
File("target/suspended/").getAbsoluteFile().list();
@@ -55,7 +58,7 @@ public class FileConsumerSuspendTest ext
@Override
public void configure() throws Exception {
MyPolicy myPolicy = new MyPolicy();
-
from("file://target/suspended?maxMessagesPerPoll=1&delete=true")
+
from("file://target/suspended?maxMessagesPerPoll=1&delete=true&initialDelay=0&delay=10")
.routePolicy(myPolicy).id("myRoute")
.convertBodyTo(String.class).to("mock:result");
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadNoneStrategyTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadNoneStrategyTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadNoneStrategyTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileExclusiveReadNoneStrategyTest.java
Thu Dec 9 15:17:51 2010
@@ -36,6 +36,13 @@ public class FileExclusiveReadNoneStrate
private String fileUrl =
"file://target/exclusiveread/slowfile?noop=true&consumer.delay=500&readLock=none";
@Override
+ protected void setUp() throws Exception {
+ deleteDirectory("./target/exclusiveread");
+ createDirectory("./target/exclusiveread/slowfile");
+ super.setUp();
+ }
+
+ @Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
@@ -47,8 +54,6 @@ public class FileExclusiveReadNoneStrate
}
public void testPollFileWhileSlowFileIsBeingWritten() throws Exception {
- deleteDirectory("./target/exclusiveread");
- createDirectory("./target/exclusiveread/slowfile");
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollEnrichTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollEnrichTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollEnrichTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FilePollEnrichTest.java
Thu Dec 9 15:17:51 2010
@@ -44,9 +44,9 @@ public class FilePollEnrichTest extends
template.sendBodyAndHeader("file:target/pollenrich", "Hello World",
Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
+ oneExchangeDone.matchesMockWaitTime();
// file should be moved
- Thread.sleep(1000);
File file = new File("target/pollenrich/hello.txt").getAbsoluteFile();
assertFalse("File should have been moved", file.exists());
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileProducerTempFileExistsIssueTest.java
Thu Dec 9 15:17:51 2010
@@ -44,13 +44,8 @@ public class FileProducerTempFileExistsI
deleteDirectory("target/tempprefix");
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
-
- Thread.sleep(200);
-
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo",
"Bye World", Exchange.FILE_NAME, "hello.txt");
- Thread.sleep(200);
-
File file = new File("target/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
assertEquals("Bye World",
context.getTypeConverter().convertTo(String.class, file));
@@ -61,13 +56,8 @@ public class FileProducerTempFileExistsI
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "foohello.txt");
-
- Thread.sleep(200);
-
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo",
"Bye World", Exchange.FILE_NAME, "hello.txt");
- Thread.sleep(200);
-
File file = new File("target/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
assertEquals("Bye World",
context.getTypeConverter().convertTo(String.class, file));
@@ -77,13 +67,8 @@ public class FileProducerTempFileExistsI
deleteDirectory("target/tempprefix");
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
-
- Thread.sleep(200);
-
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo&fileExist=Override",
"Bye World", Exchange.FILE_NAME, "hello.txt");
- Thread.sleep(200);
-
File file = new File("target/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
assertEquals("Bye World",
context.getTypeConverter().convertTo(String.class, file));
@@ -93,13 +78,8 @@ public class FileProducerTempFileExistsI
deleteDirectory("target/tempprefix");
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
-
- Thread.sleep(200);
-
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo&fileExist=Ignore",
"Bye World", Exchange.FILE_NAME, "hello.txt");
- Thread.sleep(200);
-
File file = new File("target/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
// should not write new file as we should ignore
@@ -110,9 +90,6 @@ public class FileProducerTempFileExistsI
deleteDirectory("target/tempprefix");
template.sendBodyAndHeader("file://target/tempprefix", "Hello World",
Exchange.FILE_NAME, "hello.txt");
-
- Thread.sleep(200);
-
try {
template.sendBodyAndHeader("file://target/tempprefix?tempPrefix=foo&fileExist=Fail",
"Bye World", Exchange.FILE_NAME, "hello.txt");
fail("Should have thrown an exception");
@@ -121,12 +98,11 @@ public class FileProducerTempFileExistsI
assertTrue(cause.getMessage().startsWith("File already exist"));
}
- Thread.sleep(200);
-
File file = new File("target/tempprefix/hello.txt").getAbsoluteFile();
assertEquals(true, file.exists());
// should not write new file as we should fail
assertEquals("Hello World",
context.getTypeConverter().convertTo(String.class, file));
}
+
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotDeleteFileIfProcessFailsTest.java
Thu Dec 9 15:17:51 2010
@@ -46,9 +46,7 @@ public class FromFileDoNotDeleteFileIfPr
mock.expectedMinimumMessageCount(1);
mock.assertIsSatisfied();
-
- // give time to NOT delete file
- Thread.sleep(200);
+ oneExchangeDone.matchesMockWaitTime();
// assert the file is deleted
File file = new File("./target/deletefile/hello.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileDoNotMoveFileIfProcessFailsTest.java
Thu Dec 9 15:17:51 2010
@@ -45,9 +45,7 @@ public class FromFileDoNotMoveFileIfProc
mock.message(0).body(String.class).isEqualTo(body);
mock.assertIsSatisfied();
-
- // give time to NOT delete file
- Thread.sleep(1000);
+ oneExchangeDone.matchesMockWaitTime();
// assert the file is not moved
File file = new File("./target/movefile/hello.txt");
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFilePollThirdTimeOkTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFilePollThirdTimeOkTest.java?rev=1044001&r1=1044000&r2=1044001&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFilePollThirdTimeOkTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFilePollThirdTimeOkTest.java
Thu Dec 9 15:17:51 2010
@@ -21,6 +21,7 @@ import java.io.File;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
/**
@@ -38,6 +39,8 @@ public class FromFilePollThirdTimeOkTest
}
public void testPollFileAndShouldBeDeletedAtThirdPoll() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(3).create();
+
template.sendBodyAndHeader("file://target/deletefile", body,
Exchange.FILE_NAME, "hello.txt");
getMockEndpoint("mock:result").expectedBodiesReceived(body);
@@ -45,9 +48,7 @@ public class FromFilePollThirdTimeOkTest
getMockEndpoint("mock:error").expectedMessageCount(2);
assertMockEndpointsSatisfied();
-
- // give time to delete file
- Thread.sleep(500);
+ notify.matchesMockWaitTime();
assertEquals(3, counter);
@@ -63,7 +64,7 @@ public class FromFilePollThirdTimeOkTest
// no redeliveries as we want the file consumer to try again
errorHandler(deadLetterChannel("mock:error").maximumRedeliveries(0).logStackTrace(false).handled(false));
- from("file://target/deletefile?delete=true").process(new
Processor() {
+
from("file://target/deletefile?delete=true&initialDelay=0&delay=10").process(new
Processor() {
public void process(Exchange exchange) throws Exception {
counter++;
if (counter < 3) {
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=1044001&r1=1044000&r2=1044001&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 15:17:51 2010
@@ -19,6 +19,7 @@ package org.apache.camel.component.seda;
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.spi.Synchronization;
@@ -35,14 +36,15 @@ public class SedaUnitOfWorkTest extends
private static volatile String lastOne;
public void testSedaUOW() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
+
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
template.sendBody("direct:start", "Hello World");
assertMockEndpointsSatisfied();
-
- oneExchangeDone.matchesMockWaitTime();
+ notify.matchesMockWaitTime();
assertEquals("onCompleteA", sync);
assertEquals("onCompleteA", lastOne);
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=1044001&r1=1044000&r2=1044001&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 15:17:51 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,13 +35,14 @@ public class GzipDataFormatFileUnmarshal
}
public void testGzipFileUnmarshalDelete() throws Exception {
+ NotifyBuilder notify = new NotifyBuilder(context).whenDone(2).create();
+
getMockEndpoint("mock:result").expectedBodiesReceived("Hello World");
template.sendBodyAndHeader("file:target/gzip", "Hello World",
Exchange.FILE_NAME, "hello.txt");
assertMockEndpointsSatisfied();
-
- oneExchangeDone.matchesMockWaitTime();
+ notify.matchesMockWaitTime();
File in = new File("target/gzip/hello.txt").getAbsoluteFile();
assertFalse("Should have been deleted " + in, in.exists());
