*/
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;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import compbio.metadata.Argument;
import compbio.metadata.Preset;
import compbio.metadata.PresetManager;
public static List<String> presetTests = new ArrayList<>();
static
{
- serviceTests.add("AAConWS".toLowerCase());
+ serviceTests.add("AAConWS".toLowerCase(Locale.ROOT));
}
public static Jws2Discoverer disc = null;
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.serviceType.toLowerCase()))
+ || serviceTests.contains(service.serviceType.toLowerCase(Locale.ROOT)))
{
List<Preset> prl = null;
Preset pr = null;
}
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() }));