Unit tests (ServerManager, Process004005, ProcessJoin)

Tidied up some logic in ConditionTree, and removed unneccesary asserts
Issue 1106

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

src/com/dmdirc/actions/ConditionTree.java

@@ -68,11 +68,6 @@ public class ConditionTree {
      */
     private ConditionTree(final OPERATION op, final ConditionTree leftArg,
             final ConditionTree rightArg) {
-        assert(op != OPERATION.VAR);
-        assert(op != OPERATION.NOT);
-        assert(leftArg != null);
-        assert(rightArg != null);
-
         this.op = op;
         this.leftArg = leftArg;
         this.rightArg = rightArg;
@@ -85,8 +80,6 @@ public class ConditionTree {
      * @param argument
      */
     private ConditionTree(final OPERATION op, final ConditionTree argument) {
-        assert(op == OPERATION.NOT);
-
         this.op = op;
         this.leftArg = argument;
     }
@@ -160,8 +153,6 @@ public class ConditionTree {
     @Override
     public String toString() {
         switch (op) {
-        case NOOP:
-            return "";
         case VAR:
             return String.valueOf(argument);
         case NOT:
@@ -171,7 +162,7 @@ public class ConditionTree {
         case OR:
             return "(" + leftArg + "|" + rightArg + ")";
         default:
-            return "<unknown>";
+            return "";
         }
     }
 
@@ -213,7 +204,6 @@ public class ConditionTree {
      * @return The corresponding condition tree, or null if there was an error
      * while parsing the data.
      */
-    @SuppressWarnings("fallthrough")
     private static ConditionTree parseStack(final Deque<Object> stack) {
         final Deque<Object> myStack = new ArrayDeque<Object>();
 
@@ -234,14 +224,13 @@ public class ConditionTree {
         }
 
         while (!myStack.isEmpty()) {
-            switch (myStack.size()) {
-                case 1:
-                    final Object first = myStack.pollFirst();
-                    if (first instanceof ConditionTree) {
-                        return (ConditionTree) first;
-                    }
-                case 0:
+            if (myStack.size() == 1) {
+                final Object first = myStack.pollFirst();
+                if (first instanceof ConditionTree) {
+                    return (ConditionTree) first;
+                } else {
                     return null;
+                }
             }
 
             final ConditionTree first = readTerm(myStack);

test/com/dmdirc/ServerManagerTest.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.dummy.DummyController;
 
+import com.dmdirc.ui.dummy.DummyQueryWindow;
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -49,7 +50,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));
+        final Server server = new Server("255.255.255.255", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
         
         final ServerManager instance = ServerManager.getServerManager();
         
@@ -60,7 +62,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));
+        final Server server = new Server("255.255.255.255", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
         
         server.close();
         
@@ -75,7 +78,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));
+        final Server server = new Server("255.255.255.255", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
         
         assertEquals(instance.getServers().size(), instance.numServers());
         
@@ -86,16 +90,36 @@ 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));
-        final Server serverB = new Server("255.255.255.254", 6667, "", false, IdentityManager.getProfiles().get(0));
+        final Server serverA = new Server("255.255.255.255", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
+        final Server serverB = new Server("255.255.255.254", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
         
         final ServerManager sm = ServerManager.getServerManager();
         
         assertEquals(serverA, sm.getServerFromFrame(serverA.getFrame()));
         assertEquals(serverB, sm.getServerFromFrame(serverB.getFrame()));
+        assertNull(sm.getServerFromFrame(new DummyQueryWindow(serverB)));
         
         serverA.close();
         serverB.close();
     }
     
+    @Test
+    public void testGetServerByAddress() {
+        final Server serverA = new Server("255.255.255.255", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
+        final Server serverB = new Server("255.255.255.254", 6667, "", false,
+                IdentityManager.getProfiles().get(0));
+        
+        final ServerManager sm = ServerManager.getServerManager();
+        
+        assertEquals(serverA, sm.getServersByAddress("255.255.255.255").get(0));
+        assertEquals(serverB, sm.getServersByAddress("255.255.255.254").get(0));
+        assertEquals(0, sm.getServersByAddress("255.255.255.253").size());
+        
+        serverA.close();
+        serverB.close();
+    }    
+    
 }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2006-2008 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.harness.parser;
+
+import com.dmdirc.parser.*;
+import com.dmdirc.parser.callbacks.interfaces.IChannelJoin;
+
+public class TestIChannelJoin implements IChannelJoin {
+
+    public ChannelInfo channel = null;
+    
+    public ChannelClientInfo client = null;
+
+    public void onChannelJoin(IRCParser tParser, ChannelInfo cChannel,
+            ChannelClientInfo cChannelClient) {
+        channel = cChannel;
+        client = cChannelClient;
+    }
+}

test/com/dmdirc/parser/IRCParserTest.java

@@ -312,24 +312,6 @@ public class IRCParserTest extends junit.framework.TestCase {
         assertTrue(Arrays.equals(new TrustManager[0], parser.getTrustManager()));
     }
 
-    @Test
-    public void testJoinChannel() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-        final TestIChannelSelfJoin test = new TestIChannelSelfJoin();
-
-        parser.injectConnectionStrings();
-        parser.getCallbackManager().addCallback("onChannelSelfJoin", test);
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-
-        assertNotNull(test.channel);
-        assertEquals("#DMDirc_testing", test.channel.getName());
-        assertEquals("#DMDirc_testing", test.channel.toString());
-        assertEquals(parser, test.channel.getParser());
-        assertEquals(1, parser.getChannels().size());
-        assertTrue(parser.getChannels().contains(test.channel));
-        assertEquals(test.channel, parser.getChannelInfo("#DMDirc_testing"));
-    }
-
     @Test
     public void testPrivateMessages() throws CallbackNotFoundException {
         final TestParser parser = new TestParser();

test/com/dmdirc/parser/Process004005Test.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2006-2008 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.parser;
+
+import com.dmdirc.harness.parser.TestIErrorInfo;
+import com.dmdirc.harness.parser.TestParser;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class Process004005Test extends junit.framework.TestCase {
+    
+    private TestParser doCaseMappingTest(final String target, final int expected) {
+        final TestParser parser = new TestParser();
+        parser.injectConnectionStrings();
+        parser.injectLine(":server 005 nick CASEMAPPING=" + target
+                    + " :are supported by this server");
+        
+        assertEquals(expected, parser.getIRCStringConverter().getLimit());
+        
+        return parser;
+    }
+    
+    @Test
+    public void testCaseMappingASCII() {
+        doCaseMappingTest("ascii", 0);
+        doCaseMappingTest("ASCII", 0);
+    }
+    
+    @Test
+    public void testCaseMappingRFC() {
+        doCaseMappingTest("rfc1459", 4);
+        doCaseMappingTest("RFC1459", 4);
+    }
+    
+    @Test
+    public void testCaseMappingStrict() {
+        doCaseMappingTest("strict-rfc1459", 3);
+        doCaseMappingTest("strict-RFC1459", 3);        
+    }
+    
+    @Test
+    public void testCaseMappingUnknown() {
+        final TestParser tp = doCaseMappingTest("rfc1459", 4);
+        final TestIErrorInfo tiei = new TestIErrorInfo();
+        
+        tp.getCallbackManager().addCallback("OnErrorInfo", tiei);
+        
+        tp.injectLine(":server 005 nick CASEMAPPING=unknown :are supported by this server");
+        
+        assertTrue(tiei.error);
+    }
+
+}

test/com/dmdirc/parser/ProcessJoinTest.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2006-2008 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.parser;
+
+import com.dmdirc.harness.parser.TestIChannelJoin;
+import com.dmdirc.harness.parser.TestIChannelSelfJoin;
+import com.dmdirc.harness.parser.TestParser;
+import com.dmdirc.parser.callbacks.CallbackNotFoundException;
+
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+public class ProcessJoinTest extends junit.framework.TestCase {
+    
+    @Test
+    public void testSelfJoinChannel() throws CallbackNotFoundException {
+        final TestParser parser = new TestParser();
+        final TestIChannelSelfJoin test = new TestIChannelSelfJoin();
+
+        parser.injectConnectionStrings();
+        parser.getCallbackManager().addCallback("onChannelSelfJoin", test);
+        parser.injectLine(":nick JOIN #DMDirc_testing");
+
+        assertNotNull(test.channel);
+        assertEquals("#DMDirc_testing", test.channel.getName());
+        assertEquals("#DMDirc_testing", test.channel.toString());
+        assertSame(parser, test.channel.getParser());
+        assertEquals(1, parser.getChannels().size());
+        assertTrue(parser.getChannels().contains(test.channel));
+        assertEquals(test.channel, parser.getChannelInfo("#DMDirc_testing"));
+    }
+    
+    @Test
+    public void testOtherJoinChannel() throws CallbackNotFoundException {
+        final TestParser parser = new TestParser();
+        final TestIChannelJoin test = new TestIChannelJoin();
+
+        parser.injectConnectionStrings();
+        parser.getCallbackManager().addCallback("onChannelJoin", test);
+        
+        parser.injectLine(":nick JOIN #DMDirc_testing");
+        parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
+
+        assertNotNull(test.channel);
+        assertEquals("#DMDirc_testing", test.channel.getName());
+        assertEquals("#DMDirc_testing", test.channel.toString());
+        assertSame(parser, test.channel.getParser());
+        assertNotNull(parser.getClientInfo("foo"));
+        assertSame(test.client.getClient(), parser.getClientInfo("foo"));
+        assertTrue(parser.getClientInfo("foo").getChannelClients().contains(test.client));
+    }    
+
+}