JAL-3253-applet JAL-3423

[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 010a4b2..73aae61 100644 (file)
--- a/test/jalview/io/cache/JvCacheableInputBoxTest.java
+++ b/test/jalview/io/cache/JvCacheableInputBoxTest.java
@@ -13,7 +13,7 @@ public class JvCacheableInputBoxTest
 
   private static final String TEST_CACHE_KEY = "CACHE.UNIT_TEST";
 
-  private JvCacheableInputBox<String> cacheBox = new JvCacheableInputBox<String>(
+  private JvCacheableInputBox<String> cacheBox = new JvCacheableInputBox<>(
           TEST_CACHE_KEY);
 
   @BeforeClass(alwaysRun = true)
@@ -31,17 +31,18 @@ public class JvCacheableInputBoxTest
     String testInput = "TestInput";
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
+    cacheBox.updateCacheNow();
 
-    try
-    {
-      // This 1ms delay is essential to prevent the
-      // assertion below from executing before
-      // swing thread finishes updating the combo-box
-      Thread.sleep(100);
-    } catch (InterruptedException e)
-    {
-      e.printStackTrace();
-    }
+    // try
+    // {
+    // // This delay is essential to prevent the
+    // // assertion below from executing before
+    // // swing thread finishes updating the combo-box
+    // Thread.sleep(100);
+    // } catch (InterruptedException e)
+    // {
+    // e.printStackTrace();
+    // }
     userInput = cacheBox.getUserInput();
     Assert.assertEquals(testInput, userInput);
   }
@@ -52,16 +53,20 @@ public class JvCacheableInputBoxTest
     String testInput = "TestInput";
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
-    cacheBox.updateCache();
-    try
-    {
-      // This delay is to let
-      // cacheBox.updateCache() finish updating the cache
-      Thread.sleep(200);
-    } catch (InterruptedException e)
-    {
-      e.printStackTrace();
-    }
+    cacheBox.updateCacheNow();
+    // synchronized (this)
+    // {
+    // try
+    // {
+    // wait(100);
+    // // This delay is to let
+    // // cacheBox.updateCache() finish updating the cache
+    // Thread.sleep(200);
+    // } catch (InterruptedException e)
+    // {
+    // e.printStackTrace();
+    // }
+    // }
     LinkedHashSet<String> foundCache = appCache
             .getAllCachedItemsFor(TEST_CACHE_KEY);
     Assert.assertTrue(foundCache.contains(testInput));