camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r678246 - in /activemq/camel/trunk/components/camel-ftp/src: main/java/org/apache/camel/component/file/remote/FtpConsumer.java test/data/ftpbinarytest/logo1.jpeg test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
Date Sun, 20 Jul 2008 02:50:48 GMT
Author: ningjiang
Date: Sat Jul 19 19:50:48 2008
New Revision: 678246

URL: http://svn.apache.org/viewvc?rev=678246&view=rev
Log:
CAMEL-738 applied patch with thanks to Ryadh

Added:
    activemq/camel/trunk/components/camel-ftp/src/test/data/ftpbinarytest/logo1.jpeg   (with
props)
    activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
  (with props)
Modified:
    activemq/camel/trunk/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpConsumer.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=678246&r1=678245&r2=678246&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
Sat Jul 19 19:50:48 2008
@@ -113,6 +113,7 @@
                 LOG.warn("Unsupported type of FTPFile: " + ftpFile + " not a file or directory");
             }
         }
+        client.changeToParentDirectory();
     }
 
     protected String getFullFileName(FTPFile ftpFile) throws IOException {

Added: activemq/camel/trunk/components/camel-ftp/src/test/data/ftpbinarytest/logo1.jpeg
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/data/ftpbinarytest/logo1.jpeg?rev=678246&view=auto
==============================================================================
Binary file - no diff available.

Propchange: activemq/camel/trunk/components/camel-ftp/src/test/data/ftpbinarytest/logo1.jpeg
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java?rev=678246&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
(added)
+++ activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
Sat Jul 19 19:50:48 2008
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file.remote;
+
+import java.io.File;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Producer;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.file.FileComponent;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.converter.IOConverter;
+
+/**
+ * Unit test to verify that we can pool a BINARY file from the FTP Server and store it on
a local file path
+ */
+public class FromFtpToBinaryFilesTest extends FtpServerTestSupport {
+
+    private String port = "20014";
+    // must user "consumer." prefix on the parameters to the file component
+    private String ftpUrl = "ftp://admin@localhost:" + port + "/incoming?password=admin&binary=true"
+        + "&consumer.delay=2000&consumer.recursive=true&consumer.append=false";
+
+    public void testFtpRoute() throws Exception {
+        MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
+        resultEndpoint.expectedMessageCount(2);
+        resultEndpoint.assertIsSatisfied();
+        Exchange ex = resultEndpoint.getExchanges().get(0);
+        byte[] bytes = ex.getIn().getBody(byte[].class);
+        assertTrue("Logo size wrong", bytes.length > 10000);
+
+        // wait until the file producer has written the file
+        Thread.sleep(1000);
+
+        // assert the file
+        File file = new File("target/ftptest/a/logo1.jpeg");
+        assertTrue("The binary file should exists", file.exists());
+        assertTrue("Logo size wrong", file.length() > 10000);
+
+        // assert the file
+        file = new File("target/ftptest/logo.jpeg");
+        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(1000);
+    }
+
+    public String getPort() {
+        return port;
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        prepareFtpServer();
+    }
+
+    private void prepareFtpServer() throws Exception {
+        // prepares the FTP Server by creating a file on the server that we want to unit
+        // test that we can pool and store as a local file
+        String ftpUrl = "ftp://admin@localhost:" + port + "/incoming?password=admin&binary=true"
+            + "&consumer.delay=2000&consumer.recursive=false&consumer.append=false";
+        Endpoint endpoint = context.getEndpoint(ftpUrl);
+        Exchange exchange = endpoint.createExchange();
+        exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo.jpeg"));
+        exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo.jpeg");
+        Producer producer = endpoint.createProducer();
+        producer.start();
+        producer.process(exchange);
+        producer.stop();
+        ftpUrl = "ftp://admin@localhost:" + port + "/incoming/a?password=admin&binary=true"
+            + "&consumer.delay=2000&consumer.recursive=false&consumer.append=false";
+        endpoint = context.getEndpoint(ftpUrl);
+        exchange = endpoint.createExchange();
+        exchange.getIn().setBody(IOConverter.toFile("src/test/data/ftpbinarytest/logo1.jpeg"));
+        exchange.getIn().setHeader(FileComponent.HEADER_FILE_NAME, "logo1.jpeg");
+        producer = endpoint.createProducer();
+        producer.start();
+        producer.process(exchange);
+        producer.stop();
+    }
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                String fileUrl = "file:target/ftptest/?noop=true";
+                from(ftpUrl).to(fileUrl, "mock:result");
+            }
+        };
+    }
+
+}

Propchange: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpToBinaryFilesTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message