Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3593: Fix FTP PartialSuccess Tests

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3593

Sort the files for the MPUT tests.
This commit is contained in:
Gary Russell
2015-07-20 13:28:20 -04:00
parent f99183afca
commit 22ee6586a0
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests-context.xml
View File

@@ -78,6 +78,7 @@
filename-pattern="*.txt"
expression="payload"
remote-directory="ftpTarget"
mput-filter="sortingFilter"
reply-channel="output"/>
<int:channel id="inboundMPutRecursive"/>
@@ -90,6 +91,7 @@
filename-pattern="*.txt"
expression="payload"
remote-directory="ftpTarget"
mput-filter="sortingFilter"
reply-channel="output"/>
<int:channel id="inboundMPutRecursiveFiltered"/>
@@ -155,4 +157,7 @@
auto-create-directory="true"
remote-file-separator="/" />
<bean id="sortingFilter"
class="org.springframework.integration.ftp.outbound.FtpServerOutboundTests$SortingFileListFilter"/>
</beans>

27
spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpServerOutboundTests.java
View File

@@ -38,6 +38,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Comparator;
import java.util.List;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
@@ -57,6 +58,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.integration.channel.DirectChannel;
import org.springframework.integration.file.FileHeaders;
import org.springframework.integration.file.filters.FileListFilter;
import org.springframework.integration.file.remote.InputStreamCallback;
import org.springframework.integration.file.remote.RemoteFileTemplate;
import org.springframework.integration.file.remote.SessionCallback;
@@ -533,4 +535,29 @@ public class FtpServerOutboundTests {
assertEquals(6, files[0].getSize());
}
public static class SortingFileListFilter implements FileListFilter<File> {
@Override
public List<File> filterFiles(File[] files) {
File[] sorted = Arrays.copyOf(files, files.length);
Arrays.sort(sorted, new Comparator<File>() {
@Override
public int compare(File o1, File o2) {
if (o1.isDirectory() && !o2.isDirectory()) {
return 1;
}
else if (!o1.isDirectory() && o2.isDirectory()) {
return -1;
}
else {
return o1.getName().compareTo(o2.getName());
}
}
});
return Arrays.asList(sorted);
}
}
}