git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1551 source code formatting
[jalview.git]
/
test
/
jalview
/
ws
/
jabaws
/
JalviewJabawsTestUtils.java
diff --git
a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index
ba78107
..
c206323
100644
(file)
--- a/
test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
+++ b/
test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
@@
-20,7
+20,8
@@
*/
package jalview.ws.jabaws;
*/
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;
import jalview.ws.jws2.Jws2Discoverer;
import java.util.Vector;
@@
-56,19
+57,25
@@
public class JalviewJabawsTestUtils
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();
jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
.getDiscoverer();
- int p = 0;
String svcurls = "";
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();
try
{
disc.run();
@@
-82,4
+89,5
@@
public class JalviewJabawsTestUtils
return disc;
}
return disc;
}
+
}
}