JAL-2316 Adjusted unit tests. Tidied UrlLinkProviderI interface.

[jalview.git] / test / jalview / urls / IdentifiersUrlProviderTest.java

diff --git a/test/jalview/urls/IdentifiersUrlProviderTest.java b/test/jalview/urls/IdentifiersUrlProviderTest.java
index 843e2d5..8ea47c9 100644 (file)
--- a/test/jalview/urls/IdentifiersUrlProviderTest.java
+++ b/test/jalview/urls/IdentifiersUrlProviderTest.java
@@ -48,9 +48,9 @@ public class IdentifiersUrlProviderTest
           + "\"prefix\":\"ena.embl\",\"url\":\"http://identifiers.org/ena.embl\"}]";
   
   private static final String[] dlinks = {
-    "MIR:00000005|http://identifiers.org/uniprot/$DB_ACCESSION$",
-    "MIR:00000011|http://identifiers.org/interpro/$DB_ACCESSION$",
-    "MIR:00000372|http://identifiers.org/ena.embl/$DB_ACCESSION$"};
+      "UniProt Knowledgebase|http://identifiers.org/uniprot/$DB_ACCESSION$",
+      "InterPro|http://identifiers.org/interpro/$DB_ACCESSION$",
+      "ENA|http://identifiers.org/ena.embl/$DB_ACCESSION$" };
 
   private static final String[] dlinks1 = {
       "MIR:00000011|http://identifiers.org/interpro/$DB_ACCESSION$",
@@ -117,13 +117,13 @@ public class IdentifiersUrlProviderTest
     String idList = "MIR:00000005|MIR:00000011|MIR:00000372";
     UrlProviderI idProv = new IdentifiersUrlProvider(idList, testfile);
     
-    assertTrue(displayLinks.containsAll(idProv.getLinksForDisplay()));
+    assertTrue(displayLinks.containsAll(idProv.getLinksForMenu()));
 
     // because UrlProvider does not guarantee order of links, we can't just
     // compare the output of writeUrlsAsString to a string, hence the hoops here
     String result = idProv.writeUrlsAsString();
     UrlProviderI up = new IdentifiersUrlProvider(result, testfile);
-    assertTrue(displayLinks.containsAll(up.getLinksForDisplay()));
+    assertTrue(displayLinks.containsAll(up.getLinksForMenu()));
 
   }
 
@@ -138,51 +138,23 @@ public class IdentifiersUrlProviderTest
     UrlProviderI idProv = new IdentifiersUrlProvider(idList, testfile);
     
     // initially no default
-    assertEquals(null, idProv.getDefaultUrl());
+    assertEquals(null, idProv.getDefaultUrl("seqid"));
     
     // set and then retrieve default
     assertTrue(idProv.setDefaultUrl("MIR:00000005"));
-    assertEquals("MIR:00000005", idProv.getDefaultUrl());
-    assertEquals("http://identifiers.org/uniprot/id",
-            idProv.getDefaultUrl("id"));
+    assertEquals("http://identifiers.org/uniprot/seqid",
+            idProv.getDefaultUrl("seqid"));
+
+    // ids less than length 4 return null
+    assertEquals(null,
+            idProv.getDefaultUrl("123"));
 
     // attempt to set bad default
     assertFalse(idProv.setDefaultUrl("MIR:00001234"));
     // default set to null (as default should have been set elsewhere)
-    assertEquals(null, idProv.getDefaultUrl());
+    assertEquals(null, idProv.getDefaultUrl("seqid"));
 
     // chooseDefaultUrl not implemented for IdentifiersUrlProvider
     assertEquals(null, idProv.chooseDefaultUrl());
   }
-
-  /*
-   * Test url setting works
-   */
-  @Test(groups = { "Functional" })
-  public void testSetUrlLinks()
-  {
-    // creation from cached id list
-    String idList = "MIR:00000005|MIR:00000011|MIR:00000372";
-    UrlProviderI idProv = new IdentifiersUrlProvider(idList, testfile);
-
-    // set url links
-    String[] ids = { "MIR:00000372", "MIR:00000011" };
-    Vector<String> names = new Vector<String>(Arrays.asList(ids));
-    Vector<String> urls = null;
-    idProv.setUrlLinks(names, urls);
-    Vector<String> result = idProv.getLinksForDisplay();
-    assertEquals(displayLinks1.size(), result.size());
-    assertTrue(displayLinks1.containsAll(result));
-    
-    //set default url then reset url links, default should be unset if not present
-    String[] moreids = { "MIR:00000005", "MIR:00000011" };
-    names = new Vector<String>(Arrays.asList(moreids));
-    idProv.setDefaultUrl("MIR:00000372");
-    idProv.setUrlLinks(names, urls);
-    result = idProv.getLinksForDisplay();
-    assertEquals(displayLinks2.size(), result.size());
-    assertTrue(displayLinks2.containsAll(result));
-    assertEquals(null, idProv.getDefaultUrl());
-
-  }
 }