JAL-1645 Merge branch 'develop' into Release_2_9_Branch
[jalview.git] / test / jalview / ws / rest / RestClientTest.java
index 66cdc42..7525acb 100644 (file)
@@ -1,25 +1,25 @@
 package jalview.ws.rest;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
-import java.util.Vector;
+import jalview.bin.Cache;
 
-import org.junit.Test;
+import java.util.Vector;
 
-import jalview.bin.Cache;
+import org.testng.annotations.Test;
 
 public class RestClientTest
 {
   /**
    * Refactored 'as is' from main method
    */
-  @Test
+  @Test(groups ={ "Functional" })
   public void testGetRestClient()
   {
     /*
      * Load test properties file (readonly) so as not to overwrite the real one
      */
-    Cache.loadProperties("test/src/jalview/io/testProps.jvprops");
+    Cache.loadProperties("test/jalview/io/testProps.jvprops");
 
     RestClient[] clients = RestClient.getRestClients();
     System.out.println("Got " + clients.length + " clients.");