Merge branch 'develop' into patch/JAL-4281_idwidthandannotHeight_in_project

[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 3ed15ac..ce34044 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();
@@ -52,28 +55,24 @@ public class JvCacheableInputBoxTest
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
 
-    /*
     try
     {
+      // 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
-    {
-      // This delay is essential to prevent the
-      // assertion below from executing before
-      // swing thread finishes updating the combo-box
-      Thread.sleep(10);
-    } catch (InterruptedException e)
+        try
+        {
+          Thread.sleep(1);
+        } catch (InterruptedException e)
+        {
+          e.printStackTrace();
+        }
+      });
+    } catch (InvocationTargetException | InterruptedException e)
     {
       e.printStackTrace();
     }
-    ; /*
-      });
-      } catch (InvocationTargetException | InterruptedException e)
-      {
-      e.printStackTrace();
-      }
-      */
     userInput = cacheBox.getUserInput();
     Assert.assertEquals(testInput, userInput);
   }
@@ -85,28 +84,28 @@ public class JvCacheableInputBoxTest
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
     cacheBox.updateCache();
-
-    /*
-    try
-    {
-      SwingUtilities.invokeAndWait(() -> {
-       */
-    try
+    boolean done[]=new boolean[] { false };
+    // this event gets processed after updateCache's update event on the swing
+    // thread
+    SwingUtilities.invokeLater(() -> {
+        done[0]=true;
+    });
+    long t=0;
+    while (!done[0] && t<200)
     {
-      // This delay is to let
-      // cacheBox.updateCache() finish updating the cache
-      Thread.sleep(1);
-    } catch (InterruptedException e)
+      try {
+        Thread.sleep(7);
+        t++;
+        } catch (InterruptedException e)
+        {
+          e.printStackTrace();
+        }
+    }
+    if (!done[0])
     {
-      e.printStackTrace();
+      Assert.fail("Giving up after 1.4s waiting for cache to be updated.");
     }
-    ; /*
-      });
-      } catch (InvocationTargetException | InterruptedException e)
-      {
-      e.printStackTrace();
-      }
-      */
+    
     LinkedHashSet<String> foundCache = appCache
             .getAllCachedItemsFor(TEST_CACHE_KEY);
     Assert.assertTrue(foundCache.contains(testInput));