Unit test updates

Fixes issue 3168
Fixes issue 3347

Change-Id: I7722fe396e58f37cc60d10f54bb3a68ab63dbe7b
Reviewed-on: http://gerrit.dmdirc.com/358
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

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

@@ -29,14 +29,16 @@ import com.dmdirc.Query;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestLoggingPlugin;
-import com.dmdirc.parser.irc.IRCChannelInfo;
 import com.dmdirc.addons.ui_dummy.DummyController;
-import com.dmdirc.parser.irc.IRCParser;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.util.ConfigFile;
 
-import java.net.URI;
 import java.util.Map;
 
+import static org.mockito.Mockito.*;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -52,15 +54,31 @@ public class LoggingPluginTest {
     public static void setUp() throws Exception {
         Main.setUI(new DummyController());
         IdentityManager.load();
-        server = new Server(new URI("irc-test://255.255.255.255"),
-                IdentityManager.getProfiles().get(0));
-        server.connect();
+
+
+        ClientInfo clientinfo = mock(ClientInfo.class);
+        when(clientinfo.toString()).thenReturn("foo!bar@baz");
+        
+        Parser parser = mock(Parser.class);
+        when(parser.getClient(anyString())).thenReturn(clientinfo);
+
+        server = mock(Server.class);
+        when(server.toString()).thenReturn("server");
+        when(server.getParser()).thenReturn(parser);
         
-        channel = new Channel(server, new IRCChannelInfo((IRCParser) server.getParser(), "#test"));
-        query = new Query(server, "foo!bar@baz");
+        ChannelInfo info = mock(ChannelInfo.class);
+        when(info.toString()).thenReturn("#test");
+
+        channel = mock(Channel.class);
+        when(channel.getServer()).thenReturn(server);
+        when(channel.getChannelInfo()).thenReturn(info);
+        query = mock(Query.class);
+        when(query.getServer()).thenReturn(server);
+        when(query.toString()).thenReturn("query");
+        when(query.getHost()).thenReturn("foo!bar@baz");
 
-        final ConfigFile file = new ConfigFile(LoggingPlugin.class
-                .getResourceAsStream("plugin.config"));
+        final ConfigFile file = new ConfigFile(LoggingPlugin
+                .class.getResourceAsStream("plugin.config"));
         file.read();
 
         for (Map.Entry<String, String> entry : file.getKeyDomain("defaults").entrySet()) {
@@ -101,7 +119,7 @@ public class LoggingPluginTest {
     public void testQueryOpened() {
         lp.processEvent(CoreActionType.QUERY_OPENED, new StringBuffer(),
                 query);
-        
+
         assertTrue(lp.lines.containsKey("foo!bar@baz"));
         assertEquals(3, lp.lines.get("foo!bar@baz").size());
         assertTrue(lp.lines.get("foo!bar@baz").get(2).isEmpty());

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

@@ -25,9 +25,6 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.harness.ui.UIClassTestRunner;
-import com.dmdirc.harness.ui.UITestIface;
-
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
@@ -44,10 +41,8 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-@RunWith(UIClassTestRunner.class)
-public class MainFrameTest implements UITestIface {
+public class MainFrameTest {
     
     private static FrameFixture window;
     private DialogFixture newwin;
@@ -137,7 +132,7 @@ public class MainFrameTest implements UITestIface {
         window.menuItemWithPath("Server", "Server settings").requireDisabled();
     }
 
-    @Override @After
+    @After
     public void tearDown() throws InterruptedException, InvocationTargetException {
         SwingUtilities.invokeAndWait(new Runnable() {
             @Override

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.addons.ui_swing.components.*;
 import com.dmdirc.Main;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
@@ -31,11 +30,10 @@ import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.TestConfigManagerMap;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.harness.ui.ClassFinder;
-import com.dmdirc.harness.ui.UIClassTestRunner;
-import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
 import com.dmdirc.plugins.PluginManager;
 
 import java.awt.event.KeyEvent;
@@ -52,11 +50,8 @@ import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
-
-@RunWith(UIClassTestRunner.class)
-public class InputTextFrameTest implements UITestIface {
+public class InputTextFrameTest {
 
     static FrameFixture mainframe;
     static JInternalFrameFixture window;

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

@@ -28,19 +28,15 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
-import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.harness.ui.JRadioButtonByTextMatcher;
-
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
-import java.awt.Component;
 
+import java.awt.Component;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
@@ -56,11 +52,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
-@RunWith(UIClassTestRunner.class)
-public class ActionEditorDialogTest implements UITestIface {
+public class ActionEditorDialogTest {
 
     private DialogFixture window;
 
@@ -70,7 +64,6 @@ public class ActionEditorDialogTest implements UITestIface {
     }
 
     @Before
-    @Override
     public void setUp() throws InvalidIdentityFileException {
         IdentityManager.load();
         ActionManager.init();
@@ -81,7 +74,6 @@ public class ActionEditorDialogTest implements UITestIface {
     }
 
     @After
-    @Override
     public void tearDown() {
         if (window != null) {
             window.cleanUp();

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

@@ -27,13 +27,12 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.InvalidIdentityFileException;
-import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.ClassFinder;
-import com.dmdirc.harness.ui.UITestIface;
-
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
+
 import java.lang.reflect.InvocationTargetException;
+
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.text.JTextComponent;
@@ -48,11 +47,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
-@RunWith(UIClassTestRunner.class)
-public class ActionsManagerDialogTest implements UITestIface {
+public class ActionsManagerDialogTest {
     
     private DialogFixture window;
 

test/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialogTest.java

@@ -29,14 +29,11 @@ import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.IdentValidator;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
-import com.dmdirc.harness.ui.UIClassTestRunner;
-import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.harness.ui.ClassFinder;
 import com.dmdirc.harness.ui.ValidatingJTextFieldFinder;
 
 import javax.swing.JList;
 
-import javax.swing.JPanel;
 import org.fest.swing.core.EventMode;
 import org.fest.swing.fixture.DialogFixture;
 
@@ -44,11 +41,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
-@RunWith(UIClassTestRunner.class)
-public class ProfileManagerDialogTest implements UITestIface {
+public class ProfileManagerDialogTest {
 
     private DialogFixture window;
     private Profile profile;

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

@@ -26,8 +26,6 @@ import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.harness.ui.ClassFinder;
 import com.dmdirc.harness.ui.TestSSLCertificateDialogModel;
-import com.dmdirc.harness.ui.UIClassTestRunner;
-import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 
@@ -48,11 +46,9 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import static org.junit.Assert.*;
 
-@RunWith(UIClassTestRunner.class)
-public class SSLCertificateDialogTest implements UITestIface {
+public class SSLCertificateDialogTest {
 
     private DialogFixture window;