1 files changed, 28 insertions, 26 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/PresenceContainerConnectTest.java b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/PresenceContainerConnectTest.java
index 951196409..6a6a74d04 100755
--- a/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/PresenceContainerConnectTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.presence/src/org/eclipse/ecf/tests/presence/PresenceContainerConnectTest.java
@@ -13,48 +13,50 @@ package org.eclipse.ecf.tests.presence;
 
 import org.eclipse.ecf.core.IContainer;
 import org.eclipse.ecf.core.identity.ID;
-import org.eclipse.ecf.core.security.IConnectContext;
 
 /**
  * 
  */
 public class PresenceContainerConnectTest extends PresenceAbstractTestCase {
 
-	public void testConnectClient() throws Exception {
-		IContainer client = getClients()[0];
+	public static final int CLIENT_COUNT = 2;
+	public static final int WAITTIME= 3000;
+	
+	protected void setUp() throws Exception {
+		setClientCount(CLIENT_COUNT);
+		clients = createClients();
+	}
+
+	public void testConnectOneClient() throws Exception {
+		int clientIndex = 0;
+		IContainer client = getClient(clientIndex);
 		assertNull(client.getConnectedID());
-		ID serverConnectID = getServerConnectID(client);
+		ID serverConnectID = getServerConnectID(clientIndex);
 		assertNotNull(serverConnectID);
-		IConnectContext connectContext = getConnectContext(client);
-		connectClient(client, serverConnectID, connectContext);
+		connectClient(client, serverConnectID, getConnectContext(clientIndex));
 		assertEquals(serverConnectID, client.getConnectedID());
-		sleep(3000);
+		sleep(WAITTIME);
 		client.disconnect();
 		assertNull(client.getConnectedID());
 	}
 
 	public void testConnectTwoClients() throws Exception {
-		IContainer clientone = getClients()[0];
-		assertNull(clientone.getConnectedID());
-		ID serverConnectID = getServerConnectID(clientone);
-		assertNotNull(serverConnectID);
-		IConnectContext connectContext = getConnectContext(clientone);
-		connectClient(clientone, serverConnectID, connectContext);
-		assertEquals(serverConnectID, clientone.getConnectedID());
-
-		IContainer clienttwo = getClients()[1];
-		assertNull(clienttwo.getConnectedID());
-		serverConnectID = getServerConnectID(clienttwo);
-		assertNotNull(serverConnectID);
-		connectContext = getConnectContext(clienttwo);
-		connectClient(clienttwo, serverConnectID, connectContext);
-		assertEquals(serverConnectID, clienttwo.getConnectedID());
+		for(int i=0; i < 2; i++) {
+			IContainer client = getClient(i);
+			assertNull(client.getConnectedID());
+			ID serverConnectID = getServerConnectID(i);
+			assertNotNull(serverConnectID);
+			connectClient(client, serverConnectID, getConnectContext(i));
+			assertEquals(serverConnectID, client.getConnectedID());
+		}
+		
 		sleep(3000);
 
-		clientone.disconnect();
-		assertNull(clientone.getConnectedID());
-		clienttwo.disconnect();
-		assertNull(clienttwo.getConnectedID());
+		for(int i=0; i < 2; i++) {
+			IContainer client = getClient(i);
+			client.disconnect();
+			assertNull(client.getConnectedID());
+		}
 	}
 
 }