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

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index ba78107..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,15 +20,18 @@
  */
 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
 {
 
@@ -45,10 +48,12 @@ 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");
@@ -56,19 +61,25 @@ public class JalviewJabawsTestUtils
 
   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)
+    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();
@@ -82,4 +93,5 @@ public class JalviewJabawsTestUtils
     return disc;
   }
 
+
 }