Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[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 b56c10c..f982e9d 100644 (file)
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -20,14 +20,17 @@
  */
 package jalview.ws.gui;
 
+import java.util.Locale;
 import jalview.bin.Cache;
 import jalview.gui.JvOptionPane;
 import jalview.gui.WsJobParameters;
 import jalview.util.MessageManager;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.jabaws.JalviewJabawsTestUtils;
 import jalview.ws.jws2.JabaPreset;
 import jalview.ws.jws2.Jws2Discoverer;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ArgumentI;
 import jalview.ws.params.ParamDatastoreI;
 
 import java.awt.BorderLayout;
@@ -43,7 +46,6 @@ import javax.swing.JPanel;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import compbio.metadata.Argument;
 import compbio.metadata.Preset;
 import compbio.metadata.PresetManager;
 
@@ -68,7 +70,7 @@ public class Jws2ParamView
   public static List<String> presetTests = new ArrayList<>();
   static
   {
-    serviceTests.add("AAConWS".toLowerCase());
+    serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
   }
 
   public static Jws2Discoverer disc = null;
@@ -90,10 +92,12 @@ public class Jws2ParamView
   public void testJws2Gui()
   {
     Iterator<String> presetEnum = presetTests.iterator();
-    for (Jws2Instance service : disc.getServices())
+    for (ServiceWithParameters _service : disc.getServices())
     {
+      // This will fail for non-jabaws services
+      Jws2Instance service = (Jws2Instance) _service;
       if (serviceTests.size() == 0
-              || serviceTests.contains(service.getName().toLowerCase()))
+              || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT)))
       {
         List<Preset> prl = null;
         Preset pr = null;
@@ -131,7 +135,7 @@ public class Jws2ParamView
           }
           WsJobParameters pgui = new WsJobParameters((ParamDatastoreI) null,
                   service, new JabaPreset(service, pr),
-                  (List<Argument>) null);
+                  (List<ArgumentI>) null);
           JFrame jf = new JFrame(MessageManager
                   .formatMessage("label.ws_parameters_for", new String[]
                   { service.getActionText() }));