EDT-ify the actions ui unit tests

Change-Id: I0f5160488ef5bde11fe36d8c82d3a87aa4f1b319
Reviewed-on: http://gerrit.dmdirc.com/787
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

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

@@ -34,26 +34,27 @@ import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Component;
+import java.awt.Dialog;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.swing.JButton;
-import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.text.JTextComponent;
 
 import org.fest.swing.core.matcher.JButtonMatcher;
 import org.fest.swing.core.matcher.JLabelMatcher;
+import org.fest.swing.edt.GuiActionRunner;
+import org.fest.swing.edt.GuiQuery;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.JLabelFixture;
 import org.fest.swing.fixture.JPanelFixture;
+import org.fest.swing.junit.testcase.FestSwingJUnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionEditorDialogTest {
+public class ActionEditorDialogTest extends FestSwingJUnitTestCase {
 
     private DialogFixture window;
 
@@ -66,14 +67,16 @@ public class ActionEditorDialogTest {
     }
 
     @Before
-    public void setUp() throws InvalidIdentityFileException {
+    @Override
+    public void onSetUp() {
         if (!ActionManager.getGroups().containsKey("amd-ui-test1")) {
             ActionManager.makeGroup("amd-ui-test1");
         }
     }
 
     @After
-    public void tearDown() {
+    @Override
+    public void onTearDown() {
         if (window != null) {
             window.cleanUp();
         }
@@ -313,9 +316,16 @@ public class ActionEditorDialogTest {
     }
 
     protected void setupWindow(final Action action) {
-        window = new DialogFixture(ActionEditorDialog.getActionEditorDialog(null,
-                "amd-ui-test1", action));
-        window.robot.settings().eventPostingDelay(250);
+        final Dialog d = GuiActionRunner.execute(new GuiQuery<Dialog>() {
+            @Override
+            protected Dialog executeInEDT() throws Throwable {
+                return ActionEditorDialog.getActionEditorDialog(null,
+                        "amd-ui-test1", action);
+            }
+        });
+        robot().waitForIdle();
+
+        window = new DialogFixture(robot(), d);
         window.show();
     }
 

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

@@ -32,23 +32,26 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
 
-import java.lang.reflect.InvocationTargetException;
+import java.awt.Dialog;
 
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import javax.swing.SwingUtilities;
 
 import org.fest.swing.core.matcher.JButtonMatcher;
+import org.fest.swing.edt.GuiActionRunner;
+import org.fest.swing.edt.GuiQuery;
+import org.fest.swing.edt.GuiTask;
 import org.fest.swing.finder.WindowFinder;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.JButtonFixture;
+import org.fest.swing.junit.testcase.FestSwingJUnitTestCase;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import static org.junit.Assert.*;
 
-public class ActionsManagerDialogTest {
+public class ActionsManagerDialogTest extends FestSwingJUnitTestCase {
     
     private DialogFixture window;
 
@@ -59,17 +62,20 @@ public class ActionsManagerDialogTest {
         ActionManager.init();
         ActionManager.loadActions();
     }
-    
+
+    @Override
     @Before
-    public void setUp() {
+    public void onSetUp() {
         removeGroups();
     }
-    
+
+    @Override
     @After
-    public void tearDown() throws InterruptedException, InvocationTargetException {
-        SwingUtilities.invokeAndWait(new Runnable() {
+    public void onTearDown() {
+        GuiActionRunner.execute(new GuiTask() {
+
             @Override
-            public void run() {
+            protected void executeInEDT() throws Throwable {
                 close();
             }
         });
@@ -228,8 +234,15 @@ public class ActionsManagerDialogTest {
     }
     
     protected void setupWindow() {
-        window = new DialogFixture(ActionsManagerDialog.getActionsManagerDialog(null, null));
-        window.robot.settings().eventPostingDelay(250);
+        final Dialog d = GuiActionRunner.execute(new GuiQuery<Dialog>() {
+            @Override
+            protected Dialog executeInEDT() throws Throwable {
+                return ActionsManagerDialog.getActionsManagerDialog(null, null);
+            }
+        });
+        robot().waitForIdle();
+
+        window = new DialogFixture(robot(), d);
         window.show();
     }