/*
- * 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.
*
*/
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 org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
public class JalviewJabawsTestUtils
{
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
}
/**
* 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
+ @Test(groups =
+ { "Functional" }, enabled = false)
public void testAnnotExport()
{
fail("Not yet implemented");
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();
return disc;
}
+
}