X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=fb73c1038e6a39b7259d62c7d19f4fd80bd6ce5f;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;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..fb73c10 100644 --- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java +++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java @@ -1,5 +1,5 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. @@ -20,7 +20,8 @@ */ package jalview.ws.jabaws; -import static org.junit.Assert.*; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import jalview.ws.jws2.Jws2Discoverer; import java.util.Vector; @@ -56,19 +57,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 services = new Vector(); - for (String url : JalviewJabawsTestUtils.serviceUrls) + if (localhost) { - svcurls += url + "; "; - services.add(url); + int p = 0; + Vector services = new Vector(); + for (String url : JalviewJabawsTestUtils.serviceUrls) + { + svcurls += url + "; "; + services.add(url); + } + ; + Jws2Discoverer.getDiscoverer().setServiceUrls(services); } - ; - Jws2Discoverer.setServiceUrls(services); - try { disc.run(); @@ -82,4 +89,5 @@ public class JalviewJabawsTestUtils return disc; } + }