X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FDesktopUrlProviderFactoryTest.java;h=cc550347e6580fbb723cb8ecb5114cadb5c278f6;hb=efa724edf32b5803396087cf7c94521e3d597836;hp=d224c2e458ee0476cc10282a860270c8a5e1462c;hpb=ab658ca1052ede3491f4bf93630103a7c82776dc;p=jalview.git

diff --git a/test/jalview/urls/DesktopUrlProviderFactoryTest.java b/test/jalview/urls/DesktopUrlProviderFactoryTest.java
index d224c2e..cc55034 100644
--- a/test/jalview/urls/DesktopUrlProviderFactoryTest.java
+++ b/test/jalview/urls/DesktopUrlProviderFactoryTest.java
@@ -20,12 +20,14 @@
  */
 package jalview.urls;
 
+import jalview.urls.api.UrlProviderI;
+import jalview.urls.desktop.DesktopUrlProviderFactory;
+
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
@@ -33,8 +35,7 @@ import org.testng.annotations.Test;
 
 public class DesktopUrlProviderFactoryTest
 {
-  // Test identifiers.org download file
-  private static final String testIdOrgString = "[{\"id\":\"MIR:00000002\",\"name\":\"ChEBI\",\"pattern\":\"^CHEBI:\\d+$\","
+  private static final String testIdOrgString = "{\"Local\": [{\"id\":\"MIR:00000002\",\"name\":\"ChEBI\",\"pattern\":\"^CHEBI:\\d+$\","
           + "\"definition\":\"Chemical Entities of Biological Interest (ChEBI)\",\"prefix\":\"chebi\","
           + "\"url\":\"http://identifiers.org/chebi\"},{\"id\":\"MIR:00000005\",\"name\":\"UniProt Knowledgebase\","
           + "\"pattern\":\"^([A-N,R-Z][0-9]([A-Z][A-Z, 0-9][A-Z, 0-9][0-9]){1,2})|([O,P,Q][0-9][A-Z, 0-9][A-Z, 0-9][A-Z, 0-9][0-9])(\\.\\d+)?$\","
@@ -42,7 +43,7 @@ public class DesktopUrlProviderFactoryTest
           + "{\"id\":\"MIR:00000011\",\"name\":\"InterPro\",\"pattern\":\"^IPR\\d{6}$\",\"definition\":\"InterPro\",\"prefix\":\"interpro\","
           + "\"url\":\"http://identifiers.org/interpro\"},"
           + "{\"id\":\"MIR:00000372\",\"name\":\"ENA\",\"pattern\":\"^[A-Z]+[0-9]+(\\.\\d+)?$\",\"definition\":\"The European Nucleotide Archive (ENA),\""
-          + "\"prefix\":\"ena.embl\",\"url\":\"http://identifiers.org/ena.embl\"}]";
+          + "\"prefix\":\"ena.embl\",\"url\":\"http://identifiers.org/ena.embl\"}]}";
 
   @BeforeMethod(alwaysRun = true)
   public void setup()
@@ -81,11 +82,11 @@ public class DesktopUrlProviderFactoryTest
     UrlProviderI prov = factory.createUrlProvider();
 
     // default url correctly set
-    Assert.assertEquals(prov.getDefaultUrlId(), "Test1");
-    Assert.assertEquals(prov.getDefaultUrl("FER_CAPAN"),
+    Assert.assertEquals(prov.getPrimaryUrlId(), "Test1");
+    Assert.assertEquals(prov.getPrimaryUrl("FER_CAPAN"),
             defaultUrl.replace("$SEQUENCE_ID$", "FER_CAPAN"));
 
-    Vector<String> menulinks = prov.getLinksForMenu();
+    List<String> menulinks = prov.getLinksForMenu();
     List<UrlLinkDisplay> allLinks = prov.getLinksForTable();
 
     // 8 links in provider - 4 from id file, 4 custom links
@@ -101,8 +102,8 @@ public class DesktopUrlProviderFactoryTest
     Assert.assertTrue(menulinks
             .contains("Test3|http://test3/$SEQUENCE_ID$"));
     Assert.assertTrue(menulinks
-            .contains("UniProt Knowledgebase|http://identifiers.org/uniprot/$DB_ACCESSION$"));
+            .contains("UniProt Knowledgebase|http://identifiers.org/uniprot/$DB_ACCESSION$|uniprot"));
     Assert.assertTrue(menulinks
-            .contains("InterPro|http://identifiers.org/interpro/$DB_ACCESSION$"));
+            .contains("InterPro|http://identifiers.org/interpro/$DB_ACCESSION$|interpro"));
   }
 }