Merge branch 'develop' of http://source.jalview.org/git/jalview into develop

[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 f7b422a..08bb405 100644 (file)
--- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
+++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
@@ -23,19 +23,18 @@ package jalview.ws.jabaws;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.Vector;
+import jalview.ws.jws2.Jws2Discoverer;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
+import java.util.Vector;
 
-import jalview.ws.jws2.Jws2Discoverer;
+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
   {
   }
@@ -48,11 +47,12 @@ public class JalviewJabawsTestUtils
   /**
    * 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
-  @Ignore
+  @Test(groups =
+  { "Functional" }, enabled = false)
   public void testAnnotExport()
   {
     fail("Not yet implemented");