X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=e897b1de3390bc01d0d564eb096a0a1521770985;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=72fa7a489968784ad70bf95209e49e75ee09d568;hpb=ddbd88c078781bdbe332dbc3e87b2ed600e717e3;p=jalview.git

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index 72fa7a4..e897b1d 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)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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,12 +47,11 @@ public class JalviewJabawsTestUtils
   /**
    * test servers
    */
-  private 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");
@@ -63,6 +61,7 @@ public class JalviewJabawsTestUtils
   {
     return getJabawsDiscoverer(true);
   }
+
   public static Jws2Discoverer getJabawsDiscoverer(boolean localhost)
   {
     jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
@@ -93,5 +92,4 @@ public class JalviewJabawsTestUtils
     return disc;
   }
 
-
 }