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-1925 update source version in license
[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
c2b483a
..
047d78c
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-Rel$$)
- * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
+ * Copyright (C) 2015 The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-22,18
+22,19
@@
package jalview.ws.jabaws;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
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;
-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
{
public class JalviewJabawsTestUtils
{
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
public static void setUpBeforeClass() throws Exception
{
}
public static void setUpBeforeClass() throws Exception
{
}
@@
-46,10
+47,11
@@
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()
{
fail("Not yet implemented");
public void testAnnotExport()
{
fail("Not yet implemented");
@@
-59,6
+61,7
@@
public class JalviewJabawsTestUtils
{
return getJabawsDiscoverer(true);
}
{
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
@@
-89,5
+92,4
@@
public class JalviewJabawsTestUtils
return disc;
}
return disc;
}
-
}
}