Author: davsclaus
Date: Sat Jul 26 08:01:16 2008
New Revision: 680003
URL: http://svn.apache.org/viewvc?rev=680003&view=rev
Log:
Fixed failing on Bamboo as it cant stop the FTPServer fast enough.
Added:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
- copied, changed from r679990,
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java?rev=680003&r1=680002&r2=680003&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java
Sat Jul 26 08:01:16 2008
@@ -31,21 +31,11 @@
private static final Log LOG =
LogFactory.getLog(FromFtpExclusiveReadTest.class);
- private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + getPort() +
"/slowfile?password=admin&binary=false&consumer.exclusiveRead=true&consumer.delay=500";
+ private String port = "20019";
+ private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/slowfile?password=admin&binary=false&consumer.exclusiveRead=true&consumer.delay=500";
public String getPort() {
- return "20019";
- }
-
- public void testPoolIn3SecondsButNoFiles() throws Exception {
- deleteDirectory("./res/home");
- createDirectory("./res/home/slowfile");
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(0);
-
- Thread.sleep(3 * 1000L);
-
- mock.assertIsSatisfied();
+ return port;
}
public void testPollFileWhileSlowFileIsBeingWritten() throws Exception {
Copied:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
(from r679990,
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java)
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java?p2=activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java&p1=activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java&r1=679990&r2=680003&rev=680003&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpExclusiveReadTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpNoFilesTest.java
Sat Jul 26 08:01:16 2008
@@ -25,16 +25,17 @@
import org.apache.commons.logging.LogFactory;
/**
- * Unit test to verify exclusive read - that we do not poll files that is in
progress of being written.
+ * Unit test to verify polling a server with no files to poll.
*/
-public class FromFtpExclusiveReadTest extends FtpServerTestSupport {
+public class FromFtpNoFilesTest extends FtpServerTestSupport {
private static final Log LOG =
LogFactory.getLog(FromFtpExclusiveReadTest.class);
- private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + getPort() +
"/slowfile?password=admin&binary=false&consumer.exclusiveRead=true&consumer.delay=500";
+ private String port = "20020";
+ private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/slowfile?password=admin&binary=false&consumer.exclusiveRead=true&consumer.delay=500";
public String getPort() {
- return "20019";
+ return port;
}
public void testPoolIn3SecondsButNoFiles() throws Exception {
@@ -48,32 +49,6 @@
mock.assertIsSatisfied();
}
- public void testPollFileWhileSlowFileIsBeingWritten() throws Exception {
- deleteDirectory("./res/home");
- createDirectory("./res/home/slowfile");
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
- mock.expectedBodiesReceived("Hello WorldLine #0Line #1Line #2Bye
World");
-
- createSlowFile();
-
- mock.assertIsSatisfied();
- }
-
- private void createSlowFile() throws Exception {
- LOG.info("Creating a slow file ...");
- File file = new File("./res/home/slowfile/hello.txt");
- FileOutputStream fos = new FileOutputStream(file);
- fos.write("Hello World".getBytes());
- for (int i = 0; i < 3; i++) {
- Thread.sleep(1000);
- fos.write(("Line #" + i).getBytes());
- LOG.info("Appending to slowfile");
- }
- fos.write("Bye World".getBytes());
- fos.close();
- LOG.info("... done creating slowfile");
- }
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -87,4 +62,4 @@
File file = new File(s);
file.mkdirs();
}
-}
+}
\ No newline at end of file
