X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Frest%2FRestClientTest.java;h=7a9419a744a083848dd14aec800c5a8fa0a6bcf9;hb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;hp=66cdc42a32a443ac2cb0d444420e351b1d17d061;hpb=828bb8cde756e18e25ffae5ac47bf6832d32eeda;p=jalview.git

diff --git a/test/jalview/ws/rest/RestClientTest.java b/test/jalview/ws/rest/RestClientTest.java
index 66cdc42..7a9419a 100644
--- a/test/jalview/ws/rest/RestClientTest.java
+++ b/test/jalview/ws/rest/RestClientTest.java
@@ -1,25 +1,55 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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 jalview.gui.JvOptionPane;
 
-import org.junit.Test;
+import java.util.Vector;
 
-import jalview.bin.Cache;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 public class RestClientTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * 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.");