Fix some broken unit tests

Remove junit 3 stuff

test/com/dmdirc/IgnoreListTest.java

@@ -29,7 +29,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 
-public class IgnoreListTest extends junit.framework.TestCase {
+public class IgnoreListTest {
     
     private final String[][] tests = {
         {"a@b.c", "a@b\\.c"},

test/com/dmdirc/ProgramErrorTest.java

@@ -33,7 +33,7 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProgramErrorTest extends junit.framework.TestCase {
+public class ProgramErrorTest {
     
     private ErrorLevel level;
     private String message;

test/com/dmdirc/StringTranscoderTest.java

@@ -29,7 +29,7 @@ import java.nio.charset.Charset;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class StringTranscoderTest extends junit.framework.TestCase {
+public class StringTranscoderTest {
 
     @Test
     public void testTranscode() {

test/com/dmdirc/WritableFrameContainerTest.java

@@ -28,7 +28,7 @@ import java.util.Arrays;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class WritableFrameContainerTest extends junit.framework.TestCase {
+public class WritableFrameContainerTest {
     
     @Test
     public void testGetNumLines() {

test/com/dmdirc/actions/ActionComparisonNamesTest.java

@@ -56,9 +56,5 @@ public class ActionComparisonNamesTest {
         
         return res;
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ActionComparisonNamesTest.class);
-    }    
 
 }

test/com/dmdirc/actions/ActionComponentChainTest.java

@@ -22,6 +22,8 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.config.IdentityManager;
+
 import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -30,6 +32,7 @@ public class ActionComponentChainTest {
 
     @Before
     public void setUp() throws Exception {
+        IdentityManager.load();
         ActionManager.init();
     }
 
@@ -111,10 +114,6 @@ public class ActionComponentChainTest {
     public void testEmptyToString() {
         final ActionComponentChain chain = new ActionComponentChain(String.class, "");
         chain.toString();
-    }    
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ActionComponentChainTest.class);
-    }    
+    }      
 
 }

test/com/dmdirc/actions/ActionConditionTest.java

@@ -22,14 +22,18 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.config.IdentityManager;
+
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionConditionTest extends junit.framework.TestCase {
+public class ActionConditionTest {
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
+        IdentityManager.load();
         ActionManager.init();
     }
 

test/com/dmdirc/actions/ActionGroupTest.java

@@ -30,7 +30,7 @@ import java.util.Map;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionGroupTest extends junit.framework.TestCase {
+public class ActionGroupTest {
 
     @Test
     public void testGetAuthor() {

test/com/dmdirc/actions/ActionManagerTest.java

@@ -22,6 +22,7 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.config.IdentityManager;
 import java.io.File;
 
 import java.util.ArrayList;
@@ -30,17 +31,18 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionManagerTest extends junit.framework.TestCase {
+public class ActionManagerTest {
     
     @BeforeClass
-    public void setUpClass() throws Exception {
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
         ActionManager.init();
         
         tearDownClass();
     }
     
     @AfterClass
-    public void tearDownClass() throws Exception {
+    public static void tearDownClass() throws Exception {
         if (ActionManager.getGroups().containsKey("unit-test")) {
             ActionManager.removeGroup("unit-test");
         }

test/com/dmdirc/actions/ActionModelTest.java

@@ -23,15 +23,22 @@
 package com.dmdirc.actions;
 
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.config.IdentityManager;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionModelTest extends junit.framework.TestCase {
+public class ActionModelTest {
+
+    @BeforeClass
+    public static void setUpClass() {
+        IdentityManager.load();
+    }
 
     @Test
     public void testConditions() {

test/com/dmdirc/actions/ActionTest.java

@@ -35,13 +35,14 @@ import java.util.ArrayList;
 import java.util.Arrays;
 
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionTest extends junit.framework.TestCase {
+public class ActionTest {
 
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         IdentityManager.load();
         ActionManager.init();
     }

test/com/dmdirc/actions/ActionTypeComparatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionTypeComparatorTest extends junit.framework.TestCase {
+public class ActionTypeComparatorTest {
 
     @Test
     public void testCompare() {

test/com/dmdirc/actions/ConditionTreeTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.actions;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ConditionTreeTest extends junit.framework.TestCase {
+public class ConditionTreeTest {
 
     @Test
     public void testParseString() {

test/com/dmdirc/actions/CoreActionComparisonTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class CoreActionComparisonTest extends junit.framework.TestCase {
+public class CoreActionComparisonTest {
 
     @Test
     public void testStringRegex() {

test/com/dmdirc/actions/CoreActionTypeTest.java

@@ -25,7 +25,7 @@ import com.dmdirc.actions.metatypes.PluginEvents;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class CoreActionTypeTest extends junit.framework.TestCase {
+public class CoreActionTypeTest {
 
     @Test
     public void testGetName() {

test/com/dmdirc/actions/StringComponentsTest.java

@@ -79,9 +79,5 @@ public class StringComponentsTest {
             {"abc foo def", "foo"}
         });
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(StringComponentsTest.class);
-    }    
 
 }

test/com/dmdirc/actions/metatypes/ActionEventsTest.java

@@ -25,7 +25,7 @@ import com.dmdirc.actions.interfaces.ActionMetaType;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionEventsTest extends junit.framework.TestCase {
+public class ActionEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/ChannelEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ChannelEventsTest extends junit.framework.TestCase {
+public class ChannelEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/ClientEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ClientEventsTest extends junit.framework.TestCase {
+public class ClientEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/PluginEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class PluginEventsTest extends junit.framework.TestCase {
+public class PluginEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/QueryEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class QueryEventsTest extends junit.framework.TestCase {
+public class QueryEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/metatypes/ServerEventsTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.actions.metatypes;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ServerEventsTest extends junit.framework.TestCase {
+public class ServerEventsTest {
 
     @Test
     public void testArity() {

test/com/dmdirc/actions/wrappers/AliasTest.java

@@ -26,7 +26,7 @@ import java.util.Arrays;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class AliasTest extends junit.framework.TestCase {
+public class AliasTest {
 
     @Test
     public void testBasics() {

test/com/dmdirc/actions/wrappers/AliasWrapperTest.java

@@ -28,15 +28,22 @@ import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.CoreActionComponent;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.actions.interfaces.ActionType;
+import com.dmdirc.config.IdentityManager;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
 public class AliasWrapperTest {
 
+    @BeforeClass
+    public static void setupClass() {
+        IdentityManager.load();
+    }
+
     @Test
     public void testNormal() {
         final List<ActionCondition> conditions = new ArrayList<ActionCondition>();

test/com/dmdirc/addons/dcc/IpToLongTest.java

@@ -63,9 +63,5 @@ public class IpToLongTest {
 
         return Arrays.asList(tests);
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(IpToLongTest.class);
-    }
-    
+
 }

test/com/dmdirc/addons/identd/IdentClientTest.java

@@ -29,7 +29,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class IdentClientTest extends junit.framework.TestCase {
+public class IdentClientTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {

test/com/dmdirc/addons/logging/LoggingPluginTest.java

@@ -103,9 +103,5 @@ public class LoggingPluginTest {
         assertTrue(lp.lines.get("foo!bar@baz").get(0).indexOf("closed") > -1);
         lp.lines.clear();
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(LoggingPluginTest.class);
-    }
 
 }

test/com/dmdirc/addons/logging/ReverseFileReaderTest.java

@@ -160,7 +160,4 @@ public class ReverseFileReaderTest {
         assertEquals((byte) 100, reader.getSeekLength());
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ReverseFileReaderTest.class);
-    }
 }

test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java

@@ -28,7 +28,7 @@ import java.io.IOException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class VlcMediaSourcePluginTest extends junit.framework.TestCase {
+public class VlcMediaSourcePluginTest {
 
     @Test
     public void testProcessInformation1() throws IOException {

test/com/dmdirc/addons/ui_swing/UIUtilitiesTest.java

@@ -35,7 +35,7 @@ import javax.swing.text.JTextComponent;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class UIUtilitiesTest extends junit.framework.TestCase {
+public class UIUtilitiesTest {
     
     @Test
     public void testAddUndoManager() {

test/com/dmdirc/addons/ui_swing/components/InputTextFrameTest.java

@@ -162,10 +162,6 @@ public class InputTextFrameTest implements UITestIface {
         }
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(InputTextFrameTest.class);
-    }
-
     protected void setupWindow(final ConfigManager configManager) {
         UIUtilities.initUISettings();
 

test/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferHandlerTest.java

@@ -208,8 +208,4 @@ public class ArrayListTransferHandlerTest {
         assertEquals("456", list.getModel().getElementAt(1));
     }        
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ArrayListTransferHandlerTest.class);
-    }
-
 }

test/com/dmdirc/addons/ui_swing/components/reorderablelist/ArrayListTransferableTest.java

@@ -66,9 +66,5 @@ public class ArrayListTransferableTest {
         
         assertFalse(alt.isDataFlavorSupported(null));
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ArrayListTransferableTest.class);
-    }
 
 }

test/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialogTest.java

@@ -322,7 +322,4 @@ public class ActionEditorDialogTest implements UITestIface {
         window.show();
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ActionEditorDialogTest.class);
-    }
 }

test/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialogTest.java

@@ -227,8 +227,4 @@ public class ActionsManagerDialogTest implements UITestIface {
         window.show();
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ActionsManagerDialogTest.class);
-    }
-
 }

test/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SSLCertificateDialogTest.java

@@ -117,10 +117,6 @@ public class SSLCertificateDialogTest implements UITestIface {
         window.show();
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(SSLCertificateDialogTest.class);
-    }
-
     private static class CertificateListCellReader extends BasicJListCellReader {
 
         public String valueAt(JList arg0, int arg1) {

test/com/dmdirc/addons/urlcatcher/UrlCatcherPluginTest.java

@@ -27,7 +27,7 @@ import com.dmdirc.config.IdentityManager;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class UrlCatcherPluginTest extends junit.framework.TestCase {
+public class UrlCatcherPluginTest {
 
     @Test
     public void testURLCounting() {

test/com/dmdirc/commandparser/CommandTypeTest.java

@@ -35,14 +35,14 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class CommandTypeTest extends junit.framework.TestCase {
+public class CommandTypeTest {
 
     @Test
     public void testGlobal() {
         final Command command = new GlobalCommand() {
 
             @Override
-            public void execute(InputWindow origin, boolean isSilent, String... args) {
+            public void execute(InputWindow origin, boolean isSilent, CommandArguments args) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
@@ -70,7 +70,7 @@ public class CommandTypeTest extends junit.framework.TestCase {
         final Command command = new ServerCommand() {
 
             @Override
-            public void execute(InputWindow origin, Server server, boolean isSilent, String... args) {
+            public void execute(InputWindow origin, Server server, boolean isSilent, CommandArguments args) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
 
@@ -114,7 +114,7 @@ public class CommandTypeTest extends junit.framework.TestCase {
 
             @Override
             public void execute(InputWindow origin, Server server,
-                    MessageTarget target, boolean isSilent, String... args) {
+                    MessageTarget target, boolean isSilent, CommandArguments args) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
         };
@@ -142,7 +142,7 @@ public class CommandTypeTest extends junit.framework.TestCase {
 
             @Override
             public void execute(InputWindow origin, Server server,
-                    Channel channel, boolean isSilent, String... args) {
+                    Channel channel, boolean isSilent, CommandArguments args) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
         };
@@ -171,7 +171,7 @@ public class CommandTypeTest extends junit.framework.TestCase {
 
             @Override
             public void execute(InputWindow origin, Server server, Query query,
-                    boolean isSilent, String... args) {
+                    boolean isSilent, CommandArguments args) {
                 throw new UnsupportedOperationException("Not supported yet.");
             }
         };

test/com/dmdirc/commandparser/commands/HelpTest.java

@@ -21,10 +21,14 @@
  */
 package com.dmdirc.commandparser.commands;
 
+import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.config.IdentityManager;
+
 import java.util.LinkedList;
 import java.util.List;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -33,26 +37,32 @@ import static org.junit.Assert.*;
 @RunWith(Parameterized.class)
 public class HelpTest {
 
-    private Command command;
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
+
+    private CommandInfo info;
 
-    public HelpTest(final Command command) {
-        this.command = command;
+    public HelpTest(final CommandInfo info) {
+        this.info = info;
     }
 
     @Test
     public void testHelp() {
         assertTrue("Command's help output should start with its name ("
-                + command.getName() + ")", command.getHelp().startsWith(command.getName()));
+                + info.getName() + ")", info.getHelp().startsWith(info.getName()));
     }
 
     @Parameterized.Parameters
     public static List<Object[]> data() {
         final List<Object[]> res = new LinkedList<Object[]>();
 
+        IdentityManager.load();
         CommandManager.initCommands();
 
         for (CommandType type : CommandType.values()) {
-            for (Command command : CommandManager.getCommands(type)) {
+            for (CommandInfo command : CommandManager.getCommands(type).keySet()) {
                 if (command.showInHelp()) {
                     res.add(new Object[]{command});
                 }
@@ -62,8 +72,4 @@ public class HelpTest {
         return res;
     }
     
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(HelpTest.class);
-    }
-    
 }

test/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -22,18 +22,26 @@
 
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class BanTest extends junit.framework.TestCase {
+public class BanTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
     
     private final Ban command = new Ban();
 
     @Test
     public void testUsage() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, null, false, new String[0]);
+        command.execute(tiw, null, null, false, new CommandArguments("/ban"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }

test/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -21,18 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.channel;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class SetNickColourTest extends junit.framework.TestCase {
+public class SetNickColourTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
     
     private final SetNickColour command = new SetNickColour();
 
     @Test
     public void testUsageNoArgs() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, null, false, new String[0]);
+        command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -40,7 +48,7 @@ public class SetNickColourTest extends junit.framework.TestCase {
     @Test
     public void testUsageNicklist() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, null, false, new String[]{"--nicklist"});
+        command.execute(tiw, null, null, false, new CommandArguments("/foo --nicklist"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }    
@@ -48,7 +56,7 @@ public class SetNickColourTest extends junit.framework.TestCase {
     @Test
     public void testUsageText() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, null, false, new String[]{"--text"});
+        command.execute(tiw, null, null, false, new CommandArguments("/foo --text"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }       

test/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,19 +21,27 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestMessageTarget;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class MeTest extends junit.framework.TestCase {
+public class MeTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
     
     private final Me command = new Me();
 
     @Test
     public void testUsage() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, null, false, new String[0]);
+        command.execute(tiw, null, null, false, new CommandArguments("/foo"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -41,7 +49,7 @@ public class MeTest extends junit.framework.TestCase {
     @Test
     public void testSend() {
         final TestMessageTarget mtt = new TestMessageTarget();
-        command.execute(null, null, mtt, false, new String[]{"hello", "meep", "moop"});
+        command.execute(null, null, mtt, false, new CommandArguments("/foo hello meep moop"));
         assertEquals("hello meep moop", mtt.action);
     }
 }

test/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -21,18 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class AliasCommandTest extends junit.framework.TestCase {
+public class AliasCommandTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
 
     private final AliasCommand command = new AliasCommand();
 
     @Test
     public void testUsageNoArgs() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[0]);
+        command.execute(tiw, false, new CommandArguments("/foo"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -40,7 +48,7 @@ public class AliasCommandTest extends junit.framework.TestCase {
     @Test
     public void testUsageOneArg() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[]{"--remove"});
+        command.execute(tiw, false, new CommandArguments("/foo --remove"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }    

test/com/dmdirc/commandparser/commands/global/DebugTest.java

@@ -21,18 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class DebugTest extends junit.framework.TestCase {
+public class DebugTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
     
     private final Debug command = new Debug();
 
     @Test
     public void testUsage() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[0]);
+        command.execute(tiw, false, new CommandArguments("/foo"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -40,7 +48,7 @@ public class DebugTest extends junit.framework.TestCase {
     @Test
     public void testInvalidArg() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[]{"flubadee"});
+        command.execute(tiw, false, new CommandArguments("/foo flubadee"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }    

test/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -21,18 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class IfpluginTest extends junit.framework.TestCase {
+public class IfpluginTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
     
     private final Ifplugin command = new Ifplugin();
 
     @Test
     public void testUsageNoArgs() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[0]);
+        command.execute(tiw, false, new CommandArguments("/foo"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -40,7 +48,7 @@ public class IfpluginTest extends junit.framework.TestCase {
     @Test
     public void testUsageOneArg() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[]{"moo"});
+        command.execute(tiw, false, new CommandArguments("/foo bar"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }    

test/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -21,18 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class NewServerTest extends junit.framework.TestCase {
+public class NewServerTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
 
     private final NewServer command = new NewServer();
 
     @Test
     public void testUsageNoArgs() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[0]);
+        command.execute(tiw, false, new CommandArguments("/foo"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -40,7 +48,7 @@ public class NewServerTest extends junit.framework.TestCase {
     @Test
     public void testInvalidPort() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[]{"foo:abc"});
+        command.execute(tiw, false, new CommandArguments("/foo foo:abc"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }
@@ -48,7 +56,7 @@ public class NewServerTest extends junit.framework.TestCase {
     @Test
     public void testOutOfRangePort1() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[]{"foo:0"});
+        command.execute(tiw, false, new CommandArguments("/foo foo:0"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }
@@ -56,7 +64,7 @@ public class NewServerTest extends junit.framework.TestCase {
     @Test
     public void testOutOfRangePort2() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, false, new String[]{"foo:65537"});
+        command.execute(tiw, false, new CommandArguments("/foo foo:65537"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }

test/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -21,18 +21,26 @@
  */
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestInputWindow;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ChangeServerTest extends junit.framework.TestCase {
+public class ChangeServerTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
 
     private final ChangeServer command = new ChangeServer();
 
     @Test
     public void testUsageNoArgs() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, false, new String[0]);
+        command.execute(tiw, null, false, new CommandArguments("/server"));
         
         assertTrue(tiw.lines.containsKey("commandUsage"));
     }
@@ -40,7 +48,7 @@ public class ChangeServerTest extends junit.framework.TestCase {
     @Test
     public void testInvalidPort() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, false, new String[]{"foo:abc"});
+        command.execute(tiw, null, false, new CommandArguments("/server foo:abc"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }
@@ -48,7 +56,7 @@ public class ChangeServerTest extends junit.framework.TestCase {
     @Test
     public void testOutOfRangePort1() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, false, new String[]{"foo:0"});
+        command.execute(tiw, null, false, new CommandArguments("/server foo:0"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }
@@ -56,7 +64,7 @@ public class ChangeServerTest extends junit.framework.TestCase {
     @Test
     public void testOutOfRangePort2() {
         final TestInputWindow tiw = new TestInputWindow();
-        command.execute(tiw, null, false, new String[]{"foo:65537"});
+        command.execute(tiw, null, false,new CommandArguments("/server foo:65537"));
         
         assertTrue(tiw.lines.containsKey("commandError"));
     }

test/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -25,6 +25,7 @@ import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.global.Echo;
+import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Arrays;
@@ -37,6 +38,7 @@ public class CommandParserTest {
 
     @BeforeClass
     public static void setUpClass() throws Exception {
+        IdentityManager.load();
         CommandManager.initCommands();
     }
 
@@ -49,7 +51,6 @@ public class CommandParserTest {
         assertNull(tcp.invalidCommand);
         assertNotNull(tcp.executedCommand);
         assertFalse(tcp.wasSilent);
-        assertTrue(Arrays.equals(tcp.commandArgs, new String[]{"this", "is", "a", "test"}));
         assertTrue(tcp.executedCommand instanceof Echo);
     }
 
@@ -62,7 +63,6 @@ public class CommandParserTest {
         assertNull(tcp.invalidCommand);
         assertNotNull(tcp.executedCommand);
         assertFalse(tcp.wasSilent);
-        assertTrue(Arrays.equals(tcp.commandArgs, new String[0]));
         assertTrue(tcp.executedCommand instanceof Echo);
     }
 
@@ -75,7 +75,6 @@ public class CommandParserTest {
         assertNull(tcp.invalidCommand);
         assertNotNull(tcp.executedCommand);
         assertTrue(tcp.wasSilent);
-        assertTrue(Arrays.equals(tcp.commandArgs, new String[0]));
         assertTrue(tcp.executedCommand instanceof Echo);
     }
 
@@ -88,7 +87,6 @@ public class CommandParserTest {
         assertNull(tcp.invalidCommand);
         assertNotNull(tcp.executedCommand);
         assertTrue(tcp.wasSilent);
-        assertTrue(Arrays.equals(tcp.commandArgs, new String[]{"this", "is", "a", "test"}));
         assertTrue(tcp.executedCommand instanceof Echo);
     }
 
@@ -156,8 +154,4 @@ public class CommandParserTest {
         assertEquals(0l, tcp.getCommandTime("echo"));
     }    
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(CommandParserTest.class);
-    }
-
 }

test/com/dmdirc/commandparser/parsers/GlobalCommandParserTest.java

@@ -24,13 +24,14 @@ package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.config.IdentityManager;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class GlobalCommandParserTest extends junit.framework.TestCase {
+public class GlobalCommandParserTest {
     
-    @Before
-    public void setUp() throws Exception {
+    @BeforeClass
+    public static void setUp() throws Exception {
         IdentityManager.load();
     }
 

test/com/dmdirc/config/ConfigManagerTest.java

@@ -71,8 +71,4 @@ public class ConfigManagerTest {
         assertEquals(1, listener.count);        
     }    
     
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ConfigManagerTest.class);
-    }
-    
 }

test/com/dmdirc/config/ConfigSourceTest.java

@@ -26,7 +26,7 @@ import java.awt.Color;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ConfigSourceTest extends junit.framework.TestCase {
+public class ConfigSourceTest {
     
     private final TestConfigSource s = new TestConfigSource(); 
     

test/com/dmdirc/config/ConfigTargetTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ConfigTargetTest extends junit.framework.TestCase {
+public class ConfigTargetTest {
 
     @Test
     public void testDefault() {

test/com/dmdirc/config/IdentityManagerTest.java

@@ -26,7 +26,7 @@ import org.junit.Before;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class IdentityManagerTest extends junit.framework.TestCase {
+public class IdentityManagerTest {
 
     @Before
     public void setUp() throws Exception {        

test/com/dmdirc/config/IdentityTest.java

@@ -204,8 +204,4 @@ public class IdentityTest {
         assertEquals("test", listener.key);
     }
     
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(IdentityTest.class);
-    }  
-    
 }

test/com/dmdirc/config/InvalidIdentityFileExceptionTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class InvalidIdentityFileExceptionTest extends junit.framework.TestCase {
+public class InvalidIdentityFileExceptionTest {
 
     @Test
     public void testMessage() {

test/com/dmdirc/config/prefs/PreferencesCategoryTest.java

@@ -109,8 +109,4 @@ public class PreferencesCategoryTest {
         assertSame(category, test.cat);
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(PreferencesCategoryTest.class);
-    }
-
 }

test/com/dmdirc/config/prefs/PreferencesSettingTest.java

@@ -193,7 +193,4 @@ public class PreferencesSettingTest {
         assertEquals("def", IdentityManager.getConfigIdentity().getOption("unit-test", "ps"));
     }    
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(PreferencesSettingTest.class);
-    }
 }

test/com/dmdirc/config/prefs/validator/ActionGroupValidatorTest.java

@@ -23,10 +23,17 @@
 package com.dmdirc.config.prefs.validator;
 
 import com.dmdirc.actions.ActionManager;
+import com.dmdirc.config.IdentityManager;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionGroupValidatorTest extends junit.framework.TestCase {
+public class ActionGroupValidatorTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
 
     @Test
     public void testValidate() {

test/com/dmdirc/config/prefs/validator/FileNameValidatorTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class FileNameValidatorTest extends junit.framework.TestCase {
+public class FileNameValidatorTest {
 
     @Test
     public void testValidate() {

test/com/dmdirc/config/prefs/validator/NotEmptyValidatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class NotEmptyValidatorTest extends junit.framework.TestCase {
+public class NotEmptyValidatorTest {
 
     @Test
     public void testValidate() {

test/com/dmdirc/config/prefs/validator/NumericalValidatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class NumericalValidatorTest extends junit.framework.TestCase {
+public class NumericalValidatorTest {
 
     @Test
     public void testGetMax() {

test/com/dmdirc/config/prefs/validator/PermissiveValidatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class PermissiveValidatorTest extends junit.framework.TestCase {
+public class PermissiveValidatorTest {
 
     @Test
     public void testValidate() {

test/com/dmdirc/config/prefs/validator/PortValidatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class PortValidatorTest extends junit.framework.TestCase {
+public class PortValidatorTest {
 
     @Test
     public void testBounds() {

test/com/dmdirc/config/prefs/validator/RegexStringValidatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class RegexStringValidatorTest extends junit.framework.TestCase {
+public class RegexStringValidatorTest {
 
     @Test
     public void testValidate() {

test/com/dmdirc/config/prefs/validator/RegexValidatorTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class RegexValidatorTest extends junit.framework.TestCase {
+public class RegexValidatorTest {
 
     @Test
     public void testValidate() {

test/com/dmdirc/config/prefs/validator/StringLengthValidatorTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class StringLengthValidatorTest extends junit.framework.TestCase {
+public class StringLengthValidatorTest {
 
     @Test
     public void testUnlimited() {

test/com/dmdirc/config/prefs/validator/URLProtocolValidatorTest.java

@@ -26,12 +26,8 @@ import com.dmdirc.config.IdentityManager;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class URLProtocolValidatorTest extends junit.framework.TestCase {
+public class URLProtocolValidatorTest {
     
-    public URLProtocolValidatorTest(String testName) {
-        super(testName);
-    }
-
     @Test
     public void testValidate() {
         IdentityManager.load();

test/com/dmdirc/config/prefs/validator/ValidatorChainTest.java

@@ -25,7 +25,7 @@ package com.dmdirc.config.prefs.validator;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ValidatorChainTest extends junit.framework.TestCase {
+public class ValidatorChainTest {
 
     @Test
     public void testValidate() {

test/com/dmdirc/harness/TestCommandParser.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.harness;
 
+import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.parsers.*;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
@@ -36,7 +37,7 @@ public class TestCommandParser extends CommandParser {
 
     public boolean wasSilent;
 
-    public String[] commandArgs;
+    public CommandArguments commandArgs;
 
     public String invalidCommand;
 
@@ -47,7 +48,7 @@ public class TestCommandParser extends CommandParser {
 
     @Override
     protected void executeCommand(InputWindow origin, boolean isSilent,
-                                  Command command, String... args) {
+                                  Command command, CommandArguments args) {
         executedCommand = command;
         wasSilent = isSilent;
         commandArgs = args;
@@ -59,8 +60,8 @@ public class TestCommandParser extends CommandParser {
     }
 
     @Override
-    protected void handleInvalidCommand(InputWindow origin, String command,
-                                        String... args) {
-        invalidCommand = command;
+    protected void handleInvalidCommand(InputWindow origin,
+                                        CommandArguments args) {
+        invalidCommand = args.getCommandName();
     }
 }

test/com/dmdirc/logger/DMDircExceptionHandlerTest.java

@@ -21,10 +21,17 @@
  */
 package com.dmdirc.logger;
 
+import com.dmdirc.config.IdentityManager;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class DMDircExceptionHandlerTest extends junit.framework.TestCase {
+public class DMDircExceptionHandlerTest {
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        IdentityManager.load();
+    }
 
     @Test
     public void testUncaughtException() {

test/com/dmdirc/logger/ErrorFixedStatusTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.logger;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ErrorFixedStatusTest extends junit.framework.TestCase {
+public class ErrorFixedStatusTest {
 
     @Test
     public void testToString() {

test/com/dmdirc/logger/ErrorLevelTest.java

@@ -25,7 +25,7 @@ import javax.swing.Icon;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ErrorLevelTest extends junit.framework.TestCase {
+public class ErrorLevelTest {
 
     @Test
     public void testToString() {

test/com/dmdirc/logger/ErrorReportStatusTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.logger;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ErrorReportStatusTest extends junit.framework.TestCase {
+public class ErrorReportStatusTest {
 
     @Test
     public void testToString() {

test/com/dmdirc/logger/NullOutputStreamTest.java

@@ -25,7 +25,7 @@ import java.io.IOException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class NullOutputStreamTest extends junit.framework.TestCase {
+public class NullOutputStreamTest {
 
     @Test
     public void testWrite() {

test/com/dmdirc/logger/ProgramErrorTest.java

@@ -26,7 +26,7 @@ import java.util.Date;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProgramErrorTest extends junit.framework.TestCase {
+public class ProgramErrorTest {
 
     @Test
     public void testConstructorNegativeID() {

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

@@ -29,7 +29,7 @@ import java.util.Map;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ChannelClientInfoTest extends junit.framework.TestCase {
+public class ChannelClientInfoTest {
         
     @Test
     public void testImportantMode() {
@@ -60,7 +60,7 @@ public class ChannelClientInfoTest extends junit.framework.TestCase {
         assertEquals("", cci.getImportantModePrefix());
         assertEquals("luser", cci.toString());
         assertEquals("luser", cci.toFullString());
-        assertEquals(0, cci.getImportantModeValue());
+        assertEquals(0l, cci.getImportantModeValue());
     }
     
     @Test

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

@@ -28,7 +28,7 @@ import java.util.Map;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ClientInfoTest extends junit.framework.TestCase {
+public class ClientInfoTest {
     
     @Test
     public void testMap() {

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

@@ -495,9 +495,5 @@ public class IRCParserTest {
         assertEquals(ircd, parser.getIRCD(false));
         assertEquals(expected.toLowerCase(), parser.getIRCD(true).toLowerCase());
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(IRCParserTest.class);
-    }
 
 }

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.irc;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class IRCStringConverterTest extends junit.framework.TestCase {
+public class IRCStringConverterTest {
 
     @Test
     public void testCaseConversion() {

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

@@ -24,7 +24,7 @@ package com.dmdirc.parser.irc;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ParserErrorTest extends junit.framework.TestCase {
+public class ParserErrorTest {
 
     private final ParserError fatal = new ParserError(ParserError.ERROR_FATAL, "moo", "");
     private final ParserError error = new ParserError(ParserError.ERROR_ERROR, "moo", "last line");

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

@@ -26,7 +26,7 @@ import com.dmdirc.harness.parser.TestParser;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class Process001Test extends junit.framework.TestCase {
+public class Process001Test {
        
     @Test
     public void testDuplicate001() {

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

@@ -27,7 +27,7 @@ import com.dmdirc.harness.parser.TestParser;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class Process004005Test extends junit.framework.TestCase {
+public class Process004005Test {
     
     private TestParser doCaseMappingTest(final String target, final int expected) {
         final TestParser parser = new TestParser();

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

@@ -30,7 +30,7 @@ import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessJoinTest extends junit.framework.TestCase {
+public class ProcessJoinTest {
     
     @Test
     public void testSelfJoinChannel() throws CallbackNotFoundException {

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

@@ -28,7 +28,7 @@ import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessModeTest extends junit.framework.TestCase {
+public class ProcessModeTest {
     
     @Test
     public void testBasicUmodes() throws CallbackNotFoundException {

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

@@ -29,7 +29,7 @@ import com.dmdirc.parser.irc.callbacks.interfaces.IErrorInfo;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessNamesTest extends junit.framework.TestCase {
+public class ProcessNamesTest {
     
     @Test
     public void testExternalNames() throws CallbackNotFoundException {

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

@@ -104,9 +104,5 @@ public class ProcessNickTest {
         assertNull(tinc.client);
         assertNull(tinc.oldNick);
     }
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ProcessNickTest.class);
-    }
 
 }

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

@@ -32,7 +32,7 @@ import com.dmdirc.parser.irc.callbacks.interfaces.IQuit;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessPartTest extends junit.framework.TestCase {
+public class ProcessPartTest {
     
     @Test
     public void testNormalPart() throws CallbackNotFoundException {

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

@@ -31,7 +31,7 @@ import com.dmdirc.parser.irc.callbacks.interfaces.IQuit;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessQuitTest extends junit.framework.TestCase {
+public class ProcessQuitTest {
     
     @Test
     public void testChannelQuit() throws CallbackNotFoundException {

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

@@ -29,7 +29,7 @@ import com.dmdirc.parser.irc.callbacks.interfaces.IChannelTopic;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessTopicTest extends junit.framework.TestCase {
+public class ProcessTopicTest {
     
     @Test
     public void testBasicTopic() throws CallbackNotFoundException {

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

@@ -28,7 +28,7 @@ import com.dmdirc.parser.irc.callbacks.CallbackNotFoundException;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ProcessWhoTest extends junit.framework.TestCase {
+public class ProcessWhoTest {
 
     @Test
     public void testSelfAway() throws CallbackNotFoundException {

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

@@ -26,7 +26,7 @@ import java.util.List;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class RegexStringListTest extends junit.framework.TestCase {
+public class RegexStringListTest {
 
     @Test
     public void testAdd() {

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

@@ -25,7 +25,7 @@ package com.dmdirc.parser.irc;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ServerInfoTest extends junit.framework.TestCase {
+public class ServerInfoTest {
     
     @Test
     public void testHost() {

test/com/dmdirc/plugins/PluginInfoTest.java

@@ -114,7 +114,4 @@ public class PluginInfoTest {
         assertFalse(new File(pluginDir, "test.jar.update").exists());
     }
 
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(PluginInfoTest.class);
-    }
 }

test/com/dmdirc/ui/WindowManagerTest.java

@@ -29,7 +29,7 @@ import com.dmdirc.ui.interfaces.Window;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class WindowManagerTest extends junit.framework.TestCase {
+public class WindowManagerTest {
 
     @Test
     public void testFrameManagers() {

test/com/dmdirc/ui/input/tabstyles/TabCompletionResultTest.java

@@ -24,7 +24,7 @@ package com.dmdirc.ui.input.tabstyles;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class TabCompletionResultTest extends junit.framework.TestCase {
+public class TabCompletionResultTest {
 
     @Test
     public void testConstructor() {

test/com/dmdirc/ui/input/tabstyles/TabCompletionStyleTest.java

@@ -28,7 +28,7 @@ import com.dmdirc.ui.interfaces.InputWindow;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class TabCompletionStyleTest extends junit.framework.TestCase {
+public class TabCompletionStyleTest {
 
     @Test
     public void testSetContext() {

test/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -135,8 +135,4 @@ public class ColourManagerTest {
         IdentityManager.getConfigIdentity().unsetOption("colour", "4");
         assertEquals("ff0000", ColourManager.getHex(ColourManager.getColour(4)).toLowerCase());
     }    
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(ColourManagerTest.class);
-    }
 }

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -26,7 +26,7 @@ import com.dmdirc.config.ConfigManager;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class FormatterTest extends junit.framework.TestCase {
+public class FormatterTest {
     
     private final TestConfigManagerOptionToggle mcm = new TestConfigManagerOptionToggle();
     

test/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -83,8 +83,5 @@ public class IntelligentLinkingTest {
 
         return Arrays.asList(tests);
     }    
-    
-    public static junit.framework.Test suite() {
-        return new junit.framework.JUnit4TestAdapter(IntelligentLinkingTest.class);
-    }    
+
 }