X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=047d78cd26747e2905903c20da7ff95dbebc0624;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=c2b483a6fd32256da0a895a1685794f396afab6e;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index c2b483a..047d78c 100644
--- 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.
  * 
@@ -22,18 +22,19 @@ package jalview.ws.jabaws;
 
 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
   {
   }
@@ -46,10 +47,11 @@ 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
+  @Test(groups = { "Functional" }, enabled = false)
   public void testAnnotExport()
   {
     fail("Not yet implemented");
@@ -59,6 +61,7 @@ public class JalviewJabawsTestUtils
   {
     return getJabawsDiscoverer(true);
   }
+
   public static Jws2Discoverer getJabawsDiscoverer(boolean localhost)
   {
     jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
@@ -89,5 +92,4 @@ public class JalviewJabawsTestUtils
     return disc;
   }
 
-
 }