Additional IgnoreList unit tests

ProcessModeTest now tests numeric 324 (channel mode discovery)
ProcessNamesTest now tests nicks with multiple and no channel modes
ArrayListTransferHandlerTest now tests copying as well as moving
Issue 1106

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

test/com/dmdirc/IgnoreListTest.java

@@ -22,6 +22,9 @@
 
 package com.dmdirc;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
@@ -79,4 +82,47 @@ public class IgnoreListTest extends junit.framework.TestCase {
         }
     }
     
+    @Test
+    public void testConstructor() {
+        final List<String> items = Arrays.asList(new String[]{"abc", "def"});
+        final IgnoreList list = new IgnoreList(items);
+        
+        assertEquals(items, list.getRegexList());
+    }
+    
+    @Test
+    public void testAddSimple() {
+        final IgnoreList list = new IgnoreList();
+        
+        for (String[] test : tests) {
+            list.addSimple(test[0]);
+            assertTrue(list.getRegexList().contains(test[1]));
+        }
+    }
+    
+    @Test
+    public void testCanConvert() {
+        final IgnoreList list = new IgnoreList();
+        assertTrue(list.canConvert());
+        
+        list.addSimple("abc!def@ghi");
+        assertTrue(list.canConvert());
+        
+        list.add(illegals[0]);
+        assertFalse(list.canConvert());
+    }
+    
+    @Test
+    public void testGetSimpleList() throws UnsupportedOperationException {
+        final IgnoreList list = new IgnoreList();
+        final List<String> items = new ArrayList<String>();
+        
+        for (String[] test : tests) {
+            items.add(test[0]);
+            list.add(test[1]);
+        }
+        
+        assertEquals(items, list.getSimpleList());
+    }
+    
 }

test/com/dmdirc/parser/ProcessModeTest.java

@@ -121,6 +121,27 @@ public class ProcessModeTest extends junit.framework.TestCase {
         final ChannelClientInfo cci = parser.getClientInfo("moo").getChannelClients().get(0);
         
         assertEquals("+", cci.getChanModeStr(true));        
-    }    
+    }   
+    
+    @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 +stnl 1234");
+    
+        assertEquals("1234", parser.getChannelInfo("#DMDirc_testing").getModeParam('l'));
+        
+        final String modes = parser.getChannelInfo("#DMDirc_testing").getModeStr().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);
+    }
 
 }

test/com/dmdirc/parser/ProcessNamesTest.java

@@ -47,18 +47,26 @@ public class ProcessNamesTest extends junit.framework.TestCase {
 
         parser.injectConnectionStrings();
         parser.injectLine(":nick JOIN #DMDirc_testing");
-        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser");
+        parser.injectLine(":server 353 nick = #DMDirc_testing :@nick +luser @+nick2 nick3");
         parser.injectLine(":server 366 nick #DMDirc_testing :End of /NAMES list");
 
         assertEquals(1, parser.getChannels().size());
         assertNotNull(parser.getChannelInfo("#DMDirc_testing"));
-        assertEquals(2, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
+        assertEquals(4, parser.getChannelInfo("#DMDirc_testing").getChannelClients().size());
         assertNotNull(parser.getClientInfo("luser"));
         assertEquals(1, parser.getClientInfo("luser").getChannelClients().size());
 
-        final ChannelClientInfo cci = parser.getClientInfo("luser").getChannelClients().get(0);
+        ChannelClientInfo cci = parser.getClientInfo("luser").getChannelClients().get(0);
         assertEquals(parser.getChannelInfo("#DMDirc_testing"), cci.getChannel());
         assertEquals("+", cci.getChanModeStr(true));
+        
+        cci = parser.getChannelInfo("#DMDirc_testing").getUser("nick2");
+        assertNotNull(cci);
+        assertEquals("@+", cci.getChanModeStr(true));
+
+        cci = parser.getChannelInfo("#DMDirc_testing").getUser("nick3");
+        assertNotNull(cci);
+        assertEquals("", cci.getChanModeStr(true));
     }
     
     private class OEITest implements IErrorInfo {

test/com/dmdirc/ui/swing/components/reorderablelist/ArrayListTransferHandlerTest.java

@@ -148,6 +148,13 @@ public class ArrayListTransferHandlerTest {
         assertEquals("456", list.getModel().getElementAt(4));
     }
     
+    @Test
+    public void testImportData2() {
+        final ArrayListTransferHandler handler = new ArrayListTransferHandler();
+        final ArrayListTransferable alt = new ArrayListTransferable(null);
+        assertFalse(handler.importData(null, alt));
+    }
+    
     @Test
     public void testExportDone() {
         final ArrayList<String> test = new ArrayList<String>();
@@ -171,7 +178,33 @@ public class ArrayListTransferHandlerTest {
         handler.exportDone(list, alt, TransferHandler.MOVE);
         assertEquals(1, list.getModel().getSize());
         assertEquals("456", list.getModel().getElementAt(0));
-    }    
+    }
+    
+    @Test
+    public void testExportDone2() {
+        final ArrayList<String> test = new ArrayList<String>();
+        test.add("123");
+        test.add("456");
+        
+        final JList list = new JList(new DefaultListModel());
+        ((DefaultListModel) list.getModel()).addElement("123");
+        ((DefaultListModel) list.getModel()).addElement("456");
+        list.setSelectedIndex(0);
+        
+        final ArrayListTransferHandler handler = new ArrayListTransferHandler();
+        final ArrayListTransferable alt = new ArrayListTransferable(test);
+        
+        handler.createTransferable(list);
+        
+        final JList list2 = new JList(new DefaultListModel());
+        list2.setSelectedIndex(0);
+        assertTrue(handler.importData(list2, alt));
+        
+        handler.exportDone(list, alt, TransferHandler.COPY);
+        assertEquals(2, list.getModel().getSize());
+        assertEquals("123", list.getModel().getElementAt(0));
+        assertEquals("456", list.getModel().getElementAt(1));
+    }        
 
     public static junit.framework.Test suite() {
         return new junit.framework.JUnit4TestAdapter(ArrayListTransferHandlerTest.class);