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-4334 failing test using whole of Q29079 accession. Can be trimmed.
[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
d672ab6
..
e18e9fb
100644
(file)
--- a/
test/jalview/ws/gui/Jws2ParamView.java
+++ b/
test/jalview/ws/gui/Jws2ParamView.java
@@
-20,7
+20,11
@@
*/
package jalview.ws.gui;
*/
package jalview.ws.gui;
+import java.util.Locale;
+
import jalview.bin.Cache;
import jalview.bin.Cache;
+import jalview.bin.Console;
+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
+50,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
*/
@@
-57,7
+69,7
@@
public class Jws2ParamView
public static List<String> presetTests = new ArrayList<String>();
static
{
public static List<String> presetTests = new ArrayList<String>();
static
{
- serviceTests.add("AAConWS".toLowerCase());
+ serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
}
public static Jws2Discoverer disc = null;
}
public static Jws2Discoverer disc = null;
@@
-66,7
+78,7
@@
public class Jws2ParamView
public static void setUpBeforeClass() throws Exception
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
public static void setUpBeforeClass() throws Exception
{
Cache.loadProperties("test/jalview/io/testProps.jvprops");
- Cache.initLogger();
+ Console.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
@@
-81,8
+93,8
@@
public class Jws2ParamView
Iterator<String> presetEnum = presetTests.iterator();
for (Jws2Instance service : disc.getServices())
{
Iterator<String> presetEnum = presetTests.iterator();
for (Jws2Instance service : disc.getServices())
{
- if (serviceTests.size() == 0
- || serviceTests.contains(service.serviceType.toLowerCase()))
+ if (serviceTests.size() == 0 || serviceTests
+ .contains(service.serviceType.toLowerCase(Locale.ROOT)))
{
List<Preset> prl = null;
Preset pr = null;
{
List<Preset> prl = null;
Preset pr = null;
@@
-120,9
+132,9
@@
public class Jws2ParamView
}
WsJobParameters pgui = new WsJobParameters(service,
new JabaPreset(service, pr));
}
WsJobParameters pgui = new WsJobParameters(service,
new JabaPreset(service, pr));
- JFrame jf = new JFrame(MessageManager.formatMessage(
- "label.ws_parameters_for",
- new String[] { service.getActionText() }));
+ JFrame jf = new JFrame(MessageManager
+ .formatMessage("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();