Author: davsclaus
Date: Sun Apr 6 09:01:38 2008
New Revision: 645256
URL: http://svn.apache.org/viewvc?rev=645256&view=rev
Log:
CAMEL-444: Properly stopping down FTPServer when doing unit tests to get rid of
WARN
Modified:
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Modified:
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.java
Sun Apr 6 09:01:38 2008
@@ -52,8 +52,8 @@
this.client = client;
}
- // TODO: is there a way to avoid copy-pasting the reconnect logic?
protected void connectIfNecessary() throws IOException {
+ // TODO: is there a way to avoid copy-pasting the reconnect logic?
if (!client.isConnected()) {
LOG.warn("FtpConsumer's client isn't connected, trying to
reconnect...");
endpoint.connect(client);
@@ -61,13 +61,11 @@
}
}
- // TODO: is there a way to avoid copy-pasting the reconnect logic?
protected void disconnect() throws IOException {
LOG.info("FtpConsumer's client is being explicitly disconnected");
endpoint.disconnect(client);
}
- // TODO: is there a way to avoid copy-pasting the reconnect logic?
protected void poll() throws Exception {
connectIfNecessary();
// If the attempt to connect isn't successful, then the thrown
Modified:
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpProducer.java
Sun Apr 6 09:01:38 2008
@@ -38,7 +38,6 @@
this.client = client;
}
- // TODO: is there a way to avoid copy-pasting the reconnect logic?
public void process(Exchange exchange) throws Exception {
connectIfNecessary();
// If the attempt to connect isn't successful, then the thrown
@@ -61,8 +60,8 @@
}
}
- // TODO: is there a way to avoid copy-pasting the reconnect logic?
protected void connectIfNecessary() throws IOException {
+ // TODO: is there a way to avoid copy-pasting the reconnect logic?
if (!client.isConnected()) {
LOG.warn("FtpProducer's client isn't connected, trying to
reconnect...");
endpoint.connect(client);
@@ -70,7 +69,6 @@
}
}
- // TODO: is there a way to avoid copy-pasting the reconnect logic?
public void disconnect() throws IOException {
LOG.info("FtpProducer's client is being explicitly disconnected");
endpoint.disconnect(client);
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFileToFtpTest.java
Sun Apr 6 09:01:38 2008
@@ -27,10 +27,13 @@
private String port = "20011";
private String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/tmp2/camel?password=admin";
- public void testFtpRoute() throws Exception {
+ public void testFromFileToFtp() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
resultEndpoint.assertIsSatisfied();
+
+ // let some time pass to let the consumer etc. properly do its
business before closing
+ Thread.sleep(2000);
}
public String getPort() {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToAsciiFileTest.java
Sun Apr 6 09:01:38 2008
@@ -36,6 +36,9 @@
resultEndpoint.expectedMinimumMessageCount(1);
resultEndpoint.expectedBodiesReceived("Hello World from FTPServer");
resultEndpoint.assertIsSatisfied();
+
+ // let some time pass to let the consumer etc. properly do its
business before closing
+ Thread.sleep(2000);
}
public String getPort() {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFileTest.java
Sun Apr 6 09:01:38 2008
@@ -48,6 +48,9 @@
File file = new File("target/ftptest/deleteme.jpg");
assertTrue("The binary file should exists", file.exists());
assertTrue("Logo size wrong", file.length() > 10000);
+
+ // let some time pass to let the consumer etc. properly do its
business before closing
+ Thread.sleep(2000);
}
public String getPort() {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToFileNoFileNameHeaderTest.java
Sun Apr 6 09:01:38 2008
@@ -44,6 +44,9 @@
File file = new File("target/ftptest/hello.txt");
assertTrue("The file should exists", file.exists());
assertTrue("File size wrong", file.length() > 10);
+
+ // let some time pass to let the consumer etc. properly do its
business before closing
+ Thread.sleep(2000);
}
public String getPort() {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToMockTest.java
Sun Apr 6 09:01:38 2008
@@ -38,6 +38,9 @@
template.sendBodyAndHeader(ftpUrl, expectedBody, "cheese", 123);
resultEndpoint.assertIsSatisfied();
+
+ // let some time pass to let the consumer etc. properly do its
business before closing
+ Thread.sleep(2000);
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java?rev=645256&r1=645255&r2=645256&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpServerTestSupport.java
Sun Apr 6 09:01:38 2008
@@ -40,8 +40,9 @@
}
protected void tearDown() throws Exception {
- ftpServer.stop();
super.tearDown();
+ // must stop server after super to let the clients stop correctly
(CAMEL-444)
+ ftpServer.stop();
}
protected void initFtpServer() throws Exception {
