From 7c6dc8ce96f205c9330592ac18d5e9e6ef9407e0 Mon Sep 17 00:00:00 2001 From: gmungoc Date: Fri, 17 Aug 2018 11:38:33 +0100 Subject: [PATCH] JAL-3038 unit test updates for JalviewJS workaround hack --- src/jalview/io/cache/JvCacheableInputBox.java | 8 ++++++++ test/jalview/fts/service/pdb/PDBFTSPanelTest.java | 7 +++++-- test/jalview/io/cache/JvCacheableInputBoxTest.java | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/jalview/io/cache/JvCacheableInputBox.java b/src/jalview/io/cache/JvCacheableInputBox.java index 5e79393..d2ad8de 100644 --- a/src/jalview/io/cache/JvCacheableInputBox.java +++ b/src/jalview/io/cache/JvCacheableInputBox.java @@ -379,4 +379,12 @@ public class JvCacheableInputBox } } + public void addItem(String item) + { + if (!Jalview.isJS()) + { + comboBox.addItem(item); + } + } + } diff --git a/test/jalview/fts/service/pdb/PDBFTSPanelTest.java b/test/jalview/fts/service/pdb/PDBFTSPanelTest.java index 9912e44..224a712 100644 --- a/test/jalview/fts/service/pdb/PDBFTSPanelTest.java +++ b/test/jalview/fts/service/pdb/PDBFTSPanelTest.java @@ -33,6 +33,8 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import junit.extensions.PA; + public class PDBFTSPanelTest { @@ -103,12 +105,13 @@ public class PDBFTSPanelTest { PDBFTSPanel searchPanel = new PDBFTSPanel(null); JInternalFrame mainFrame = searchPanel.getMainFrame(); - JComboBox txt_search = searchPanel.getTxtSearch(); +// JComboBox txt_search = PA.gsearchPanel.getTxtSearch(); assertTrue(mainFrame.getTitle().length() == 20); assertTrue(mainFrame.getTitle() .equalsIgnoreCase("PDB Sequence Fetcher")); - txt_search.setSelectedItem("ABC"); + PA.invokeMethod(PA.getValue(searchPanel, "txt_search"), "setSelectedItem(java.lang.String)", "ABC"); + // txt_search.setSelectedItem("ABC"); try { // wait for web-service to handle response diff --git a/test/jalview/io/cache/JvCacheableInputBoxTest.java b/test/jalview/io/cache/JvCacheableInputBoxTest.java index dfd7973..6c79f31 100644 --- a/test/jalview/io/cache/JvCacheableInputBoxTest.java +++ b/test/jalview/io/cache/JvCacheableInputBoxTest.java @@ -34,7 +34,7 @@ public class JvCacheableInputBoxTest try { - // This 1ms delay is essential to prevent the + // This delay is essential to prevent the // assertion below from executing before // swing thread finishes updating the combo-box Thread.sleep(100); -- 1.7.10.2