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
Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112
[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
e859cb0
..
ab245c9
100644
(file)
--- a/
test/jalview/ws/jws2/ParameterUtilsTest.java
+++ b/
test/jalview/ws/jws2/ParameterUtilsTest.java
@@
-26,6
+26,8
@@
import static org.testng.AssertJUnit.assertTrue;
import jalview.bin.Cache;
import jalview.gui.JvOptionPane;
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;
import jalview.ws.jabaws.JalviewJabawsTestUtils;
import jalview.ws.jws2.jabaws2.Jws2Instance;
@@
-61,7
+63,7
@@
public class ParameterUtilsTest
* To limit tests to specify services, add them to this list; leave list empty
* to test all
*/
* To limit tests to specify services, add them to this list; leave list empty
* to test all
*/
- private static List<String> serviceTests = new ArrayList<String>();
+ private static List<String> serviceTests = new ArrayList<>();
private static Jws2Discoverer disc = null;
private static Jws2Discoverer disc = null;
@@
-74,13
+76,14
@@
public class ParameterUtilsTest
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
}
- @Test(groups = { "Functional" })
+ @Test(groups = { "Network" })
public void testWriteParameterSet() throws WrongParameterException
{
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();
List<Preset> prl = null;
PresetManager prman = service.getPresets();
@@
-128,19
+131,20
@@
public class ParameterUtilsTest
* @param service
* @return
*/
* @param service
* @return
*/
- public boolean isForTesting(Jws2Instance service)
+ public boolean isForTesting(UIinfo service)
{
return serviceTests.size() == 0
{
return serviceTests.size() == 0
- || serviceTests.contains(service.serviceType.toLowerCase());
+ || serviceTests.contains(service.getName().toLowerCase());
}
@Test(groups = { "Network" })
public void testCopyOption()
{
}
@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)
{
List<Option<?>> options = service.getRunnerConfig().getOptions();
for (Option<?> o : options)
{
@@
-161,10
+165,11
@@
public class ParameterUtilsTest
@Test(groups = { "Network" })
public void testCopyParameter()
{
@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)
List<Parameter> parameters = service.getRunnerConfig()
.getParameters();
for (Parameter o : parameters)