Unit test changes

Update FEST
Move UI test harness classes to plugins module
Fix a couple of broken ui unit tests

Change-Id: I12624ecd8c568294e06c304faf522bdc1da366c2
Reviewed-on: http://gerrit.dmdirc.com/454
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -51,7 +51,9 @@ public class MainFrameTest {
     @BeforeClass
     public static void setUpClass() throws InvalidIdentityFileException {
         IdentityManager.load();
+        IdentityManager.getAddonIdentity().setOption("test", "debugEDT", "false");
         controller = new SwingController();
+        controller.setDomain("test");
         controller.onLoad();
 
         Main.setUI(controller);

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

@@ -38,10 +38,9 @@ import com.dmdirc.plugins.PluginManager;
 
 import java.awt.event.KeyEvent;
 
-import org.fest.swing.core.EventMode;
 import org.fest.swing.core.KeyPressInfo;
-import org.fest.swing.core.matcher.DialogByTitleMatcher;
-import org.fest.swing.core.matcher.JButtonByTextMatcher;
+import org.fest.swing.core.matcher.DialogMatcher;
+import org.fest.swing.core.matcher.JButtonMatcher;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.FrameFixture;
 import org.fest.swing.fixture.JInternalFrameFixture;
@@ -62,7 +61,9 @@ public class InputTextFrameTest {
     @BeforeClass
     public static void setUpClass() throws InvalidIdentityFileException {
         IdentityManager.load();
+        IdentityManager.getAddonIdentity().setOption("test", "debugEDT", "false");
         controller = new SwingController();
+        controller.setDomain("test");
         controller.onLoad();
         Main.setUI(controller);
         Main.ensureExists(PluginManager.getPluginManager(), "tabcompletion");
@@ -89,10 +90,10 @@ public class InputTextFrameTest {
     public void testPasteDialogContents() throws InterruptedException {
         ((InputTextFrame) window.target).doPaste("line1\nline2");
 
-        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
-                .withTitleAndShowing("Multi-line paste"));
+        final DialogFixture dlg = mainframe.dialog(DialogMatcher
+                .withTitle("Multi-line paste").andShowing());
 
-        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.requireVisible().button(JButtonMatcher.withText("Edit")).click();
         dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
                 .requireText("line1\nline2");
         dlg.target.dispose();
@@ -103,10 +104,10 @@ public class InputTextFrameTest {
         window.textBox().enterText("testing:");
         ((InputTextFrame) window.target).doPaste("line1\nline2");
 
-        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
-                .withTitleAndShowing("Multi-line paste"));
+        final DialogFixture dlg = mainframe.dialog(DialogMatcher
+                .withTitle("Multi-line paste").andShowing());
 
-        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.requireVisible().button(JButtonMatcher.withText("Edit")).click();
         dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
                 .requireText("testing:line1\nline2");
         dlg.target.dispose();
@@ -118,10 +119,10 @@ public class InputTextFrameTest {
                 KeyPressInfo.keyCode(KeyEvent.VK_HOME));
         ((InputTextFrame) window.target).doPaste("line1\nline2");
 
-        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
-                .withTitleAndShowing("Multi-line paste"));
+        final DialogFixture dlg = mainframe.dialog(DialogMatcher
+                .withTitle("Multi-line paste").andShowing());
 
-        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.requireVisible().button(JButtonMatcher.withText("Edit")).click();
         dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
                 .requireText("line1\nline2<- testing");
         dlg.target.dispose();
@@ -132,10 +133,10 @@ public class InputTextFrameTest {
         window.textBox().enterText("testing:<- testing").selectText(8, 8);
         ((InputTextFrame) window.target).doPaste("line1\nline2");
 
-        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
-                .withTitleAndShowing("Multi-line paste"));
+        final DialogFixture dlg = mainframe.dialog(DialogMatcher
+                .withTitle("Multi-line paste").andShowing());
 
-        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.requireVisible().button(JButtonMatcher.withText("Edit")).click();
         dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
                 .requireText("testing:line1\nline2<- testing");
         dlg.target.dispose();
@@ -145,7 +146,6 @@ public class InputTextFrameTest {
         UIUtilities.initUISettings();
 
         mainframe = new FrameFixture(controller.getMainWindow());
-        mainframe.robot.settings().eventMode(EventMode.AWT);
 
         final CustomInputFrame titf = new CustomInputFrame(owner,
                 GlobalCommandParser.getGlobalCommandParser(), controller);

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

@@ -42,9 +42,8 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.text.JTextComponent;
 
-import org.fest.swing.core.EventMode;
-import org.fest.swing.core.matcher.JButtonByTextMatcher;
-import org.fest.swing.core.matcher.JLabelByTextMatcher;
+import org.fest.swing.core.matcher.JButtonMatcher;
+import org.fest.swing.core.matcher.JLabelMatcher;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.JLabelFixture;
 import org.fest.swing.fixture.JPanelFixture;
@@ -60,14 +59,13 @@ public class ActionEditorDialogTest {
 
     @BeforeClass
     public static void setUpClass() throws InvalidIdentityFileException {
+        IdentityManager.load();
         Main.setUI(new SwingController());
+        ActionManager.init();
     }
 
     @Before
     public void setUp() throws InvalidIdentityFileException {
-        IdentityManager.load();
-        ActionManager.init();
-
         if (!ActionManager.getGroups().containsKey("amd-ui-test1")) {
             ActionManager.makeGroup("amd-ui-test1");
         }
@@ -88,9 +86,9 @@ public class ActionEditorDialogTest {
     public void testName() {
         setupWindow(null);
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().requireEnabled().requireEditable().requireEmpty();
-        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        window.button(JButtonMatcher.withText("OK")).requireDisabled();
     }
 
     @Test
@@ -99,27 +97,27 @@ public class ActionEditorDialogTest {
         // 'Fix' was disabling the add trigger button when name was invalid
         setupWindow(null);
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().requireEnabled().requireEditable().requireEmpty();
-        window.panel(new ClassFinder<JPanel>(ActionTriggersPanel.class, null)).
-                button(JButtonByTextMatcher.withText("Add")).requireDisabled();
+        window.panel(new ClassFinder<ActionTriggersPanel>(ActionTriggersPanel.class, null)).
+                button(JButtonMatcher.withText("Add")).requireDisabled();
     }
 
     @Test
     public void testTriggerWithNoArgs() {
         setupWindow(null);
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().enterText("test1");
         final JPanelFixture triggers = window.panel(
-                new ClassFinder<JPanel>(ActionTriggersPanel.class, null));
+                new ClassFinder<ActionTriggersPanel>(ActionTriggersPanel.class, null));
 
         triggers.comboBox().selectItem("Client closed");
-        triggers.button(JButtonByTextMatcher.withText("Add")).requireEnabled().
+        triggers.button(JButtonMatcher.withText("Add")).requireEnabled().
                 click();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionsPanel.class, null)).
-                button(JButtonByTextMatcher.withText("Add")).requireDisabled();
+        window.panel(new ClassFinder<ActionConditionsPanel>(ActionConditionsPanel.class, null)).
+                button(JButtonMatcher.withText("Add")).requireDisabled();
     }
 
     @Test
@@ -127,55 +125,55 @@ public class ActionEditorDialogTest {
         setupWindow(null);
 
         final JPanelFixture triggers = window.panel(
-                new ClassFinder<JPanel>(ActionTriggersPanel.class, null));
+                new ClassFinder<ActionTriggersPanel>(ActionTriggersPanel.class, null));
         triggers.comboBox().requireDisabled();
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().enterText("test1");
 
         final int items = triggers.comboBox().target.getItemCount();
         triggers.comboBox().requireEnabled().selectItem("Channel message received");
-        triggers.button(JButtonByTextMatcher.withText("Add")).requireEnabled().
+        triggers.button(JButtonMatcher.withText("Add")).requireEnabled().
                 click();
 
         final JLabelFixture label =
-                triggers.label(JLabelByTextMatcher.withText("Channel message received"));
+                triggers.label(JLabelMatcher.withText("Channel message received"));
         label.requireVisible();
 
         assertTrue(items > triggers.comboBox().target.getItemCount());
-        window.button(JButtonByTextMatcher.withText("OK")).requireEnabled();
+        window.button(JButtonMatcher.withText("OK")).requireEnabled();
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().deleteText();
-        triggers.button(new ClassFinder<JButton>(ImageButton.class, null)).
+        triggers.button(new ClassFinder<ImageButton>(ImageButton.class, null)).
                 requireDisabled();
         triggers.comboBox().requireDisabled();
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().enterText("test1");
 
-        triggers.button(new ClassFinder<JButton>(ImageButton.class, null)).
+        triggers.button(new ClassFinder<ImageButton>(ImageButton.class, null)).
                 requireEnabled().click();
 
-        for (Component comp : triggers.panel(new ClassFinder<JPanel>(ActionTriggersListPanel.class,
+        for (Component comp : triggers.panel(new ClassFinder<ActionTriggersListPanel>(ActionTriggersListPanel.class,
                 null)).target.getComponents()) {
             assertNotSame(label.target, comp);
         }
 
         assertEquals(items, triggers.comboBox().target.getItemCount());
-        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        window.button(JButtonMatcher.withText("OK")).requireDisabled();
     }
 
     @Test
     public void testBasicConditionTrees() {
         setupWindow(null);
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().enterText("test1");
         final JPanelFixture triggers = window.panel(
-                new ClassFinder<JPanel>(ActionTriggersPanel.class, null));
+                new ClassFinder<ActionTriggersPanel>(ActionTriggersPanel.class, null));
 
         triggers.comboBox().selectItem("Channel message received");
-        triggers.button(JButtonByTextMatcher.withText("Add")).requireEnabled().
+        triggers.button(JButtonMatcher.withText("Add")).requireEnabled().
                 click();
 
         window.radioButton(new JRadioButtonByTextMatcher("All of the conditions are true")).
@@ -184,78 +182,78 @@ public class ActionEditorDialogTest {
                 requireEnabled();
         window.radioButton(new JRadioButtonByTextMatcher("The conditions match a custom rule")).
                 requireEnabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionsTreePanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(JTextField.class,
+        window.panel(new ClassFinder<ActionConditionsTreePanel>(ActionConditionsTreePanel.class,
+                null)).textBox(new ClassFinder<JTextField>(JTextField.class,
                 null)).requireDisabled();
 
-        window.button(JButtonByTextMatcher.withText("OK")).requireEnabled();
+        window.button(JButtonMatcher.withText("OK")).requireEnabled();
 
         window.radioButton(new JRadioButtonByTextMatcher("The conditions match a custom rule")).
                 click().requireSelected();
-        window.panel(new ClassFinder<JPanel>(ActionConditionsTreePanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(JTextField.class,
+        window.panel(new ClassFinder<ActionConditionsTreePanel>(ActionConditionsTreePanel.class,
+                null)).textBox(new ClassFinder<JTextField>(JTextField.class,
                 null)).requireEnabled().enterText("invalid");
 
-        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        window.button(JButtonMatcher.withText("OK")).requireDisabled();
     }
 
     @Test
     public void testConditionText() {        
         setupWindow(null);
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().enterText("test1");
         final JPanelFixture triggers = window.panel(
-                new ClassFinder<JPanel>(ActionTriggersPanel.class, null));
+                new ClassFinder<ActionTriggersPanel>(ActionTriggersPanel.class, null));
 
         triggers.comboBox().selectItem("Channel message received");
-        triggers.button(JButtonByTextMatcher.withText("Add")).requireEnabled().
+        triggers.button(JButtonMatcher.withText("Add")).requireEnabled().
                 click();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionsPanel.class, null)).
-                button(JButtonByTextMatcher.withText("Add")).requireEnabled().
+        window.panel(new ClassFinder<ActionConditionsPanel>(ActionConditionsPanel.class, null)).
+                button(JButtonMatcher.withText("Add")).requireEnabled().
                 click();
         
         Pattern pattern = Pattern.compile(".+<body>(.+)</body>.+", Pattern.DOTALL);
         
-        Matcher matcher = pattern.matcher(window.panel(new ClassFinder<JPanel>(ActionConditionDisplayPanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(TextLabel.class,
+        Matcher matcher = pattern.matcher(window.panel(new ClassFinder<ActionConditionDisplayPanel>(ActionConditionDisplayPanel.class,
+                null)).textBox(new ClassFinder<TextLabel>(TextLabel.class,
                 null)).target.getText());
         matcher.find();
         assertEquals("<p style=\"margin-top: 0\">\n      \n    </p>", matcher.group(1).trim());
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("argument").selectItem("message");
         
-        matcher = pattern.matcher(window.panel(new ClassFinder<JPanel>(ActionConditionDisplayPanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(TextLabel.class,
+        matcher = pattern.matcher(window.panel(new ClassFinder<ActionConditionDisplayPanel>(ActionConditionDisplayPanel.class,
+                null)).textBox(new ClassFinder<TextLabel>(TextLabel.class,
                 null)).target.getText());
         matcher.find();
         assertEquals("The message's ...", matcher.group(1).trim());
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("component").selectItem("content");
         
-        matcher = pattern.matcher(window.panel(new ClassFinder<JPanel>(ActionConditionDisplayPanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(TextLabel.class,
+        matcher = pattern.matcher(window.panel(new ClassFinder<ActionConditionDisplayPanel>(ActionConditionDisplayPanel.class,
+                null)).textBox(new ClassFinder<TextLabel>(TextLabel.class,
                 null)).target.getText());
         matcher.find();
         assertEquals("The message's content ...", matcher.group(1).trim());
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("comparison").selectItem("contains");
         
-        matcher = pattern.matcher(window.panel(new ClassFinder<JPanel>(ActionConditionDisplayPanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(TextLabel.class,
+        matcher = pattern.matcher(window.panel(new ClassFinder<ActionConditionDisplayPanel>(ActionConditionDisplayPanel.class,
+                null)).textBox(new ClassFinder<TextLabel>(TextLabel.class,
                 null)).target.getText());
         matcher.find();
         assertEquals("The message's content contains ''", matcher.group(1).trim());
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).textBox().enterText("foo");
         
-        matcher = pattern.matcher(window.panel(new ClassFinder<JPanel>(ActionConditionDisplayPanel.class,
-                null)).textBox(new ClassFinder<JTextComponent>(TextLabel.class,
+        matcher = pattern.matcher(window.panel(new ClassFinder<ActionConditionDisplayPanel>(ActionConditionDisplayPanel.class,
+                null)).textBox(new ClassFinder<TextLabel>(TextLabel.class,
                 null)).target.getText());
         matcher.find();
         assertEquals("The message's content contains 'foo'", matcher.group(1).trim());
@@ -265,60 +263,57 @@ public class ActionEditorDialogTest {
     public void testIllegalCondition() {
         setupWindow(null);
 
-        window.panel(new ClassFinder<JPanel>(ActionNamePanel.class, null)).
+        window.panel(new ClassFinder<ActionNamePanel>(ActionNamePanel.class, null)).
                 textBox().enterText("test1");
         final JPanelFixture triggers = window.panel(
-                new ClassFinder<JPanel>(ActionTriggersPanel.class, null));
+                new ClassFinder<ActionTriggersPanel>(ActionTriggersPanel.class, null));
 
         triggers.comboBox().selectItem("Channel message received");
-        triggers.button(JButtonByTextMatcher.withText("Add")).requireEnabled().
-                click();
+        triggers.button(JButtonMatcher.withText("Add")).requireEnabled().click();
 
-        window.button(JButtonByTextMatcher.withText("OK")).requireEnabled();
+        window.button(JButtonMatcher.withText("OK")).requireEnabled();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionsPanel.class, null)).
-                button(JButtonByTextMatcher.withText("Add")).requireEnabled().
-                click();
+        window.panel(new ClassFinder<ActionConditionsPanel>(ActionConditionsPanel.class, null)).
+                button(JButtonMatcher.withText("Add")).requireEnabled().click();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("argument").requireEnabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("component").requireDisabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("comparison").requireDisabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).textBox().requireDisabled();
-        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        window.button(JButtonMatcher.withText("OK")).requireDisabled();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("argument").selectItem("message");
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("component").requireEnabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("comparison").requireDisabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).textBox().requireDisabled();
-        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        window.button(JButtonMatcher.withText("OK")).requireDisabled();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("component").selectItem("content");
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("comparison").requireEnabled();
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).textBox().requireDisabled();
-        window.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        window.button(JButtonMatcher.withText("OK")).requireDisabled();
 
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).comboBox("comparison").selectItem("contains");
-        window.panel(new ClassFinder<JPanel>(ActionConditionEditorPanel.class,
+        window.panel(new ClassFinder<ActionConditionEditorPanel>(ActionConditionEditorPanel.class,
                 null)).textBox().requireEnabled();
-        window.button(JButtonByTextMatcher.withText("OK")).requireEnabled();
+        window.button(JButtonMatcher.withText("OK")).requireEnabled();
     }
 
     protected void setupWindow(final Action action) {
         window = new DialogFixture(ActionEditorDialog.getActionEditorDialog(null,
                 "amd-ui-test1", action));
-        window.robot.settings().eventMode(EventMode.AWT);
         window.show();
     }
 

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

@@ -34,11 +34,10 @@ import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 import java.lang.reflect.InvocationTargetException;
 
 import javax.swing.JPanel;
+import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
-import javax.swing.text.JTextComponent;
 
-import org.fest.swing.core.EventMode;
-import org.fest.swing.core.matcher.JButtonByTextMatcher;
+import org.fest.swing.core.matcher.JButtonMatcher;
 import org.fest.swing.finder.JOptionPaneFinder;
 import org.fest.swing.finder.WindowFinder;
 import org.fest.swing.fixture.DialogFixture;
@@ -55,8 +54,8 @@ public class ActionsManagerDialogTest {
 
     @BeforeClass
     public static void setUpClass() throws InvalidIdentityFileException {
-        Main.setUI(new SwingController());
         IdentityManager.load();
+        Main.setUI(new SwingController());
         ActionManager.init();
     }
     
@@ -98,7 +97,7 @@ public class ActionsManagerDialogTest {
         setupWindow();
         
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Add")).click();
+                .button(JButtonMatcher.withText("Add")).click();
         
         DialogFixture newwin = WindowFinder.findDialog(StandardInputDialog.class)
                 .withTimeout(5000).using(window.robot);
@@ -106,23 +105,23 @@ public class ActionsManagerDialogTest {
         newwin.requireVisible();
         assertEquals("New action group", newwin.target.getTitle());
         
-        newwin.button(JButtonByTextMatcher.withText("Cancel")).click();
+        newwin.button(JButtonMatcher.withText("Cancel")).click();
         
         newwin.requireNotVisible();
         
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Add")).click();
+                .button(JButtonMatcher.withText("Add")).click();
         
         newwin = WindowFinder.findDialog(StandardInputDialog.class)
                 .withTimeout(5000).using(window.robot);
         
         newwin.requireVisible();
-        newwin.button(JButtonByTextMatcher.withText("OK")).requireDisabled();
+        newwin.button(JButtonMatcher.withText("OK")).requireDisabled();
         
-        newwin.textBox(new ClassFinder<JTextComponent>(javax.swing.JTextField.class,
+        newwin.textBox(new ClassFinder<JTextField>(JTextField.class,
                 null)).enterText("amd-ui-test1");
         
-        newwin.button(JButtonByTextMatcher.withText("OK")).requireEnabled().click();
+        newwin.button(JButtonMatcher.withText("OK")).requireEnabled().click();
         
         window.list().requireSelectedItems("amd-ui-test1");
 
@@ -137,7 +136,7 @@ public class ActionsManagerDialogTest {
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
         
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Delete")).requireEnabled().click();
+                .button(JButtonMatcher.withText("Delete")).requireEnabled().click();
         
         JOptionPaneFixture newwin = JOptionPaneFinder.findOptionPane()
                 .withTimeout(5000).using(window.robot);
@@ -147,7 +146,7 @@ public class ActionsManagerDialogTest {
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
         
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Delete")).click();
+                .button(JButtonMatcher.withText("Delete")).click();
         
         newwin = JOptionPaneFinder.findOptionPane()
                 .withTimeout(5000).using(window.robot);
@@ -166,15 +165,15 @@ public class ActionsManagerDialogTest {
         
         window.list().selectItem("performs").requireSelectedItems("performs");
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Delete")).requireDisabled();
+                .button(JButtonMatcher.withText("Delete")).requireDisabled();
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Edit")).requireDisabled();
+                .button(JButtonMatcher.withText("Edit")).requireDisabled();
         
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Delete")).requireEnabled();
+                .button(JButtonMatcher.withText("Delete")).requireEnabled();
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Edit")).requireEnabled();
+                .button(JButtonMatcher.withText("Edit")).requireEnabled();
     }
 
     @Test
@@ -182,8 +181,8 @@ public class ActionsManagerDialogTest {
         ActionManager.makeGroup("amd-ui-test1");
         setupWindow();
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
-        window.panel(new ClassFinder<JPanel>(ActionsGroupPanel.class, null))
-                .button(JButtonByTextMatcher.withText("Add")).click();
+        window.panel(new ClassFinder<ActionsGroupPanel>(ActionsGroupPanel.class, null))
+                .button(JButtonMatcher.withText("Add")).click();
 
         DialogFixture newwin = WindowFinder.findDialog(ActionEditorDialog.class)
                 .withTimeout(5000).using(window.robot);
@@ -196,7 +195,7 @@ public class ActionsManagerDialogTest {
         
         window.list().selectItem("amd-ui-test1").requireSelectedItems("amd-ui-test1");
         window.panel(new ClassFinder<JPanel>(JPanel.class, "Groups"))
-                .button(JButtonByTextMatcher.withText("Edit")).requireEnabled().click();
+                .button(JButtonMatcher.withText("Edit")).requireEnabled().click();
         
         DialogFixture newwin = WindowFinder.findDialog(StandardInputDialog.class)
                 .withTimeout(5000).using(window.robot);
@@ -205,12 +204,12 @@ public class ActionsManagerDialogTest {
         assertEquals("Edit action group", newwin.target.getTitle());
         
         assertEquals("amd-ui-test1", 
-                newwin.textBox(new ClassFinder<JTextComponent>(javax.swing.JTextField.class,
+                newwin.textBox(new ClassFinder<JTextField>(JTextField.class,
                 null)).target.getText());
         
-        newwin.textBox(new ClassFinder<JTextComponent>(javax.swing.JTextField.class,
+        newwin.textBox(new ClassFinder<JTextField>(JTextField.class,
                 null)).deleteText().enterText("amd-ui-test2");
-        newwin.button(JButtonByTextMatcher.withText(button)).requireEnabled().click();
+        newwin.button(JButtonMatcher.withText(button)).requireEnabled().click();
     }
     
     @Test
@@ -229,7 +228,6 @@ public class ActionsManagerDialogTest {
     
     protected void setupWindow() {
         window = new DialogFixture(ActionsManagerDialog.getActionsManagerDialog(null, null));
-        window.robot.settings().eventMode(EventMode.AWT);
         window.show();
     }
 

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

@@ -26,6 +26,8 @@ import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.IdentValidator;
 import com.dmdirc.config.prefs.validator.NotEmptyValidator;
@@ -34,7 +36,6 @@ import com.dmdirc.harness.ui.ValidatingJTextFieldFinder;
 
 import javax.swing.JList;
 
-import org.fest.swing.core.EventMode;
 import org.fest.swing.fixture.DialogFixture;
 
 import org.junit.After;
@@ -49,13 +50,14 @@ public class ProfileManagerDialogTest {
     private Profile profile;
 
     @BeforeClass
-    public static void setUpClass() {
+    public static void setUpClass() throws InvalidIdentityFileException {
+        IdentityManager.load();
+        UIUtilities.initUISettings();
         Main.setUI(new SwingController());
     }
 
     @Before
     public void setUp() {
-        UIUtilities.initUISettings();
         profile = new Profile("unit-test1", "nick1", "real name", "ident");
         profile.save();
     }
@@ -89,8 +91,6 @@ public class ProfileManagerDialogTest {
 
     protected void setupWindow() {
         window = new DialogFixture(ProfileManagerDialog.getProfileManagerDialog(null));
-
-        window.robot.settings().eventMode(EventMode.AWT);
         window.show();
     }
 

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

@@ -24,26 +24,25 @@ package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.Main;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.harness.ui.ClassFinder;
 import com.dmdirc.harness.ui.TestSSLCertificateDialogModel;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 
+import com.dmdirc.config.IdentityManager;
 import java.awt.Component;
 import java.util.Arrays;
 
 import javax.swing.Icon;
 import javax.swing.JLabel;
-import javax.swing.JList;
-import javax.swing.JScrollPane;
 import javax.swing.border.TitledBorder;
 
-import org.fest.swing.core.EventMode;
+import org.fest.swing.driver.BasicCellRendererReader;
 import org.fest.swing.driver.BasicJListCellReader;
 import org.fest.swing.fixture.DialogFixture;
 
 import org.junit.After;
-import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
@@ -53,13 +52,10 @@ public class SSLCertificateDialogTest {
     private DialogFixture window;
 
     @BeforeClass
-    public static void setUpClass() {
-        Main.setUI(new SwingController());
-    }
-
-    @Before
-    public void setUp() {
+    public static void setUpClass() throws InvalidIdentityFileException {
+        IdentityManager.load();
         UIUtilities.initUISettings();
+        Main.setUI(new SwingController());
     }
 
     @After
@@ -87,7 +83,8 @@ public class SSLCertificateDialogTest {
             "cross",
             "tick",
             "cross"
-        },window.list().cellReader(new CertificateListCellReader()).contents()));
+        },window.list().cellReader(new BasicJListCellReader(new CertificateListCellReader()))
+                .contents()));
     }
 
     @Test
@@ -100,7 +97,7 @@ public class SSLCertificateDialogTest {
             window.list().selectItem(cert).requireSelection(cert);
 
             assertEquals("Information for " + cert, ((TitledBorder) window
-                    .scrollPane(new ClassFinder<JScrollPane>(CertificateInfoPanel.class, null))
+                    .scrollPane(new ClassFinder<CertificateInfoPanel>(CertificateInfoPanel.class, null))
                     .target.getBorder()).getTitle());
         }
     }
@@ -108,18 +105,15 @@ public class SSLCertificateDialogTest {
     protected void setupWindow() {
         window = new DialogFixture(new SSLCertificateDialog(null,
                 new TestSSLCertificateDialogModel()));
-
-        window.robot.settings().eventMode(EventMode.AWT);
         window.show();
     }
 
-    private static class CertificateListCellReader extends BasicJListCellReader {
-
-        public String valueAt(JList arg0, int arg1) {
-            final Component c = cellRendererComponent(arg0, arg1);
+    private static class CertificateListCellReader extends BasicCellRendererReader {
 
+        @Override
+        public String valueFrom(Component c) {
             final Icon target = ((JLabel) c).getIcon();
-            
+
             for (String icon : new String[]{"tick", "cross", "nothing"}) {
                 if (target == IconManager.getIconManager().getIcon(icon)) {
                     return icon;

test/com/dmdirc/harness/ui/ClassFinder.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.harness.ui;
+
+import java.awt.Component;
+import org.fest.swing.core.GenericTypeMatcher;
+
+public class ClassFinder<T extends Component> extends GenericTypeMatcher<T> {
+
+    protected final Class<T> clazz;
+    protected final String name;
+
+    public ClassFinder(final Class<T> clazz, final String name) {
+        super(clazz);
+        
+        this.clazz = clazz;
+        this.name = name;
+    }
+    
+    @Override
+    protected boolean isMatching(T arg0) {
+        return arg0.getClass().equals(clazz)
+                && ((arg0.getName() == null && name == null
+                || (arg0.getName() != null && arg0.getName().equals(name))));
+    }
+
+}

test/com/dmdirc/harness/ui/JRadioButtonByTextMatcher.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.harness.ui;
+
+import javax.swing.JRadioButton;
+import org.fest.swing.core.GenericTypeMatcher;
+
+public class JRadioButtonByTextMatcher extends GenericTypeMatcher<JRadioButton> {
+
+    private final String name;
+
+    public JRadioButtonByTextMatcher(final String name) {
+        super(JRadioButton.class);
+        
+        this.name = name;
+    }
+
+    @Override
+    protected boolean isMatching(JRadioButton arg0) {
+        return arg0.getText().equals(name);
+    }
+
+}

test/com/dmdirc/harness/ui/TestSSLCertificateDialogModel.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.harness.ui;
+
+import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateAction;
+import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateChainEntry;
+import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateInformationEntry;
+import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateSummaryEntry;
+import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class TestSSLCertificateDialogModel extends SSLCertificateDialogModel {
+
+    public CertificateAction action = null;
+    public boolean needsResponse = true;
+
+    public TestSSLCertificateDialogModel() {
+        super(null, null, null);
+    }
+
+    @Override
+    public List<CertificateChainEntry> getCertificateChain() {
+        return Arrays.asList(new CertificateChainEntry[]{
+            new CertificateChainEntry("first cert", false, false),
+            new CertificateChainEntry("second cert", false, false),
+            new CertificateChainEntry("invalid cert", false, true),
+            new CertificateChainEntry("trusted cert", true, false),
+            new CertificateChainEntry("invalid+trusted", true, true),
+        });
+    }
+
+    @Override
+    public List<List<CertificateInformationEntry>> getCertificateInfo(int index) {
+        final List<List<CertificateInformationEntry>> res
+                = new ArrayList<List<CertificateInformationEntry>>();
+        
+        res.add(Arrays.asList(new CertificateInformationEntry[]{
+            new CertificateInformationEntry("G1 T1", "value", false, false),
+            new CertificateInformationEntry("G1 T2 missing", "value", false, true),
+            new CertificateInformationEntry("G1 T3 invalid", "value", true, false),
+        }));
+
+        res.add(Arrays.asList(new CertificateInformationEntry[]{
+            new CertificateInformationEntry("G2 T1", "value", false, false),
+            new CertificateInformationEntry("G2 T2 missing", "value", false, true),
+            new CertificateInformationEntry("G2 T3 invalid", "value", true, false),
+        }));
+
+        res.add(Arrays.asList(new CertificateInformationEntry[]{
+            new CertificateInformationEntry("G3 T1", "value", false, false),
+            new CertificateInformationEntry("G3 T2 missing", "value", false, true),
+            new CertificateInformationEntry("G3 T3 invalid", "value", true, false),
+        }));
+
+        return res;
+    }
+
+    @Override
+    public List<CertificateSummaryEntry> getSummary() {
+        return Arrays.asList(new CertificateSummaryEntry[]{
+            new CertificateSummaryEntry("Valid entry one", true),
+            new CertificateSummaryEntry("Valid entry two", true),
+            new CertificateSummaryEntry("INVALID ENTRY!!1111one", false),
+        });
+    }
+
+    @Override
+    public boolean needsResponse() {
+        return needsResponse;
+    }
+
+    @Override
+    public void performAction(CertificateAction action) {
+        this.action = action;
+    }
+
+    @Override
+    public String getServerName() {
+        return "server.name";
+    }
+
+}

test/com/dmdirc/harness/ui/ValidatingJTextFieldFinder.java

@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2006-2010 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.harness.ui;
+
+import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
+import com.dmdirc.config.prefs.validator.Validator;
+import javax.swing.JTextField;
+import org.fest.swing.core.GenericTypeMatcher;
+
+public class ValidatingJTextFieldFinder extends GenericTypeMatcher<JTextField> {
+
+    private final Class<? extends Validator> validator;
+
+    public ValidatingJTextFieldFinder(final Class<? extends Validator> validator) {
+        super(JTextField.class);
+        this.validator = validator;
+    }
+    
+    @Override
+    protected boolean isMatching(JTextField arg0) {
+        return arg0.getParent() instanceof ValidatingJTextField &&
+                validator.isAssignableFrom(((ValidatingJTextField) arg0.getParent()).getValidator()
+                .getClass());
+    }
+
+}