merge test case by @rednoah

closes #10
apache · Nov 7, 2015 · 84e5abf · 84e5abf
1 parent bfefc40
commit 84e5abf
Showing 1 changed file with 33 additions and 0 deletions.
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java
@@ -29,6 +29,9 @@
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.condition.FilesMatch;
 import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.types.resources.Sort;
+import org.apache.tools.ant.types.resources.comparators.Name;
+import org.apache.tools.ant.types.resources.comparators.Reverse;
 import org.apache.tools.ant.types.selectors.FilenameSelector;
 import org.junit.After;
 import org.junit.Before;
@@ -147,6 +150,36 @@ public void testMultiUploadAndDownload() throws IOException {
         }
     }
 
+    @Test
+    public void testMultiResourceCollectionUpload() throws IOException {
+        assertNotNull("system property scp.tmp must be set", tempDir);
+        List uploadList = new ArrayList();
+        for (int i = 0; i < 5; i++) {
+            uploadList.add(createTemporaryFile());
+        }
+
+        Scp scp = createTask();
+
+        // reverse order resource collection
+        Sort sort = new Sort();
+        sort.setProject(scp.getProject());
+        Reverse reverse = new Reverse();
+        reverse.add(new Name());
+        sort.add(reverse);
+
+        FilenameSelector selector = new FilenameSelector();
+        selector.setName("scp*");
+        FileSet fileset = new FileSet();
+        fileset.setProject(scp.getProject());
+        fileset.setDir(tempDir);
+        fileset.addFilename(selector);
+        sort.add(fileset);
+        scp.add(sort);
+
+        scp.setTodir(sshHostUri);
+        scp.execute();
+    }
+
     @Test
     public void testRemoteToDir() throws IOException {
         Scp scpTask = createTask();