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 d672ab6..f04326b 100644 (file)
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -20,7 +20,11 @@
  */
 package jalview.ws.gui;
 
+import java.util.Locale;
+
 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;
@@ -46,6 +50,14 @@ import compbio.metadata.PresetManager;
 
 public class Jws2ParamView
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * which services to test
    */
@@ -57,7 +69,7 @@ public class Jws2ParamView
   public static List<String> presetTests = new ArrayList<String>();
   static
   {
-    serviceTests.add("AAConWS".toLowerCase());
+    serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
   }
 
   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");
-    Cache.initLogger();
+    Console.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
   }
 
@@ -82,7 +94,7 @@ public class Jws2ParamView
     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;