Added unit test for Update

Updated ServerManagerTest to junit 4 and added test for numServers/getServers

git-svn-id: http://svn.dmdirc.com/trunk@1443 00569f92-eb28-0410-84fd-f71c24880f

test/com/dmdirc/ServerManagerTest.java

@@ -1,27 +1,43 @@
 /*
  * ServerManagerTest.java
- * JUnit based test
+ * JUnit 4.x based test
  *
- * Created on 08 April 2007, 12:55
+ * Created on 05 June 2007, 23:06
  */
 
 package com.dmdirc;
 
-import javax.swing.JInternalFrame;
-import junit.framework.*;
 import com.dmdirc.identities.IdentityManager;
+import javax.swing.JInternalFrame;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
 
 /**
  *
  * @author chris
  */
-public class ServerManagerTest extends TestCase {
+public class ServerManagerTest {
+    
+    public ServerManagerTest() {
+    }
+    
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+    }
+    
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+    }
     
-    public ServerManagerTest(String testName) {
-        super(testName);
+    @Before
+    public void setUp() throws Exception {
     }
     
-    public void testGetServerManager() {
+    @Test
+    public void getServerManager() {
         final ServerManager resultA = ServerManager.getServerManager();
         final ServerManager resultB = ServerManager.getServerManager();
         
@@ -30,7 +46,8 @@ public class ServerManagerTest extends TestCase {
         assertEquals(resultA, resultB);
     }
     
-    public void testRegisterServer() {
+    @Test
+    public void registerServer() {
         final Server server = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
         
         final ServerManager instance = ServerManager.getServerManager();
@@ -40,7 +57,8 @@ public class ServerManagerTest extends TestCase {
         server.close();
     }
     
-    public void testUnregisterServer() {
+    @Test
+    public void unregisterServer() {
         final Server server = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
         
         server.close();
@@ -48,9 +66,25 @@ public class ServerManagerTest extends TestCase {
         final ServerManager instance = ServerManager.getServerManager();
         
         assertEquals(0, instance.numServers());
-    }    
+    }
+    
+    @Test
+    public void numServers() {
+        final ServerManager instance = ServerManager.getServerManager();
+        
+        assertEquals(instance.getServers().size(), instance.numServers());
+        
+        final Server server = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
+        
+        assertEquals(instance.getServers().size(), instance.numServers());
+        
+        server.close();
+        
+        assertEquals(instance.getServers().size(), instance.numServers());
+    }
     
-    public void testGetServerFromFrame() {
+    @Test
+    public void getServerFromFrame() {
         final Server serverA = new Server("127.0.0.1", 6667, "", false, IdentityManager.getProfiles().get(0));
         final Server serverB = new Server("127.0.0.2", 6667, "", false, IdentityManager.getProfiles().get(0));
         
@@ -62,4 +96,5 @@ public class ServerManagerTest extends TestCase {
         serverA.close();
         serverB.close();
     }
-}
+    
+}