TestParser and TestParserFactory can now fiddle a network name into the 005s

ServerManager unit tests now use TestParser to prevent rapid connection/disconnection to illegal addresses
Added unit test for ServerManager.getServersByNetwork

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

test/com/dmdirc/ServerManagerTest.java

@@ -23,9 +23,12 @@
 package com.dmdirc;
 
 import com.dmdirc.config.IdentityManager;
+import com.dmdirc.harness.parser.TestParserFactory;
 import com.dmdirc.ui.dummy.DummyController;
-
 import com.dmdirc.ui.dummy.DummyQueryWindow;
+
+import java.util.ArrayList;
+
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -51,7 +54,8 @@ public class ServerManagerTest extends junit.framework.TestCase {
     @Test
     public void testRegisterServer() {
         final Server server = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         
         final ServerManager instance = ServerManager.getServerManager();
         
@@ -63,7 +67,8 @@ public class ServerManagerTest extends junit.framework.TestCase {
     @Test
     public void testUnregisterServer() {
         final Server server = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         
         server.close();
         
@@ -79,7 +84,8 @@ public class ServerManagerTest extends junit.framework.TestCase {
         assertEquals(instance.getServers().size(), instance.numServers());
         
         final Server server = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         
         assertEquals(instance.getServers().size(), instance.numServers());
         
@@ -91,9 +97,11 @@ public class ServerManagerTest extends junit.framework.TestCase {
     @Test
     public void testGetServerFromFrame() {
         final Server serverA = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         final Server serverB = new Server("255.255.255.254", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         
         final ServerManager sm = ServerManager.getServerManager();
         
@@ -108,9 +116,11 @@ public class ServerManagerTest extends junit.framework.TestCase {
     @Test
     public void testGetServerByAddress() {
         final Server serverA = new Server("255.255.255.255", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         final Server serverB = new Server("255.255.255.254", 6667, "", false,
-                IdentityManager.getProfiles().get(0));
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory());
         
         final ServerManager sm = ServerManager.getServerManager();
         
@@ -122,4 +132,34 @@ public class ServerManagerTest extends junit.framework.TestCase {
         serverB.close();
     }    
     
+    @Test
+    public void testGetServerByNetwork() throws InterruptedException {
+        final Server serverA = new Server("255.255.255.255", 6667, "", false,
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory("Net1"));
+        final Server serverB = new Server("255.255.255.254", 6667, "", false,
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory("Net2"));
+        final Server serverC = new Server("255.255.255.254", 6667, "", false,
+                IdentityManager.getProfiles().get(0), new ArrayList<String>(),
+                new TestParserFactory("Net2"));
+        
+        Thread.sleep(1000); // Time for parsers to connect
+        
+        final ServerManager sm = ServerManager.getServerManager();
+        
+        assertEquals(1, sm.getServersByNetwork("Net1").size());
+        assertEquals(serverA, sm.getServersByNetwork("Net1").get(0));
+        
+        assertEquals(2, sm.getServersByNetwork("Net2").size());
+        assertEquals(serverB, sm.getServersByNetwork("Net2").get(0));
+        assertEquals(serverC, sm.getServersByNetwork("Net2").get(1));
+        
+        assertEquals(0, sm.getServersByAddress("Net3").size());
+        
+        serverA.close();
+        serverB.close();
+        serverC.close();
+    }
+    
 }

test/com/dmdirc/harness/parser/TestParser.java

@@ -30,6 +30,8 @@ import java.util.Timer;
 public class TestParser extends IRCParser {
 
     public final List<String> sentLines = new ArrayList<String>();
+    
+    public String network = null;
 
     public TestParser() {
         super();
@@ -62,6 +64,7 @@ public class TestParser extends IRCParser {
             ":server 003 nick :This server was created Sun Jan 6 2008 at 17:34:54 CET",
             ":server 004 nick server.net foo dioswkgxRXInP bRIeiklmnopstvrDcCNuMT bklov",
             ":server 005 nick WHOX WALLCHOPS WALLVOICES USERIP PREFIX=(ov)@+ " +
+                    (network == null ? "" : "NETWORK=" + network + " ") +
                     ":are supported by this server",
             ":server 005 nick MAXNICKLEN=15 TOPICLEN=250 AWAYLEN=160 MODES=6 " +
                     "CHANMODES=bIeR,k,l,imnpstrDducCNMT :are supported by this server",

test/com/dmdirc/harness/parser/TestParserFactory.java

@@ -29,9 +29,25 @@ import com.dmdirc.parser.ServerInfo;
 
 public class TestParserFactory extends ParserFactory {
 
+    protected String network;
+
+    public TestParserFactory() {
+        this(null);
+    }
+
+    public TestParserFactory(String network) {
+        this.network = network;
+    }
+    
     @Override
     public IRCParser getParser(MyInfo myInfo, ServerInfo serverInfo) {
-        return new TestParser(myInfo, serverInfo);
+        final TestParser parser = new TestParser(myInfo, serverInfo);
+        
+        if (this.network != null) {
+            parser.network = network;
+        }
+        
+        return parser;
     }
 
 }