Organized tests and added more of them

pom.xml

@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.10</version>
+			<version>[4.11]</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/client/ChatWindow.java

@@ -101,7 +101,7 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 		connect(adress, port, username);
 	}
 	
-	void send(String text) {
+	public void send(String text) {
 		if (so.isConnected() && !so.isClosed())
 			out.println(text);
 		else {
@@ -172,6 +172,9 @@ public class ChatWindow extends JFrame implements ActionListener, Runnable, KeyL
 				Message mess = ((Message)fromServer);
 				chat.log(mess);
 				
+				if (mess.usersOnline == null)
+					continue;
+				
 				model = new DefaultListModel<String>();
 				for (String user: mess.usersOnline)
 					model.addElement(user);

src/main/java/common/Message.java

@@ -43,6 +43,10 @@ public class Message implements java.io.Serializable {
 		this.content = con;
 		this.preInfo = preInfo; 
 		this.messType = messType;
+		if (preInfo)
+			usersOnline = Server.getUsersOnline();
+		else
+			usersOnline = null;
 	}
 	
 	public boolean validate() {

src/test/java/client/ClientTestCase.java

@@ -0,0 +1,29 @@
+package client;
+
+import static org.junit.Assert.*;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ClientTestCase {
+	public static ChatWindow user1;
+	public static ChatWindow user2;
+
+    @BeforeClass 
+    public static void setUpClass() {      
+        user1 = new ChatWindow("localhost", 25566, "user1");
+    }
+	
+	@Test
+	public void testSend() {
+		user1.send("Hello!");
+	}
+	
+	@Test
+	public void testPM() {
+		user2 = new ChatWindow("localhost", 25566, "user2");
+		
+		user1.send("/pm user2 Hi there user2!");
+	}
+
+}

src/test/java/client/ClientTestSuite.java

@@ -0,0 +1,9 @@
+package client;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(value = Suite.class)
+@SuiteClasses(value = { ClientTestCase.class })
+public class ClientTestSuite {}

src/test/java/common/CompleteTestSuite.java

@@ -0,0 +1,30 @@
+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)
+@SuiteClasses({ ServerTestSuite.class, client.ClientTestSuite.class })
+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/ServerTest.java → src/test/java/server/ServerTestCase.java

@@ -1,19 +1,12 @@
 package server;
 
 import static org.junit.Assert.*;
-
 import org.junit.Test;
 
-public class ServerTest {
-	
+public class ServerTestCase {
+
 	@Test
 	public void testCInt() {
 		assertEquals(Server.CInt("832"), 832);
 	}
-	
-	@Test
-	public void testStart() {
-		Server.main(new String[]{});
-	}
-
 }

src/test/java/server/ServerTestSuite.java

@@ -0,0 +1,17 @@
+package server;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(value = Suite.class)
+@SuiteClasses(value = { client.ClientTestSuite.class })
+public class ServerTestSuite {
+	
+	public static Thread runServer = new Thread(){
+    	@Override
+    	public void run() {
+    		Server.main(new String[]{});
+    	}
+    };
+}