From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 26 Oct 2017 09:57:13 +0000 (+0100)
Subject: JAL-2392 test asserts for progressbar creation on the Swing GUI thread.
X-Git-Tag: Release_2_10_3b1~66
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=68a89e0fafd92408be5aba40a9167934944b938d;hp=2e78324ac6e6dba9f3db8939df4e777a0b097300;p=jalview.git

JAL-2392 test asserts for progressbar creation on the Swing GUI thread.
---

diff --git a/test/jalview/gui/ProgressBarTest.java b/test/jalview/gui/ProgressBarTest.java
index a1715e9..72a288b 100644
--- a/test/jalview/gui/ProgressBarTest.java
+++ b/test/jalview/gui/ProgressBarTest.java
@@ -29,6 +29,7 @@ import java.awt.GridLayout;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -119,8 +120,15 @@ public class ProgressBarTest
    * @param layout
    * @param msgs
    */
-  private void verifyProgress(GridLayout layout, String[] msgs)
+  private void verifyProgress(final GridLayout layout, final String[] msgs)
   {
+    try
+    {
+    SwingUtilities.invokeAndWait(new Runnable()
+    {
+      @Override
+      public void run()
+      {
     int msgCount = msgs.length;
     assertEquals(1 + msgCount, layout.getRows());
     assertEquals(msgCount, statusPanel.getComponentCount());
@@ -132,5 +140,13 @@ public class ProgressBarTest
       assertEquals(msgs[i++],
               ((JLabel) ((JPanel) c).getComponent(0)).getText());
     }
+      }
+    });
+    } catch (Exception e)
+    {
+      throw new AssertionError(
+              "Unexpected exception waiting for progress bar validation",
+              e);
+    }
   }
 }