Update to test code

1 files changed, 27 insertions, 18 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/OutgoingFileTransferTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/OutgoingFileTransferTest.java
index 7ccaa9b3a..37f6d7805 100755
--- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/OutgoingFileTransferTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/OutgoingFileTransferTest.java
@@ -93,34 +93,43 @@ public class OutgoingFileTransferTest extends ContainerAbstractTestCase {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ecf.tests.presence.PresenceAbstractTestCase#setUp()
-	 */
-	protected void setUp() throws Exception {
+/*
+	public void testOneClientToSend() throws Exception {
+		// Setup one client.  Client 0 is the sender
 		setClientCount(2);
 		clients = createClients();
 		adapter0 = getOutgoingFileTransfer(0);
-		adapter0.addListener(requestListener);
-		adapter1 = getOutgoingFileTransfer(1);
-		for (int i = 0; i < 2; i++) {
+		for (int i = 0; i < 1; i++) {
+			// Only connect client 0 (not client 1)
 			connectClient(i);
 		}
-	}
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see junit.framework.TestCase#tearDown()
-	 */
-	protected void tearDown() throws Exception {
+		adapter0.sendOutgoingRequest(getServerConnectID(1), new File(
+				TESTSRCFILE), senderTransferListener, null);
+		sleep(200000);
+		
 		disconnectClients();
+
 	}
+*/
+	public void testTwoClientsToSendAndReceive() throws Exception {
+		// Setup two clients.  Client 0 is the receiver, client 1 is the sender
+		setClientCount(2);
+		clients = createClients();
+		adapter0 = getOutgoingFileTransfer(0);
+		adapter0.addListener(requestListener);
+		adapter1 = getOutgoingFileTransfer(1);
+		for (int i = 0; i < 2; i++) {
+			connectClient(i);
+		}
 
-	public void testSendRequest() throws Exception {
 		adapter1.sendOutgoingRequest(getServerConnectID(0), new File(
 				TESTSRCFILE), senderTransferListener, null);
-		sleep(20000);
+		
+		sleep(200000);
+		
+		disconnectClients();
+
 	}
+	
 }