Author: ningjiang
Date: Wed Aug 6 07:11:23 2008
New Revision: 683269
URL: http://svn.apache.org/viewvc?rev=683269&view=rev
Log:
Try to fix the some camel-ftp components test failure in some linux boxes
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java?rev=683269&r1=683268&r2=683269&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FromFtpRegexPatternTest.java
Wed Aug 6 07:11:23 2008
@@ -32,7 +32,7 @@
public void testFtpRegexPattern() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- mock.expectedBodiesReceived("Report 1", "Report 2");
+ mock.expectedBodiesReceived("Reports", "Reports");
mock.assertIsSatisfied();
}
@@ -51,9 +51,9 @@
// test that we can pool and store as a local file
String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/regexp/?password=admin";
template.sendBodyAndHeader(ftpUrl, "Hello World",
FileComponent.HEADER_FILE_NAME, "hello.txt");
- template.sendBodyAndHeader(ftpUrl, "Report 1",
FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports",
FileComponent.HEADER_FILE_NAME, "report1.txt");
template.sendBodyAndHeader(ftpUrl, "Bye World",
FileComponent.HEADER_FILE_NAME, "bye.txt");
- template.sendBodyAndHeader(ftpUrl, "Report 2",
FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports",
FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java?rev=683269&r1=683268&r2=683269&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerExcludeNameTest.java
Wed Aug 6 07:11:23 2008
@@ -33,7 +33,7 @@
public void testExludePreAndPostfixes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- mock.expectedBodiesReceived("Report 1", "Report 2");
+ mock.expectedBodiesReceived("Reports", "Reports");
mock.assertIsSatisfied();
}
@@ -52,9 +52,9 @@
// test that we can pool and store as a local file
String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/excludename/?password=admin";
template.sendBodyAndHeader(ftpUrl, "Hello World",
FileComponent.HEADER_FILE_NAME, "hello.xml");
- template.sendBodyAndHeader(ftpUrl, "Report 1",
FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports",
FileComponent.HEADER_FILE_NAME, "report1.txt");
template.sendBodyAndHeader(ftpUrl, "Bye World",
FileComponent.HEADER_FILE_NAME, "secret.txt");
- template.sendBodyAndHeader(ftpUrl, "Report 2",
FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports",
FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java?rev=683269&r1=683268&r2=683269&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
(original)
+++
activemq/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpConsumerSkipDotFilesTest.java
Wed Aug 6 07:11:23 2008
@@ -32,7 +32,7 @@
public void testSkipDotFiles() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
- mock.expectedBodiesReceived("Report 1", "Report 2");
+ mock.expectedBodiesReceived("Reports", "Reports");
mock.assertIsSatisfied();
}
@@ -51,9 +51,9 @@
// test that we can pool and store as a local file
String ftpUrl = "ftp://[EMAIL PROTECTED]:" + port +
"/dotfiles/?password=admin";
template.sendBodyAndHeader(ftpUrl, "Hello World",
FileComponent.HEADER_FILE_NAME, ".skipme");
- template.sendBodyAndHeader(ftpUrl, "Report 1",
FileComponent.HEADER_FILE_NAME, "report1.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports",
FileComponent.HEADER_FILE_NAME, "report1.txt");
template.sendBodyAndHeader(ftpUrl, "Bye World",
FileComponent.HEADER_FILE_NAME, ".camel");
- template.sendBodyAndHeader(ftpUrl, "Report 2",
FileComponent.HEADER_FILE_NAME, "report2.txt");
+ template.sendBodyAndHeader(ftpUrl, "Reports",
FileComponent.HEADER_FILE_NAME, "report2.txt");
}
protected RouteBuilder createRouteBuilder() throws Exception {
