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-244 test files
[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
..
3e0aa36
100644
(file)
--- a/
test/jalview/io/cache/JvCacheableInputBoxTest.java
+++ b/
test/jalview/io/cache/JvCacheableInputBoxTest.java
@@
-20,8
+20,11
@@
*/
package jalview.io.cache;
*/
package jalview.io.cache;
+import java.lang.reflect.InvocationTargetException;
import java.util.LinkedHashSet;
import java.util.LinkedHashSet;
+import javax.swing.SwingUtilities;
+
import org.junit.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.junit.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@
-52,28
+55,23
@@
public class JvCacheableInputBoxTest
cacheBox.addItem(testInput);
cacheBox.setSelectedItem(testInput);
cacheBox.addItem(testInput);
cacheBox.setSelectedItem(testInput);
- /*
try
{
try
{
+ // This delay is essential to prevent the assertion below from executing
+ // before swing thread finishes updating the combo-box
SwingUtilities.invokeAndWait(() -> {
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();
}
{
e.printStackTrace();
}
- ; /*
- });
- } catch (InvocationTargetException | InterruptedException e)
- {
- e.printStackTrace();
- }
- */
userInput = cacheBox.getUserInput();
Assert.assertEquals(testInput, userInput);
}
userInput = cacheBox.getUserInput();
Assert.assertEquals(testInput, userInput);
}
@@
-86,27
+84,22
@@
public class JvCacheableInputBoxTest
cacheBox.setSelectedItem(testInput);
cacheBox.updateCache();
cacheBox.setSelectedItem(testInput);
cacheBox.updateCache();
- /*
try
{
try
{
+ // This delay is to let cacheBox.updateCache() finish updating the cache
SwingUtilities.invokeAndWait(() -> {
SwingUtilities.invokeAndWait(() -> {
- */
- try
- {
- // This delay is to let
- // cacheBox.updateCache() finish updating the cache
- Thread.sleep(1);
- } catch (InterruptedException e)
+ try
+ {
+ Thread.sleep(1);
+ } catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+ });
+ } catch (InvocationTargetException | InterruptedException e)
{
e.printStackTrace();
}
{
e.printStackTrace();
}
- ; /*
- });
- } catch (InvocationTargetException | InterruptedException e)
- {
- e.printStackTrace();
- }
- */
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));