X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=f7b422a180023b89db0bb11e07f8a501892b9fe4;hb=b99147d5c7e3b8b789eb04e9c1adde1f85fcc650;hp=f7d0e48bf60457052da54498edebbb83c61f13af;hpb=e2e0e87734b8725a605ccf7b46bc8c655f0ba75c;p=jalview.git

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index f7d0e48..f7b422a 100644
--- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
+++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
@@ -1,17 +1,40 @@
+/*
+ * 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.
+ *  
+ * 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 <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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
   {
@@ -29,36 +52,45 @@ public class JalviewJabawsTestUtils
   { "http://localhost:8080/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;
   }
 
+
 }