X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fws%2Fgui%2FJws2ParamView.java;h=4c67d2578426d467bc8fb53117191c7c30ae3982;hb=9709ea1f5cfd18e119b0fdca9ead402fc53ddb8a;hp=b43ada2bebb193d8c9a49411c527b8f5b80c1328;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java
index b43ada2..4c67d25 100644
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -1,55 +1,53 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.ws.gui;
-import static org.junit.Assert.assertTrue;
-import jalview.gui.WsJobParameters;
-import jalview.ws.jws2.JabaPreset;
-import jalview.ws.jws2.Jws2Discoverer;
-import jalview.ws.jws2.jabaws2.Jws2Instance;
-
import java.awt.BorderLayout;
+import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
import javax.swing.JFrame;
import javax.swing.JPanel;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
-import compbio.metadata.Option;
-import compbio.metadata.Parameter;
import compbio.metadata.Preset;
import compbio.metadata.PresetManager;
+import jalview.bin.Cache;
+import jalview.gui.WsJobParameters;
+import jalview.util.MessageManager;
+import jalview.ws.jabaws.JalviewJabawsTestUtils;
+import jalview.ws.jws2.JabaPreset;
+import jalview.ws.jws2.Jws2Discoverer;
+import jalview.ws.jws2.jabaws2.Jws2Instance;
+
public class Jws2ParamView
{
/**
- * test servers
- */
- public static String[] serviceUrls = new String[]
- { "http://localhost:8080/jabaws" };
-
- /**
* which services to test
*/
public static List serviceTests = new ArrayList();
@@ -63,234 +61,103 @@ public class Jws2ParamView
serviceTests.add("AAConWS".toLowerCase());
}
+ public static Jws2Discoverer disc = null;
+
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception
+ {
+ Cache.initLogger();
+ disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
+ }
+
+ /**
+ * This test marked Ignore as it appears to need user action to complete
+ * rather than hang
+ */
@Test
+ @Ignore
public void testJws2Gui()
{
- jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
- .getDiscoverer();
- int p = 0;
- String svcurls="";
- Vector services = new Vector();
- for (String url : serviceUrls)
- {
- svcurls+=url+"; ";
- services.add(url);
- }
- ;
- Jws2Discoverer.setServiceUrls(services);
-
- try
- {
- disc.run();
- } catch (Exception e)
- {
- System.err.println("Aborting. Problem discovering services. Tried "+svcurls);
- e.printStackTrace();
- return;
- }
- assertTrue("Failed to discover any services at ",
- disc.getServices().size() > 0);
- Jws2Instance lastserv = null;
Iterator presetEnum = presetTests.iterator();
for (Jws2Instance service : disc.getServices())
{
- lastserv = service;
if (serviceTests.size() == 0
|| serviceTests.contains(service.serviceType.toLowerCase()))
{
- if (lastserv != null)
+ List prl = null;
+ Preset pr = null;
+ if (presetEnum.hasNext())
{
- List prl = null;
- Preset pr = null;
- if (presetEnum.hasNext())
+ PresetManager prman = service.getPresets();
+ if (prman != null)
{
- PresetManager prman = lastserv.getPresets();
- if (prman != null)
+ pr = prman.getPresetByName(presetEnum.next());
+ if (pr == null)
{
- pr = prman.getPresetByName(presetEnum.next());
- if (pr == null)
- {
- // just grab the last preset.
- prl = prman.getPresets();
- }
+ // just grab the last preset.
+ prl = prman.getPresets();
}
}
- else
+ }
+ else
+ {
+ PresetManager prman = service.getPresets();
+ if (prman != null)
{
- PresetManager prman = lastserv.getPresets();
- if (prman != null)
- {
- prl = prman.getPresets();
- }
+ prl = prman.getPresets();
}
- Iterator en = (prl == null) ? null : prl.iterator();
- while (en != null && en.hasNext())
+ }
+ Iterator en = (prl == null) ? null : prl.iterator();
+ while (en != null && en.hasNext())
+ {
+ if (en != null)
{
- if (en != null)
- {
- if (!en.hasNext())
- {
- en = prl.iterator();
- }
- pr = en.next();
- }
+ if (!en.hasNext())
{
- System.out.println("Testing opts dupes for "
- + lastserv.getUri() + " : "
- + lastserv.getActionText() + ":" + pr.getName());
- List