Merge branch 'develop' into patch/JAL-4110_stdout_for_tests

[jalview.git] / test / jalview / io / cache / JvCacheableInputBoxTest.java

diff --git a/test/jalview/io/cache/JvCacheableInputBoxTest.java b/test/jalview/io/cache/JvCacheableInputBoxTest.java
index 9946f4c..5f9af25 100644 (file)
--- a/test/jalview/io/cache/JvCacheableInputBoxTest.java
+++ b/test/jalview/io/cache/JvCacheableInputBoxTest.java
@@ -20,8 +20,11 @@
  */
 package jalview.io.cache;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.LinkedHashSet;
 
+import javax.swing.SwingUtilities;
+
 import org.junit.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -42,7 +45,7 @@ public class JvCacheableInputBoxTest
     appCache = AppCache.getInstance();
   }
 
-  @Test(groups = { "Functional" })
+  @Test(groups = { "Functional", "testTask2" })
   public void getUserInputTest()
   {
     String userInput = cacheBox.getUserInput();
@@ -54,11 +57,19 @@ public class JvCacheableInputBoxTest
 
     try
     {
-      // This delay is essential to prevent the
-      // assertion below from executing before
-      // swing thread finishes updating the combo-box
-      Thread.sleep(350);
-    } catch (InterruptedException e)
+      // fix for JAL-4153
+      // This delay is essential to prevent the assertion below from executing
+      // before swing thread finishes updating the combo-box
+      SwingUtilities.invokeAndWait(() -> {
+        try
+        {
+          Thread.sleep(1);
+        } catch (InterruptedException e)
+        {
+          e.printStackTrace();
+        }
+      });
+    } catch (InvocationTargetException | InterruptedException e)
     {
       e.printStackTrace();
     }
@@ -73,12 +84,21 @@ public class JvCacheableInputBoxTest
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
     cacheBox.updateCache();
+
     try
     {
-      // This delay is to let
-      // cacheBox.updateCache() finish updating the cache
-      Thread.sleep(350);
-    } catch (InterruptedException e)
+      // fix for JAL-4153
+      // This delay is to let cacheBox.updateCache() finish updating the cache
+      SwingUtilities.invokeAndWait(() -> {
+        try
+        {
+          Thread.sleep(1);
+        } catch (InterruptedException e)
+        {
+          e.printStackTrace();
+        }
+      });
+    } catch (InvocationTargetException | InterruptedException e)
     {
       e.printStackTrace();
     }