X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=72fa7a489968784ad70bf95209e49e75ee09d568;hb=9709ea1f5cfd18e119b0fdca9ead402fc53ddb8a;hp=892f7fb3740f2de7d1f336523152370bb7df8078;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index 892f7fb..72fa7a4 100644
--- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
+++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,18 +20,21 @@
  */
 package jalview.ws.jabaws;
 
-import static org.junit.Assert.*;
-import jalview.ws.jws2.Jws2Discoverer;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.util.Vector;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import jalview.ws.jws2.Jws2Discoverer;
+
 public class JalviewJabawsTestUtils
 {
-  
+
   @BeforeClass
   public static void setUpBeforeClass() throws Exception
   {
@@ -45,40 +48,50 @@ public class JalviewJabawsTestUtils
   /**
    * test servers
    */
-  public static String[] serviceUrls = new String[]
-  { "http://localhost:8080/jabaws" };
+  private static String[] serviceUrls = new String[]
+  { "http://localhost:8080/jabaws",
+      "http://www.compbio.dundee.ac.uk/jabaws" };
 
   @Test
+  @Ignore
   public void testAnnotExport()
   {
     fail("Not yet implemented");
   }
 
-  public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer() {
+  public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer()
+  {
+    return getJabawsDiscoverer(true);
+  }
+  public static Jws2Discoverer getJabawsDiscoverer(boolean localhost)
+  {
     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)
+    String svcurls = "";
+    if (localhost)
     {
-      svcurls+=url+"; ";
-      services.add(url);
+      int p = 0;
+      Vector<String> services = new Vector<String>();
+      for (String url : JalviewJabawsTestUtils.serviceUrls)
+      {
+        svcurls += url + "; ";
+        services.add(url);
+      }
+      ;
+      Jws2Discoverer.getDiscoverer().setServiceUrls(services);
     }
-    ;
-    Jws2Discoverer.setServiceUrls(services);
-  
     try
     {
       disc.run();
     } catch (Exception e)
     {
       e.printStackTrace();
-      fail("Aborting. Problem discovering services. Tried "+svcurls);
+      fail("Aborting. Problem discovering services. Tried " + svcurls);
     }
-    assertTrue("Failed to discover any services at ",
-            disc.getServices().size() > 0);
+    assertTrue("Failed to discover any services at ", disc.getServices()
+            .size() > 0);
     return disc;
   }
 
+
 }