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-3746 release note for JAL-3618 Vaqua config so app directories can be opened
[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
cd0af92
..
f04326b
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.0b2)
- * 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.
*
@@
-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;
@@
-65,7
+77,8
@@
public class Jws2ParamView
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
@BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
- Cache.initLogger();
+ Cache.loadProperties("test/jalview/io/testProps.jvprops");
+ Console.initLogger();
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
@@
-81,7
+94,7
@@
public class Jws2ParamView
for (Jws2Instance service : disc.getServices())
{
if (serviceTests.size() == 0
for (Jws2Instance service : disc.getServices())
{
if (serviceTests.size() == 0
- || serviceTests.contains(service.serviceType.toLowerCase()))
+ || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT)))
{
List<Preset> prl = null;
Preset pr = null;
{
List<Preset> prl = null;
Preset pr = null;
@@
-139,6
+152,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();