Updated tests

Updated tests to test properly.

src/test/java/client/ClientTestCase.java

@@ -2,16 +2,22 @@ package client;
 
 import static org.junit.Assert.*;
 
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import server.Server;
+import server.ServerTestSuite;
+
 public class ClientTestCase {
 	public static ChatWindow user1;
 	public static ChatWindow user2;
 
     @BeforeClass 
-    public static void setUpClass() {      
+    public static void setUpClass() {
+    	ServerTestSuite.runServer.start();
         user1 = new ChatWindow("localhost", 25566, "user1");
+        assertTrue(user1.so.isConnected());
     }
 	
 	@Test
@@ -25,5 +31,10 @@ public class ClientTestCase {
 		
 		user1.send("/pm user2 Hi there user2!");
 	}
+	
+	@AfterClass
+	public static void tearDownClass() {
+		Server.exit();
+	}
 
 }

src/test/java/common/CompleteTestSuite.java

@@ -1,16 +1,11 @@
 package common;
 
-import static org.junit.Assert.*;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
-
-import client.ChatWindow;
-import client.ClientTestCase;
-import server.Server;
 import server.ServerTestSuite;
 
 @RunWith(Suite.class)
@@ -19,12 +14,11 @@ public class CompleteTestSuite {
 	
 	@BeforeClass
 	public static void setUpBeforeClass() throws Exception {
-		ServerTestSuite.runServer.start();
-		ClientTestCase.user1 = new ChatWindow("localhost", 25566, "test");
+		
 	}
 
 	@AfterClass
 	public static void tearDownAfterClass() throws Exception {
-		Server.exit();
+		
 	}
 }

src/test/java/server/ServerTestCase.java

@@ -1,12 +1,25 @@
 package server;
 
 import static org.junit.Assert.*;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 public class ServerTestCase {
-
+	
+	@BeforeClass 
+    public static void setUpClass() {
+    	ServerTestSuite.runServer.start();
+    }
+	
 	@Test
 	public void testCInt() {
 		assertEquals(Server.CInt("832"), 832);
 	}
+	
+	@AfterClass
+	public static void tearDownClass() {
+		Server.exit();
+	}
 }