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-2780 JAL-2781 refactored PDB fetch network tests to add in 4IM2 - this test now...
[jalview.git]
/
test
/
jalview
/
ws
/
gui
/
Jws2ParamView.java
diff --git
a/test/jalview/ws/gui/Jws2ParamView.java
b/test/jalview/ws/gui/Jws2ParamView.java
index
b22f0f7
..
80b48c3
100644
(file)
--- a/
test/jalview/ws/gui/Jws2ParamView.java
+++ b/
test/jalview/ws/gui/Jws2ParamView.java
@@
-21,6
+21,7
@@
package jalview.ws.gui;
import jalview.bin.Cache;
package jalview.ws.gui;
import jalview.bin.Cache;
+import jalview.gui.JvOptionPane;
import jalview.gui.WsJobParameters;
import jalview.util.MessageManager;
import jalview.ws.jabaws.JalviewJabawsTestUtils;
import jalview.gui.WsJobParameters;
import jalview.util.MessageManager;
import jalview.ws.jabaws.JalviewJabawsTestUtils;
@@
-46,6
+47,14
@@
import compbio.metadata.PresetManager;
public class Jws2ParamView
{
public class Jws2ParamView
{
+
+ @BeforeClass(alwaysRun = true)
+ public void setUpJvOptionPane()
+ {
+ JvOptionPane.setInteractiveMode(false);
+ JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+ }
+
/**
* which services to test
*/
/**
* which services to test
*/
@@
-62,20
+71,20
@@
public class Jws2ParamView
public static Jws2Discoverer disc = null;
public static Jws2Discoverer disc = null;
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
public static void setUpBeforeClass() throws Exception
{
+ Cache.loadProperties("test/jalview/io/testProps.jvprops");
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
/**
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
/**
- * This test marked Ignore as it appears to need user action to complete
+ * This test marked Interactive as it appears to need user action to complete
* rather than hang
*/
* rather than hang
*/
- @Test(groups =
- { "Functional" }, enabled = false)
+ @Test(groups = { "Interactive" }, enabled = true)
public void testJws2Gui()
{
Iterator<String> presetEnum = presetTests.iterator();
public void testJws2Gui()
{
Iterator<String> presetEnum = presetTests.iterator();
@@
-121,8
+130,8
@@
public class Jws2ParamView
WsJobParameters pgui = new WsJobParameters(service,
new JabaPreset(service, pr));
JFrame jf = new JFrame(MessageManager.formatMessage(
WsJobParameters pgui = new WsJobParameters(service,
new JabaPreset(service, pr));
JFrame jf = new JFrame(MessageManager.formatMessage(
- "label.ws_parameters_for", new String[]
- { service.getActionText() }));
+ "label.ws_parameters_for",
+ new String[] { service.getActionText() }));
jf.setSize(700, 800);
JPanel cont = new JPanel(new BorderLayout());
pgui.validate();
jf.setSize(700, 800);
JPanel cont = new JPanel(new BorderLayout());
pgui.validate();
@@
-140,6
+149,7
@@
public class Jws2ParamView
*/
jf.addWindowListener(new WindowAdapter()
{
*/
jf.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent e)
{
thr.interrupt();
public void windowClosing(WindowEvent e)
{
thr.interrupt();