Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD

[jalview.git] / test / jalview / ws / jws2 / ParameterUtilsTest.java

diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java
index 66ce169..05bb4af 100644 (file)
--- a/test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/test/jalview/ws/jws2/ParameterUtilsTest.java
@@ -20,12 +20,14 @@
  */
 package jalview.ws.jws2;
 
+import java.util.Locale;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
 import jalview.bin.Cache;
 import jalview.gui.JvOptionPane;
+import jalview.ws.api.ServiceWithParameters;
 import jalview.ws.api.UIinfo;
 import jalview.ws.jabaws.JalviewJabawsTestUtils;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
@@ -69,7 +71,7 @@ public class ParameterUtilsTest
   @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
-    serviceTests.add("AAConWS".toLowerCase());
+    serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
     Cache.loadProperties("test/jalview/io/testProps.jvprops");
     Cache.initLogger();
     disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
@@ -78,10 +80,11 @@ public class ParameterUtilsTest
   @Test(groups = { "Network" })
   public void testWriteParameterSet() throws WrongParameterException
   {
-    for (Jws2Instance service : disc.getServices())
+    for (ServiceWithParameters _service : disc.getServices())
     {
-      if (isForTesting(service))
+      if (isForTesting(_service))
       {
+        Jws2Instance service = (Jws2Instance) _service;
 
         List<Preset> prl = null;
         PresetManager prman = service.getPresets();
@@ -132,16 +135,17 @@ public class ParameterUtilsTest
   public boolean isForTesting(UIinfo service)
   {
     return serviceTests.size() == 0
-            || serviceTests.contains(service.getName().toLowerCase());
+            || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT));
   }
 
   @Test(groups = { "Network" })
   public void testCopyOption()
   {
-    for (Jws2Instance service : disc.getServices())
+    for (ServiceWithParameters _service : disc.getServices())
     {
-      if (isForTesting(service))
+      if (isForTesting(_service))
       {
+        Jws2Instance service = (Jws2Instance) _service;
         List<Option<?>> options = service.getRunnerConfig().getOptions();
         for (Option<?> o : options)
         {
@@ -162,10 +166,11 @@ public class ParameterUtilsTest
   @Test(groups = { "Network" })
   public void testCopyParameter()
   {
-    for (Jws2Instance service : disc.getServices())
+    for (ServiceWithParameters _service : disc.getServices())
     {
-      if (isForTesting(service))
+      if (isForTesting(_service))
       {
+        Jws2Instance service = (Jws2Instance) _service;
         List<Parameter> parameters = service.getRunnerConfig()
                 .getParameters();
         for (Parameter o : parameters)