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

diff --git a/test/jalview/ws/rest/RestClientTest.java b/test/jalview/ws/rest/RestClientTest.java
deleted file mode 100644
index 7a9419a..0000000
--- a/test/jalview/ws/rest/RestClientTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.testng.AssertJUnit.assertEquals;
-
-import jalview.bin.Cache;
-import jalview.gui.JvOptionPane;
-
-import java.util.Vector;
-
-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(groups = { "Functional" })
-  public void testGetRestClient()
-  {
-    /*
-     * Load test properties file (readonly) so as not to overwrite the real one
-     */
-    Cache.loadProperties("test/jalview/io/testProps.jvprops");
-
-    RestClient[] clients = RestClient.getRestClients();
-    System.out.println("Got " + clients.length + " clients.");
-    int i = 0;
-    Vector<String> urls = new Vector<String>();
-    for (RestClient cl : clients)
-    {
-      System.out.println("" + (++i) + ": " + cl.service.toString());
-      urls.add(cl.service.toString());
-    }
-    RestClient.setRsbsServices(urls);
-
-    RestClient[] restClients = RestClient.getRestClients();
-    assertEquals("", clients.length, restClients.length);
-
-    /*
-     * Check the two lists hold 'equal' (albeit different) objects. Ordering
-     * should be the same as getRestClients returns the list in the same order
-     * as setRsbsServices sets it.
-     */
-    for (i = 0; i < clients.length; i++)
-    {
-      /*
-       * RestServiceDescription.equals() compares numerous fields
-       */
-      assertEquals(clients[i].getRestDescription(),
-              restClients[i].getRestDescription());
-    }
-  }
-}