Fix for filetransfer tests. URLs were obsolete, and there was a race in test code. Fixed now

2 files changed, 19 insertions, 1 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/GetRemoteFileNameTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/GetRemoteFileNameTest.java
index 870736a54..7d4df0b34 100755..100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/GetRemoteFileNameTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/GetRemoteFileNameTest.java
@@ -49,6 +49,9 @@ public class GetRemoteFileNameTest extends AbstractRetrieveTestCase {
 		tmpFile = null;
 	}
 
+	private boolean done = false;
+	private Object lock = new Object();
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.ecf.tests.filetransfer.AbstractRetrieveTestCase#handleStartEvent(org.eclipse.ecf.filetransfer.events.IIncomingFileTransferReceiveStartEvent)
 	 */
@@ -58,6 +61,10 @@ public class GetRemoteFileNameTest extends AbstractRetrieveTestCase {
 		assertNotNull(event.getFileID().getFilename());
 		try {
 			incomingFileTransfer = event.receive(tmpFile);
+			synchronized (lock) {
+				done = true;
+				lock.notify();
+			}
 		} catch (final IOException e) {
 			fail(e.getLocalizedMessage());
 		}
@@ -67,8 +74,19 @@ public class GetRemoteFileNameTest extends AbstractRetrieveTestCase {
 		assertNotNull(retrieveAdapter);
 		final IFileTransferListener listener = createFileTransferListener();
 		final IFileID fileID = createFileID(new URL(url));
+		done = false;
 		retrieveAdapter.sendRetrieveRequest(fileID, listener, null);
 
+			synchronized (lock) {
+				try {
+					lock.wait(7000);
+				} catch (InterruptedException e) {
+					
+				}
+			}
+			
+	    if (!done) fail();
+	    
 		System.out.println("remote file name=" + incomingFileTransfer.getRemoteFileName());
 
 		waitForDone(10000);
diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java
index 1046bef20..65ee5a58a 100755..100644
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrieveTest.java
@@ -33,7 +33,7 @@ import org.eclipse.ecf.internal.tests.filetransfer.httpserver.SimpleServer;
 public class URLRetrieveTest extends AbstractRetrieveTestCase {
 
 	public static final String HTTP_RETRIEVE = "http://www.eclipse.org/ecf/ip_log.html";
-	public static final String HTTP_RETRIEVE1 = "http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.4.2-200902111700/jarprocessor.jar&url=http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.5.2-201002111343/jarprocessor.jar&mirror_id=272";
+	public static final String HTTP_RETRIEVE1 = "http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.4.2-200902111700/jarprocessor.jar&url=http://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-3.6.1-201009090800/jarprocessor.jar&mirror_id=272";
 	public static final String HTTP_RETRIEVE_PORT = "http://www.eclipse.org:80/ecf/ip_log.html";
 	private static final String HTTP_RETRIEVE_HOST_ONLY = "http://www.google.com";