git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-4153 avoid use of invokeAndWait, increase wait time and add timeout for the cache...
[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
5f9af25
..
ce34044
100644
(file)
--- a/
test/jalview/io/cache/JvCacheableInputBoxTest.java
+++ b/
test/jalview/io/cache/JvCacheableInputBoxTest.java
@@
-84,24
+84,28
@@
public class JvCacheableInputBoxTest
cacheBox.addItem(testInput);
cacheBox.setSelectedItem(testInput);
cacheBox.updateCache();
cacheBox.addItem(testInput);
cacheBox.setSelectedItem(testInput);
cacheBox.updateCache();
-
- 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)
{
{
- // fix for JAL-4153
- // This delay is to let cacheBox.updateCache() finish updating the cache
- SwingUtilities.invokeAndWait(() -> {
- try
- {
- Thread.sleep(1);
+ try {
+ Thread.sleep(7);
+ t++;
} catch (InterruptedException e)
{
e.printStackTrace();
}
} catch (InterruptedException e)
{
e.printStackTrace();
}
- });
- } catch (InvocationTargetException | InterruptedException e)
+ }
+ if (!done[0])
{
{
- e.printStackTrace();
+ Assert.fail("Giving up after 1.4s waiting for cache to be updated.");
}
}
+
LinkedHashSet<String> foundCache = appCache
.getAllCachedItemsFor(TEST_CACHE_KEY);
Assert.assertTrue(foundCache.contains(testInput));
LinkedHashSet<String> foundCache = appCache
.getAllCachedItemsFor(TEST_CACHE_KEY);
Assert.assertTrue(foundCache.contains(testInput));