Make SSL cert dialog test using Fest testcase

Change-Id: I2a3f8d15645bd9df2eb46b631e08eacfb9ee1abf
Reviewed-on: http://gerrit.dmdirc.com/793
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Automatic-Compile: Shane Mc Cormack <shane@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import com.dmdirc.config.IdentityManager;
 import java.awt.Component;
+import java.awt.Dialog;
 import java.util.Arrays;
 
 import javax.swing.Icon;
@@ -40,14 +41,18 @@ import javax.swing.border.TitledBorder;
 
 import org.fest.swing.driver.BasicCellRendererReader;
 import org.fest.swing.driver.BasicJListCellReader;
+import org.fest.swing.edt.GuiActionRunner;
+import org.fest.swing.edt.GuiQuery;
 import org.fest.swing.fixture.DialogFixture;
 
+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 SSLCertificateDialogTest {
+public class SSLCertificateDialogTest extends FestSwingJUnitTestCase {
 
     private DialogFixture window;
 
@@ -58,8 +63,14 @@ public class SSLCertificateDialogTest {
         Main.setUI(new SwingController());
     }
 
+    @Before
+    @Override
+    public void onSetUp() {
+    }
+
     @After
-    public void tearDown() {
+    @Override
+    public void onTearDown() {
         if (window != null) {
             window.cleanUp();
         }
@@ -94,7 +105,9 @@ public class SSLCertificateDialogTest {
         window.list().requireSelection("first cert");
         
         for (String cert : window.list().contents()) {
-            window.list().selectItem(cert).requireSelection(cert);
+            window.list().selectItem(cert);
+            robot().waitForIdle();
+            window.list().requireSelection(cert);
 
             assertEquals("Information for " + cert, ((TitledBorder) window
                     .scrollPane(new ClassFinder<CertificateInfoPanel>(CertificateInfoPanel.class, null))
@@ -103,8 +116,16 @@ public class SSLCertificateDialogTest {
     }
 
     protected void setupWindow() {
-        window = new DialogFixture(new SSLCertificateDialog(null,
-                new TestSSLCertificateDialogModel()));
+        final Dialog d = GuiActionRunner.execute(new GuiQuery<Dialog>() {
+            @Override
+            protected Dialog executeInEDT() throws Throwable {
+                return new SSLCertificateDialog(null,
+                new TestSSLCertificateDialogModel());
+            }
+        });
+        robot().waitForIdle();
+
+        window = new DialogFixture(robot(), d);
         window.show();
     }