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
Merge branch 'develop' into features/JAL-653_JAL-1766_htslib_refseqsupport
[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
295c3bf
..
46feebc
100644
(file)
--- 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.
*
*
* This file is part of Jalview.
*
@@
-20,19
+20,19
@@
*/
package jalview.ws.jabaws;
*/
package jalview.ws.jabaws;
-import static org.junit.Assert.*;
import jalview.ws.jws2.Jws2Discoverer;
import java.util.Vector;
import jalview.ws.jws2.Jws2Discoverer;
import java.util.Vector;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
public class JalviewJabawsTestUtils
{
public class JalviewJabawsTestUtils
{
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
}
public static void setUpBeforeClass() throws Exception
{
}
@@
-45,19
+45,21
@@
public class JalviewJabawsTestUtils
/**
* test servers
*/
/**
* 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()
{
public void testAnnotExport()
{
- fail("Not yet implemented");
+ Assert.fail("Not yet implemented");
}
public static jalview.ws.jws2.Jws2Discoverer getJabawsDiscoverer()
{
return getJabawsDiscoverer(true);
}
}
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
public static Jws2Discoverer getJabawsDiscoverer(boolean localhost)
{
jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
@@
-73,7
+75,7
@@
public class JalviewJabawsTestUtils
services.add(url);
}
;
services.add(url);
}
;
- Jws2Discoverer.setServiceUrls(services);
+ Jws2Discoverer.getDiscoverer().setServiceUrls(services);
}
try
{
}
try
{
@@
-81,12
+83,12
@@
public class JalviewJabawsTestUtils
} catch (Exception e)
{
e.printStackTrace();
} catch (Exception e)
{
e.printStackTrace();
- fail("Aborting. Problem discovering services. Tried " + svcurls);
+ Assert.fail("Aborting. Problem discovering services. Tried "
+ + svcurls);
}
}
- assertTrue("Failed to discover any services at ", disc.getServices()
- .size() > 0);
+ Assert.assertTrue(disc.getServices().size() > 0,
+ "Failed to discover any services at ");
return disc;
}
return disc;
}
-
}
}