JAL-1295 refactored Jws2 discovery bootstrap code to test utility class

diff --git a/test/jalview/ws/gui/Jws2ParamView.java b/test/jalview/ws/gui/Jws2ParamView.java
index b43ada2..2d40dd4 100644 (file)
--- a/test/jalview/ws/gui/Jws2ParamView.java
+++ b/test/jalview/ws/gui/Jws2ParamView.java
@@ -17,8 +17,9 @@
  */
 package jalview.ws.gui;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import jalview.gui.WsJobParameters;
+import jalview.ws.jabaws.JalviewJabawsTestUtils;
 import jalview.ws.jws2.JabaPreset;
 import jalview.ws.jws2.Jws2Discoverer;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
@@ -29,11 +30,11 @@ 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.Test;
 
 import compbio.metadata.Option;
@@ -44,12 +45,6 @@ import compbio.metadata.PresetManager;
 public class Jws2ParamView
 {
   /**
-   * test servers
-   */
-  public static String[] serviceUrls = new String[]
-  { "http://localhost:8080/jabaws" };
-
-  /**
    * which services to test
    */
   public static List<String> serviceTests = new ArrayList<String>();
@@ -63,33 +58,16 @@ public class Jws2ParamView
     serviceTests.add("AAConWS".toLowerCase());
   }
 
+  public static Jws2Discoverer disc=null;
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception
+  {
+    disc = JalviewJabawsTestUtils.getJabawsDiscoverer();
+    
+  }
   @Test
   public void testJws2Gui()
   {
-    jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
-            .getDiscoverer();
-    int p = 0;
-    String svcurls="";
-    Vector<String> services = new Vector<String>();
-    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<String> presetEnum = presetTests.iterator();
     for (Jws2Instance service : disc.getServices())

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
new file mode 100644 (file)
index 0000000..f7d0e48
--- /dev/null
+++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
@@ -0,0 +1,64 @@
+package jalview.ws.jabaws;
+
+import static org.junit.Assert.*;
+import jalview.ws.jws2.Jws2Discoverer;
+
+import java.util.Vector;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class JalviewJabawsTestUtils
+{
+  
+  @BeforeClass
+  public static void setUpBeforeClass() throws Exception
+  {
+  }
+
+  @AfterClass
+  public static void tearDownAfterClass() throws Exception
+  {
+  }
+
+  /**
+   * test servers
+   */
+  public static String[] serviceUrls = new String[]
+  { "http://localhost:8080/jabaws" };
+
+  @Test
+  public void testAnnotExport()
+  {
+    fail("Not yet implemented");
+  }
+
+  public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer() {
+    jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
+            .getDiscoverer();
+    int p = 0;
+    String svcurls="";
+    Vector<String> services = new Vector<String>();
+    for (String url : JalviewJabawsTestUtils.serviceUrls)
+    {
+      svcurls+=url+"; ";
+      services.add(url);
+    }
+    ;
+    Jws2Discoverer.setServiceUrls(services);
+  
+    try
+    {
+      disc.run();
+    } catch (Exception e)
+    {
+      e.printStackTrace();
+      fail("Aborting. Problem discovering services. Tried "+svcurls);
+    }
+    assertTrue("Failed to discover any services at ",
+            disc.getServices().size() > 0);
+    return disc;
+  }
+
+}