X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJalviewJabawsTestUtils.java;h=4414782d72d61ff6352b04b603aabf7e79463c3b;hb=0580d6486ec69ff7a9bc8b406cb3703afaca767c;hp=91e92449fc64e855631788c696167541f8deff0a;hpb=44f876a4d3b0adfd680ddfa84e14cc7940d6f877;p=jalview.git

diff --git a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
index 91e9244..4414782 100644
--- a/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
+++ b/test/jalview/ws/jabaws/JalviewJabawsTestUtils.java
@@ -32,12 +32,12 @@ import org.testng.annotations.Test;
 public class JalviewJabawsTestUtils
 {
 
-  @BeforeClass
+  @BeforeClass(alwaysRun = true)
   public static void setUpBeforeClass() throws Exception
   {
   }
 
-  @AfterClass
+  @AfterClass(alwaysRun = true)
   public static void tearDownAfterClass() throws Exception
   {
   }
@@ -45,11 +45,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(enabled = false)
+  @Test(groups = { "Functional" }, enabled = false)
   public void testAnnotExport()
   {
     Assert.fail("Not yet implemented");
@@ -59,6 +59,21 @@ public class JalviewJabawsTestUtils
   {
     return getJabawsDiscoverer(true);
   }
+
+  /**
+   * Returns a service discoverer that queries localhost and compbio urls.
+   * <p>
+   * If using this method, be sure to have read-only Jalview properties, to
+   * avoid writing the test urls to .jalview_properties. This can be done by
+   * either
+   * <ul>
+   * <li>running Jalview main with arguments -props propFileName</li>
+   * <li>calling Cache.loadProperties(filename)</li>
+   * <ul>
+   * 
+   * @param localhost
+   * @return
+   */
   public static Jws2Discoverer getJabawsDiscoverer(boolean localhost)
   {
     jalview.ws.jws2.Jws2Discoverer disc = jalview.ws.jws2.Jws2Discoverer
@@ -90,5 +105,4 @@ public class JalviewJabawsTestUtils
     return disc;
   }
 
-
 }