Merge branch 'Jalview-JS/jim/JAL-3253-JAL-3418' into Jalview-JS/JAL-3253-applet

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

diff --git a/test/jalview/urls/UrlProviderTest.java b/test/jalview/urls/UrlProviderTest.java
index be40c81..460ebe9 100644 (file)
--- a/test/jalview/urls/UrlProviderTest.java
+++ b/test/jalview/urls/UrlProviderTest.java
@@ -18,7 +18,7 @@ import org.testng.annotations.Test;
 public class UrlProviderTest {
   
   // 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+)?$\","
@@ -26,7 +26,7 @@ public class UrlProviderTest {
          + "{\"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\"}]}";
 
   private UrlProviderI prov;
 
@@ -90,9 +90,9 @@ public class UrlProviderTest {
     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"));
     Assert.assertTrue(menulinks.contains(UrlConstants.DEFAULT_LABEL
             + UrlConstants.SEP + emblUrl));
   }