X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjws2%2FParameterUtilsTest.java;h=05bb4afff3f2c5332b0ca80bb9bd1393b1c0149a;hb=304e64fb34b32659be1bbfd39fb4e15b2f79586e;hp=51ff19c4f3b6acc14ccf09af8d6477748d2e815e;hpb=61ff8fb4efa315c35149c9d11850d99e3d00c441;p=jalview.git diff --git a/test/jalview/ws/jws2/ParameterUtilsTest.java b/test/jalview/ws/jws2/ParameterUtilsTest.java index 51ff19c..05bb4af 100644 --- a/test/jalview/ws/jws2/ParameterUtilsTest.java +++ b/test/jalview/ws/jws2/ParameterUtilsTest.java @@ -21,13 +21,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; @@ -63,7 +64,7 @@ public class ParameterUtilsTest * To limit tests to specify services, add them to this list; leave list empty * to test all */ - private static List serviceTests = new ArrayList(); + private static List serviceTests = new ArrayList<>(); private static Jws2Discoverer disc = null; @@ -79,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 prl = null; PresetManager prman = service.getPresets(); @@ -130,7 +132,7 @@ public class ParameterUtilsTest * @param service * @return */ - public boolean isForTesting(Jws2Instance service) + public boolean isForTesting(UIinfo service) { return serviceTests.size() == 0 || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT)); @@ -139,10 +141,11 @@ public class ParameterUtilsTest @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> options = service.getRunnerConfig().getOptions(); for (Option o : options) { @@ -163,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 parameters = service.getRunnerConfig() .getParameters(); for (Parameter o : parameters)