JAL-32423 tidying

[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 dfd7973..7a2f8b4 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,7 @@ public class JvCacheableInputBoxTest
     String testInput = "TestInput";
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
-
-    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();
-    }
+    cacheBox.updateCacheNow(); // synchronous update
     userInput = cacheBox.getUserInput();
     Assert.assertEquals(testInput, userInput);
   }
@@ -52,17 +42,7 @@ public class JvCacheableInputBoxTest
     String testInput = "TestInput";
     cacheBox.addItem(testInput);
     cacheBox.setSelectedItem(testInput);
-    cacheBox.updateCache();
-    try
-    {
-      // This 1ms delay is essential to prevent the
-      // assertion below from executing before
-      // cacheBox.updateCache() finishes updating the cache
-      Thread.sleep(100);
-    } catch (InterruptedException e)
-    {
-      e.printStackTrace();
-    }
+    cacheBox.updateCacheNow();
     LinkedHashSet<String> foundCache = appCache
             .getAllCachedItemsFor(TEST_CACHE_KEY);
     Assert.assertTrue(foundCache.contains(testInput));