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

diff --git a/test/jalview/ws/ebi/EBIFetchClientTest.java b/test/jalview/ws/ebi/EBIFetchClientTest.java
deleted file mode 100644
index c559966..0000000
--- a/test/jalview/ws/ebi/EBIFetchClientTest.java
+++ /dev/null
@@ -1,137 +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.ebi;
-
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
-import jalview.gui.JvOptionPane;
-
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-
-public class EBIFetchClientTest
-{
-
-  @BeforeClass(alwaysRun = true)
-  public void setUpJvOptionPane()
-  {
-    JvOptionPane.setInteractiveMode(false);
-    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
-  }
-
-  /**
-   * Test method that constructs URL to fetch from
-   */
-  @Test(groups = "Functional")
-  public void testBuildUrl()
-  {
-    /*
-     * EMBL
-     */
-    assertEquals("https://www.ebi.ac.uk/ena/data/view/x53838&display=xml",
-            EBIFetchClient.buildUrl("X53838", "EMBL", "display=xml"));
-
-    /*
-     * EMBLCDS
-     */
-    assertEquals("https://www.ebi.ac.uk/ena/data/view/caa37824&display=xml",
-            EBIFetchClient.buildUrl("CAA37824", "EMBL", "display=xml"));
-
-    /*
-     * PDB / pdb
-     */
-    assertEquals("https://www.ebi.ac.uk/Tools/dbfetch/dbfetch/pdb/3a6s/pdb",
-            EBIFetchClient.buildUrl("3A6S", "PDB", "pdb"));
-
-    /*
-     * PDB / mmCIF
-     */
-    assertEquals(
-            "https://www.ebi.ac.uk/Tools/dbfetch/dbfetch/pdb/3a6s/mmCIF",
-            EBIFetchClient.buildUrl("3A6S", "PDB", "mmCIF"));
-  }
-
-  /**
-   * Test method that parses db:id;id;id
-   */
-  @Test(groups = "Functional")
-  public void testParseIds()
-  {
-    /*
-     * pdb, two accessions
-     */
-    StringBuilder queries = new StringBuilder();
-    String db = EBIFetchClient.parseIds("pdb:3a6s;1A70", queries);
-    assertEquals("pdb", db);
-    assertEquals("3a6s,1A70", queries.toString());
-
-    /*
-     * pdb specified on second accession
-     */
-    queries.setLength(0);
-    queries = new StringBuilder();
-    db = EBIFetchClient.parseIds("3a6s;pdb:1A70", queries);
-    assertEquals("pdb", db);
-    assertEquals("3a6s,1A70", queries.toString());
-
-    /*
-     * uniprot, one accession
-     */
-    queries.setLength(0);
-    db = EBIFetchClient.parseIds("uniprot:P00340", queries);
-    assertEquals("uniprot", db);
-    assertEquals("P00340", queries.toString());
-
-    /*
-     * uniprot, one accession, appending to existing queries
-     */
-    queries.setLength(0);
-    queries.append("P30419");
-    db = EBIFetchClient.parseIds("uniprot:P00340", queries);
-    assertEquals("uniprot", db);
-    assertEquals("P30419,P00340", queries.toString());
-
-    /*
-     * pdb and uniprot mixed - rejected
-     */
-    queries.setLength(0);
-    db = EBIFetchClient.parseIds("pdb:3a6s;1a70;uniprot:P00340", queries);
-    assertNull(db);
-    assertEquals("3a6s,1a70", queries.toString());
-
-    /*
-     * pdb and PDB mixed - ok
-     */
-    queries.setLength(0);
-    db = EBIFetchClient.parseIds("pdb:3a6s;pdb:1a70;PDB:1QIP", queries);
-    assertEquals("PDB", db);
-    assertEquals("3a6s,1a70,1QIP", queries.toString());
-
-    /*
-     * no database (improper format)
-     */
-    queries.setLength(0);
-    db = EBIFetchClient.parseIds("P00340", queries);
-    assertNull(db);
-    assertEquals("P00340", queries.toString());
-  }
-}