Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-03-01 00:07:23 +0000
committerslewis2007-03-01 00:07:23 +0000
commit804e655b3a30daa1d0240f9897c9df59d3bf82c3 (patch)
tree4e03e7de2f689270cf24e7f9cfe73316f33752fc /tests/bundles/org.eclipse.ecf.tests.filetransfer
parent702b6cdf67e8834e033234ec3e3940156f3c42f2 (diff)
downloadorg.eclipse.ecf-804e655b3a30daa1d0240f9897c9df59d3bf82c3.tar.gz
org.eclipse.ecf-804e655b3a30daa1d0240f9897c9df59d3bf82c3.tar.xz
org.eclipse.ecf-804e655b3a30daa1d0240f9897c9df59d3bf82c3.zip
Fix for bug reported by Pascal Rapicault via email on 2/28/07
Diffstat (limited to 'tests/bundles/org.eclipse.ecf.tests.filetransfer')
-rwxr-xr-xtests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/MultiFileTransferRetrieveTest.java15
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/MultiFileTransferRetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/MultiFileTransferRetrieveTest.java
index 518708ccf..8cfc229f8 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/MultiFileTransferRetrieveTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/MultiFileTransferRetrieveTest.java
@@ -58,7 +58,10 @@ public class MultiFileTransferRetrieveTest extends ContainerAbstractTestCase {
Enumeration files = Activator.getDefault().getBundle().getEntryPaths(TESTSRCPATH);
for( ; files.hasMoreElements(); ) {
URL url = Activator.getDefault().getBundle().getEntry((String) files.nextElement());
- srcFiles.add(url.toExternalForm());
+ String file = url.getFile();
+ if (file != null && !file.equals("") && !file.endsWith("/")) {
+ srcFiles.add(url.toExternalForm());
+ }
}
// Make target directory if it's not there
File targetDir = new File(TESTTARGETPATH);
@@ -104,8 +107,14 @@ public class MultiFileTransferRetrieveTest extends ContainerAbstractTestCase {
} else if (event instanceof IIncomingFileTransferReceiveDataEvent) {
printFileInfo("DATA",event,targetFile);
} else if (event instanceof IIncomingFileTransferReceiveDoneEvent) {
- printFileInfo("DONE",event,targetFile);
- assertTrue(srcFile.length()==targetFile.length());
+ try {
+ bufferedStream.flush();
+ printFileInfo("DONE",event,targetFile);
+ assertTrue(srcFile.length()==targetFile.length());
+ } catch (IOException e) {
+ e.printStackTrace();
+ fail(e.getLocalizedMessage());
+ }
} else {
printFileInfo("OTHER",event,targetFile);
}

Back to the top