New server network name behaviour

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

src/com/dmdirc/ServerEventHandler.java

@@ -41,7 +41,7 @@ import com.dmdirc.parser.callbacks.interfaces.*;
 public final class ServerEventHandler implements IChannelSelfJoin,
         IPrivateMessage, IPrivateAction, IErrorInfo, IPrivateCTCP,
         IPrivateCTCPReply, ISocketClosed, IPrivateNotice, IMOTDStart, IMOTDLine,
-        IMOTDEnd, INumeric, IGotNetwork, IPingFailed, IPingSuccess, IAwayState,
+        IMOTDEnd, INumeric, IPingFailed, IPingSuccess, IAwayState,
         IConnectError, IAwayStateOther, INickInUse, IPost005, INoticeAuth,
         IUnknownNotice, IUserModeChanged, IInvite, IWallop, IWalluser,
         IWallDesync, INickChanged {
@@ -201,14 +201,6 @@ public final class ServerEventHandler implements IChannelSelfJoin,
         owner.onNumeric(numeric, token);
     }
     
-    /** {@inheritDoc} */
-    @Override
-    public void onGotNetwork(final IRCParser tParser, final String networkName,
-            final String ircdVersion, final String ircdType) {
-        checkParser(tParser);
-        owner.onGotNetwork(networkName, ircdType);
-    }
-    
     /** {@inheritDoc} */
     @Override
     public void onPingFailed(final IRCParser tParser) {

test/com/dmdirc/ServerTest.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ServerTest {
+
+    @Test
+    public void getNetworkFromServerName() {
+        final String[][] tests = {
+            {"foo.com", "foo.com"},
+            {"bar.foo.com", "foo.com"},
+            {"irc.us.foo.com", "foo.com"},
+            {"irc.foo.co.uk", "foo.co.uk"},
+            {"com", "com"},
+            {"localhost", "localhost"},
+            {"foo.de", "foo.de"}
+        };
+        
+        for (String[] test : tests) {
+            assertEquals(test[1], Server.getNetworkFromServerName(test[0]));
+        }
+    }
+    
+}