Remove all stupid TestParser-based tests.

These need to be rewritten as proper unit tests.

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

@@ -1,127 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.common.ChildImplementations;
-import com.dmdirc.parser.common.MyInfo;
-import com.dmdirc.parser.common.QueuePriority;
-import com.dmdirc.parser.irc.IRCChannelClientInfo;
-import com.dmdirc.parser.irc.IRCChannelInfo;
-import com.dmdirc.parser.irc.IRCClientInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.IRCReader;
-import com.dmdirc.parser.irc.SocketState;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-
-@ChildImplementations({
-    IRCChannelClientInfo.class,
-    IRCChannelInfo.class,
-    IRCClientInfo.class
-})
-public class TestParser extends IRCParser {
-
-    public final List<String> sentLines = new ArrayList<>();
-
-    public String nick = "nick";
-
-    public String network = null;
-
-    public TestParser() {
-        super(buildURI());
-        currentSocketState = SocketState.OPEN;
-        setPingTimerFraction(10);
-        setPingTimerInterval(60000);
-    }
-
-    public TestParser(final MyInfo myDetails, final URI address) {
-        super(myDetails, address);
-        currentSocketState = SocketState.OPEN;
-        setPingTimerFraction(10);
-        setPingTimerInterval(60000);
-    }
-
-    private static URI buildURI() {
-        try {
-            return new URI("irc://host:1234/");
-        } catch (URISyntaxException ex) {
-            return null;
-        }
-    }
-
-    @Override
-    protected boolean doSendString(final String line, final QueuePriority priority, final boolean fromParser) {
-        sentLines.add(line);
-        return true;
-    }
-
-    public String[] getLine(final int index) {
-        return tokeniseLine(sentLines.get(index));
-    }
-
-    public void injectLine(final String line) {
-        processLine(new IRCReader.ReadLine(line, IRCParser.tokeniseLine(line)));
-    }
-
-    public void injectConnectionStrings() {
-        final String[] lines = {
-            "NOTICE AUTH :Blah, blah",
-            ":server 001 " + nick + " :Welcome to the Testing IRC Network, " + nick,
-            ":server 002 " + nick + " :Your host is server.net, running version foo",
-            ":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",
-        };
-
-        sendConnectionStrings();
-
-        for (String line : lines) {
-            injectLine(line);
-        }
-
-        sentLines.clear();
-    }
-
-    @Override
-    protected void pingTimerTask(final Timer timer) {
-        // Do nothing
-    }
-
-    @Override
-    public void run() {
-        injectConnectionStrings();
-    }
-
-    public void runSuper() {
-        super.run();
-    }
-
-}

irc/test/com/dmdirc/parser/irc/ChannelClientInfoTest.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.irc;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-
-public class ChannelClientInfoTest {
-        
-    @Test
-    public void testImportantMode() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-
-        final IRCChannelClientInfo cci = (IRCChannelClientInfo) parser.getClient("luser")
-                .getChannelClients().get(0);
-
-        assertEquals("v", cci.getImportantMode());
-        assertEquals("+", cci.getImportantModePrefix());
-        assertEquals("+luser", cci.toString());
-        assertEquals("+luser", cci.toFullString());
-
-        parser.injectLine(":server MODE #DMDirc_testing +o luser");
-        assertEquals("o", cci.getImportantMode());
-        assertEquals("@", cci.getImportantModePrefix());
-        assertEquals("@luser", cci.toString());
-        assertEquals("@+luser", cci.toFullString());
-
-        parser.injectLine(":server MODE #DMDirc_testing -ov luser luser");
-        assertEquals("", cci.getImportantMode());
-        assertEquals("", cci.getImportantModePrefix());
-        assertEquals("luser", cci.toString());
-        assertEquals("luser", cci.toFullString());
-    }
-    
-    @Test
-    public void testMap() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        final Map<Object, Object> map1 = new HashMap<>();
-        final Map<Object, Object> map2 = new HashMap<>();
-        
-        final IRCChannelClientInfo cci = (IRCChannelClientInfo) parser.getClient("nick")
-                .getChannelClients().get(0);
-        
-        cci.setMap(map1);
-        assertSame(map1, cci.getMap());
-        
-        cci.setMap(map2);
-        assertSame(map2, cci.getMap());
-    }
-    
-    @Test
-    public void testKick() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.sentLines.clear();
-        
-        parser.getClient("nick").getChannelClients().get(0).kick("");
-        assertEquals(1, parser.sentLines.size());
-        assertEquals("KICK #DMDirc_testing nick", parser.sentLines.get(0));
-        parser.sentLines.clear();
-        
-        parser.getClient("nick").getChannelClients().get(0).kick("booya");
-        assertEquals(1, parser.sentLines.size());
-        assertEquals("KICK #DMDirc_testing nick :booya", parser.sentLines.get(0));
-    }
-
-}

irc/test/com/dmdirc/parser/irc/ChannelInfoTest.java

@@ -1,347 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.irc;
-
-import com.dmdirc.harness.parser.TestParser;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-
-import org.junit.Ignore;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ChannelInfoTest {
-
-    final IRCChannelInfo ci = new IRCChannelInfo(null, null, null, null, "name");
-
-    @Test
-    public void testGetName() {
-        assertEquals("name", ci.getName());
-    }
-
-    @Test
-    public void testAddingNames() {
-        assertTrue(ci.isAddingNames());
-
-        ci.setAddingNames(false);
-
-        assertFalse(ci.isAddingNames());
-    }
-
-    @Test
-    public void testCreateTime() {
-        ci.setCreateTime(12345L);
-
-        assertEquals(12345L, ci.getCreateTime());
-    }
-
-    @Test
-    public void testTopicTime() {
-        ci.setTopicTime(12345L);
-
-        assertEquals(12345L, ci.getTopicTime());
-    }
-
-    @Test
-    public void testTopic() {
-        ci.setInternalTopic("abcdef");
-
-        assertEquals("abcdef", ci.getTopic());
-    }
-
-    @Test
-    public void testSendMessage() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendMessage("hello");
-
-        assertEquals("PRIVMSG #DMDirc_testing :hello", parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendNotice() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendNotice("hello");
-
-        assertEquals("NOTICE #DMDirc_testing :hello", parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCP() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCP("type", "hello");
-
-        assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "TYPE hello" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCPEmpty() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCP("type", "");
-
-        assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "TYPE" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendAction() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendAction("moo");
-
-        assertEquals("PRIVMSG #DMDirc_testing :" + ((char) 1) + "ACTION moo" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCPReply() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCPReply("type", "moo");
-
-        assertEquals("NOTICE #DMDirc_testing :" + ((char) 1) + "TYPE moo" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendCTCPReplyEmpty() {
-        final TestParser parser = new TestParser();
-        getChannel(parser).sendCTCPReply("type", "");
-
-        assertEquals("NOTICE #DMDirc_testing :" + ((char) 1) + "TYPE" + ((char) 1),
-                parser.sentLines.get(0));
-    }
-
-    @Test
-    public void testSendEmptyMessages() {
-        final TestParser parser = new TestParser();
-        final IRCChannelInfo info = getChannel(parser);
-
-        info.sendAction("");
-        info.sendCTCP("", "");
-        info.sendCTCPReply("", "");
-        info.sendMessage("");
-        info.sendNotice("");
-
-        assertEquals(0, parser.sentLines.size());
-    }
-
-    @Test
-    public void testGetSetParamMode() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
-        parser.sentLines.clear();
-
-        assertEquals("lalala", info.getMode('k'));
-        assertEquals("", info.getMode('z'));
-
-        parser.injectLine(":server MODE #DMDirc_testing -k *");
-
-        assertEquals("", info.getMode('k'));
-    }
-
-    @Test
-    public void testModeSendFull() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'i', null);
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'p', null);
-        info.alterMode(true, 't', null);
-        info.alterMode(true, 'r', null);
-
-        assertEquals("Parser must send modes as soon as the max number is reached",
-                1, parser.sentLines.size());
-        final String modes = getModes(parser.sentLines.get(0));
-
-        assertTrue(modes.indexOf('i') > -1);
-        assertTrue(modes.indexOf('m') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('p') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('r') > -1);
-    }
-
-    @Test
-    public void testModeSendExtra() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'i', null);
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'p', null);
-        info.alterMode(true, 't', null);
-        info.alterMode(true, 'r', null);
-        info.alterMode(true, 'N', null);
-        info.flushModes();
-
-        assertEquals("sendModes must send modes",
-                2, parser.sentLines.size());
-
-        final String modes = getModes(parser.sentLines.get(0))
-                + getModes(parser.sentLines.get(1));
-
-        assertTrue(modes.indexOf('i') > -1);
-        assertTrue(modes.indexOf('m') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('p') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('r') > -1);
-        assertTrue(modes.indexOf('N') > -1);
-    }
-
-    @Test
-    public void testModeSendOptimisation1() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'i', null);
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(false, 'i', null);
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-
-        final String modes = getModes(parser.sentLines.get(0));
-
-        assertEquals("Setting a negative mode should cancel a positive one",
-                -1, modes.indexOf('i'));
-
-        assertTrue(modes.indexOf('m') > -1);
-    }
-
-    @Test
-    public void testModeSendOptimisation2() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-
-        parser.sentLines.clear();
-        info.alterMode(true, 'm', null);
-        info.alterMode(true, 'n', null);
-        info.alterMode(true, 'n', null);
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-
-        final String modes = getModes(parser.sentLines.get(0));
-
-        assertEquals("Setting a mode twice should have no effect",
-                modes.indexOf('n'), modes.lastIndexOf('n'));
-
-        assertTrue(modes.indexOf('m') > -1);
-    }
-
-    @Test
-    public void testModeUnsetKey() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
-        parser.sentLines.clear();
-
-        info.alterMode(true, 'k', "foobar");
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-        assertEquals("Setting +k must set -k first",
-                "-k+k lalala foobar", getModes(parser.sentLines.get(0)));
-    }
-
-    @Test
-    public void testIssue1410() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":foo!bar@baz JOIN #DMDirc_testing");
-        parser.injectLine(":flub!floo@fleeee JOIN #DMDirc_testing");
-
-        assertNotSame(parser.getChannel("#DMDirc_testing").getChannelClients(),
-                parser.getChannel("#DMDirc_testing").getChannelClients());
-        assertEquals(parser.getChannel("#DMDirc_testing").getChannelClients(),
-                parser.getChannel("#DMDirc_testing").getChannelClients());
-    }
-
-    @Test @Ignore
-    public void testModeUnsetKeyMultiple() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +k lalala");
-        parser.sentLines.clear();
-
-        info.alterMode(true, 'k', "foobar");
-        info.alterMode(true, 'k', "blahblah");
-        info.alterMode(true, 'k', "unittest");
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-        assertEquals("Setting a mode multiple times should have no effect",
-                "-k+k lalala unittest", getModes(parser.sentLines.get(0)));
-    }
-
-    @Test @Ignore
-    public void testModeUnsetLimitMultiple() {
-        final TestParser parser = new TestParser();
-        final ChannelInfo info = getChannel(parser);
-        parser.injectLine(":server 324 nick #DMDirc_testing +l 73");
-        parser.sentLines.clear();
-
-        info.alterMode(true, 'l', "74");
-        info.alterMode(true, 'l', "75");
-        info.alterMode(true, 'l', "76");
-        info.flushModes();
-
-        assertEquals("sendModes must send modes in one go",
-                1, parser.sentLines.size());
-        assertEquals("Setting a mode multiple times should have no effect",
-                "+l 76", getModes(parser.sentLines.get(0)));
-    }
-
-    private String getModes(final String line) {
-        final String res = line.substring("MODE #DMDirc_testing ".length());
-
-        if (res.charAt(0) == '+') {
-            return res.substring(1);
-        }
-
-        return res;
-    }
-
-    private IRCChannelInfo getChannel(final TestParser parser) {
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-
-        parser.sentLines.clear();
-        return parser.getChannels().iterator().next();
-    }
-
-}

irc/test/com/dmdirc/parser/irc/IRCParserIrcdTest.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.irc;
-
-import com.dmdirc.harness.parser.TestParser;
-import java.util.Arrays;
-import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import static org.junit.Assert.*;
-
-@RunWith(Parameterized.class)
-public class IRCParserIrcdTest {
-
-    private final String ircd, expected;
-
-    public IRCParserIrcdTest(final String ircd, final String expected) {
-        this.ircd = ircd;
-        this.expected = expected;
-    }
-
-    @Test
-    public void testIrcdDetection() {
-        final TestParser parser = new TestParser();
-
-        String[] strings = {
-            ":server 001 nick :Welcome to the Testing IRC Network, nick",
-            ":server 002 nick :Your host is server.net, running version %s",
-            ":server 003 nick :This server was created Sun Jan 6 2008 at 17:34:54 CET",
-            ":server 004 nick server.net %s dioswkgxRXInP biklmnopstvrDcCNuMT bklov"
-        };
-
-        for (String line : strings) {
-            parser.injectLine(String.format(line, ircd));
-        }
-
-        assertEquals(ircd, parser.getServerSoftware());
-        assertEquals(expected.toLowerCase(), parser.getServerSoftwareType().toLowerCase());
-    }
-
-    @Parameterized.Parameters
-    public static List<String[]> data() {
-        final String[][] tests = {
-            {"u2.10.12.10+snircd(1.3.4)", "snircd"},
-            {"u2.10.12.12", "ircu"},
-            {"hyperion-1.0.2b", "hyperion"},
-            {"hybrid-7.2.3", "hybrid"},
-            {"Unreal3.2.6", "unreal"},
-            {"bahamut-1.8(04)", "bahamut"},
-        };
-
-        return Arrays.asList(tests);
-    }
-
-}

irc/test/com/dmdirc/parser/irc/processors/ProcessListModeTest.java

@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.ChannelListModeItem;
-import java.util.Collection;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class ProcessListModeTest {
-
-    private void testListModes(final String numeric1, final String numeric2, final char mode) {
-        final TestParser parser = new TestParser();
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":nick JOIN #D");
-        parser.injectLine(":server " + numeric1 + " nick #D ban1!ident@.host bansetter1 1001");
-        parser.injectLine(":server " + numeric1 + " nick #D ban2!*@.host bansetter2 1002");
-        parser.injectLine(":server " + numeric1 + " nick #D ban3!ident@* bansetter3 1003");
-        parser.injectLine(":server " + numeric2 + " nick #D :End of Channel Something List");
-
-        final Collection<ChannelListModeItem> items
-                = parser.getChannel("#D").getListMode(mode);
-
-        assertEquals(3, items.size());
-        boolean gotOne = false, gotTwo = false, gotThree = false;
-
-        for (ChannelListModeItem item : items) {
-            if (item.getItem().equals("ban1!ident@.host")) {
-                assertEquals("bansetter1", item.getOwner());
-                assertEquals(1001L, item.getTime());
-                assertFalse(gotOne);
-                gotOne = true;
-            } else if (item.getItem().equals("ban2!*@.host")) {
-                assertEquals("bansetter2", item.getOwner());
-                assertEquals(1002L, item.getTime());
-                assertFalse(gotTwo);
-                gotTwo = true;
-            } else if (item.toString().equals("ban3!ident@*")) {
-                assertEquals("bansetter3", item.getOwner());
-                assertEquals(1003L, item.getTime());
-                assertFalse(gotThree);
-                gotThree = true;
-            }
-        }
-
-        assertTrue(gotOne);
-        assertTrue(gotTwo);
-        assertTrue(gotThree);
-    }
-
-    @Test
-    public void testNormalBans() {
-        testListModes("367", "368", 'b');
-    }
-
-    @Test
-    public void testInvexList() {
-        testListModes("346", "347", 'I');
-    }
-
-    @Test
-    public void testExemptList() {
-        testListModes("348", "349", 'e');
-    }
-
-    @Test
-    public void testReopList() {
-        testListModes("344", "345", 'R');
-    }
-
-}

irc/test/com/dmdirc/parser/irc/processors/ProcessModeTest.java

@@ -1,145 +0,0 @@
-/*
- * Copyright (c) 2006-2015 DMDirc Developers
- *
- * 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.irc.processors;
-
-import com.dmdirc.harness.parser.TestParser;
-import com.dmdirc.parser.common.CallbackNotFoundException;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-@Ignore
-public class ProcessModeTest {
-    
-    @Test
-    public void testBasicUmodes() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":server 221 nick iw");
-
-        assertTrue(parser.getLocalClient().getModes().indexOf('i') > -1);
-        assertTrue(parser.getLocalClient().getModes().indexOf('w') > -1);
-    }
-    
-    @Test
-    public void testAlteringUmodes() throws CallbackNotFoundException {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-
-        parser.injectLine(":server 221 nick iw");
-        parser.injectLine(":server MODE nick :-iw+ox");
-
-        assertTrue(parser.getLocalClient().getModes().indexOf('o') > -1);
-        assertTrue(parser.getLocalClient().getModes().indexOf('x') > -1);
-        assertEquals(-1, parser.getLocalClient().getModes().indexOf('i'));
-        assertEquals(-1, parser.getLocalClient().getModes().indexOf('w'));
-    }
-    
-    @Test
-    public void testChannelUmodes() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-
-        final ChannelClientInfo cci = parser.getClient("luser").getChannelClients().get(0);
-
-        parser.injectLine(":server MODE #DMDirc_testing +v luser");
-        assertEquals("v", cci.getAllModes());
-        assertEquals("+", cci.getAllModesPrefix());
-
-        parser.injectLine(":server MODE #DMDirc_testing +o luser");
-        assertEquals("ov", cci.getAllModes());
-        assertEquals("@+", cci.getAllModesPrefix());
-
-        parser.injectLine(":server MODE #DMDirc_testing +bov moo luser luser");
-        assertEquals("ov", cci.getAllModes());
-
-        parser.injectLine(":server MODE #DMDirc_testing -bov moo luser luser");
-        assertEquals("", cci.getAllModes());
-        assertEquals("", cci.getAllModesPrefix());
-    }
-    
-    @Test
-    public void testUnknownUser1() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-
-        parser.injectLine(":luser!me@my MODE #DMDirc_testing +v :moo");
-        
-        assertNotNull(parser.getClient("moo"));
-        assertEquals(0, parser.getClient("moo").getChannelCount());
-        
-        assertEquals("Parser should update ident when it sees a MODE line",
-                "me", parser.getClient("luser").getUsername());
-        assertEquals("Parser should update host when it sees a MODE line",
-                "my", parser.getClient("luser").getHostname());
-    }
-    
-    @Test
-    public void testChannelModes() {
-        final TestParser parser = new TestParser();
-
-        parser.injectConnectionStrings();
-        parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
-        parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
-        parser.injectLine(":server 324 nick #DMDirc_testing +Zstnl 1234");
-
-        assertEquals("1234", parser.getChannel("#DMDirc_testing").getMode('l'));
-        
-        String modes = parser.getChannel("#DMDirc_testing").getModes().split(" ")[0];
-        assertEquals(6, modes.length());
-        assertEquals('+', modes.charAt(0));
-        assertTrue(modes.indexOf('Z') > -1);
-        assertTrue(modes.indexOf('s') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('l') > -1);
-        
-        parser.injectLine(":server MODE #DMDirc_testing :-Z");
-        
-        modes = parser.getChannel("#DMDirc_testing").getModes().split(" ")[0];
-        assertEquals(5, modes.length());
-        assertEquals('+', modes.charAt(0));
-        assertTrue(modes.indexOf('s') > -1);
-        assertTrue(modes.indexOf('t') > -1);
-        assertTrue(modes.indexOf('n') > -1);
-        assertTrue(modes.indexOf('l') > -1);        
-    }
-
-}