From 4b0cc64ad6d62223f1cc63089ce3f3b551e726e5 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Tue, 18 Jul 2023 14:38:34 +0100 Subject: [PATCH 1/1] JAL-4513 reduce wait to invoke fail --- test/jalview/io/cache/JvCacheableInputBoxTest.java | 57 +++++++++++--------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/test/jalview/io/cache/JvCacheableInputBoxTest.java b/test/jalview/io/cache/JvCacheableInputBoxTest.java index 54152a6..3ed15ac 100644 --- a/test/jalview/io/cache/JvCacheableInputBoxTest.java +++ b/test/jalview/io/cache/JvCacheableInputBoxTest.java @@ -20,11 +20,8 @@ */ 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; @@ -55,24 +52,28 @@ public class JvCacheableInputBoxTest cacheBox.addItem(testInput); cacheBox.setSelectedItem(testInput); + /* try { 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) - { - e.printStackTrace(); - } - }); - } catch (InvocationTargetException | InterruptedException e) + */ + 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) { e.printStackTrace(); } + ; /* + }); + } catch (InvocationTargetException | InterruptedException e) + { + e.printStackTrace(); + } + */ userInput = cacheBox.getUserInput(); Assert.assertEquals(testInput, userInput); } @@ -85,23 +86,27 @@ public class JvCacheableInputBoxTest cacheBox.setSelectedItem(testInput); cacheBox.updateCache(); + /* try { SwingUtilities.invokeAndWait(() -> { - try - { - // This delay is to let - // cacheBox.updateCache() finish updating the cache - Thread.sleep(10); - } catch (InterruptedException e) - { - e.printStackTrace(); - } - }); - } catch (InvocationTargetException | InterruptedException e) + */ + try + { + // This delay is to let + // cacheBox.updateCache() finish updating the cache + Thread.sleep(1); + } catch (InterruptedException e) { e.printStackTrace(); } + ; /* + }); + } catch (InvocationTargetException | InterruptedException e) + { + e.printStackTrace(); + } + */ LinkedHashSet foundCache = appCache .getAllCachedItemsFor(TEST_CACHE_KEY); Assert.assertTrue(foundCache.contains(testInput)); -- 1.7.10.2