Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 64213 invoked from network); 4 Feb 2011 11:46:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Feb 2011 11:46:19 -0000 Received: (qmail 47302 invoked by uid 500); 4 Feb 2011 11:46:19 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 47249 invoked by uid 500); 4 Feb 2011 11:46:17 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 47242 invoked by uid 99); 4 Feb 2011 11:46:16 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Feb 2011 11:46:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Feb 2011 11:46:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DE82D238890A; Fri, 4 Feb 2011 11:45:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1067159 - /camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java Date: Fri, 04 Feb 2011 11:45:53 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110204114553.DE82D238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: davsclaus Date: Fri Feb 4 11:45:53 2011 New Revision: 1067159 URL: http://svn.apache.org/viewvc?rev=1067159&view=rev Log: CAMEL-3617: Fixed test on windows Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java?rev=1067159&r1=1067158&r2=1067159&view=diff ============================================================================== --- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java (original) +++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerExpressionTest.java Fri Feb 4 11:45:53 2011 @@ -85,11 +85,14 @@ public class FtpProducerExpressionTest e @Test public void testProducerComplexByExpression() throws Exception { + // need one extra subdirectory (=foo) to be able to start with .. in the fileName option + String url = "ftp://admin@localhost:" + getPort() + "/filelanguage/foo?password=admin"; + String expression = "../filelanguageinbox/myfile-${bean:myguidgenerator.guid}-${date:now:yyyyMMdd}.txt"; - template.sendBody(getFtpUrl() + "&fileName=" + expression, "Hello World"); + template.sendBody(url + "&fileName=" + expression, "Hello World"); String date = new SimpleDateFormat("yyyyMMdd").format(new Date()); - assertFileExists(FTP_ROOT_DIR + "filelanguageinbox/myfile-123-" + date + ".txt"); + assertFileExists(FTP_ROOT_DIR + "filelanguage/filelanguageinbox/myfile-123-" + date + ".txt"); } @Test