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
test HMM annotaTION
[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
5f1132c
..
80b48c3
100644
(file)
--- a/
test/jalview/ws/gui/Jws2ParamView.java
+++ b/
test/jalview/ws/gui/Jws2ParamView.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-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
*/
@@
-65,6
+74,7
@@
public class Jws2ParamView
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
+ Cache.loadProperties("test/jalview/io/testProps.jvprops");
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
Cache.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
@@
-139,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();