X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FUrlLinkTableModelTest.java;h=c6d23b94e0fc8f5f37a9a08a09d253339df3cf2b;hb=5504c1347eb582d05ae9086608223209ecb8c13d;hp=4b2ea6ecd4d56751885880c4187638202c32d412;hpb=64f19a3315b24ae0084cdc5ca8d47c9485040588;p=jalview.git

diff --git a/test/jalview/urls/UrlLinkTableModelTest.java b/test/jalview/urls/UrlLinkTableModelTest.java
index 4b2ea6e..c6d23b9 100644
--- a/test/jalview/urls/UrlLinkTableModelTest.java
+++ b/test/jalview/urls/UrlLinkTableModelTest.java
@@ -41,7 +41,8 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-public class UrlLinkTableModelTest {
+public class UrlLinkTableModelTest
+{
 
   private static final String inmenu = "TEST|http://someurl.blah/$DB_ACCESSION$|"
           + "ANOTHER|http://test/t$SEQUENCE_ID$|"
@@ -52,8 +53,7 @@ public class UrlLinkTableModelTest {
   private static final String notinmenu = "Not1|http://not.in.menu/$DB_ACCESSION$|"
           + "Not2|http://not.in.menu.either/$DB_ACCESSION$";
 
-  // 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+)?$\","
@@ -61,7 +61,7 @@ public class UrlLinkTableModelTest {
           + "{\"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;
 
@@ -194,8 +194,8 @@ public class UrlLinkTableModelTest {
     Assert.assertEquals(m.getValueAt(10, 4), false);
 
     // check data source has new row insrte
-    Assert.assertTrue(prov.getLinksForMenu().contains(
-            "newname" + SEP + "newurl"));
+    Assert.assertTrue(
+            prov.getLinksForMenu().contains("newname" + SEP + "newurl"));
   }
 
   /*
@@ -233,7 +233,8 @@ public class UrlLinkTableModelTest {
     // get original default
     int olddefault;
     boolean isDefault = false;
-    for (olddefault = 0; olddefault < m.getRowCount() && !isDefault; olddefault++)
+    for (olddefault = 0; olddefault < m.getRowCount()
+            && !isDefault; olddefault++)
     {
       isDefault = (boolean) m.getValueAt(olddefault, 3);
     }
@@ -269,12 +270,12 @@ public class UrlLinkTableModelTest {
     }
 
     // check table updated
-    Assert.assertTrue(prov.writeUrlsAsString(true).contains(
-            "descchanged" + SEP + m.getValueAt(6, 2)));
-    Assert.assertTrue(prov.writeUrlsAsString(true).contains(
-            m.getValueAt(7, 1) + SEP + "urlchanged"));
-    Assert.assertTrue(prov.writeUrlsAsString(false).contains(
-            (String) m.getValueAt(8, 1)));
+    Assert.assertTrue(prov.writeUrlsAsString(true)
+            .contains("descchanged" + SEP + m.getValueAt(6, 2)));
+    Assert.assertTrue(prov.writeUrlsAsString(true)
+            .contains(m.getValueAt(7, 1) + SEP + "urlchanged"));
+    Assert.assertTrue(prov.writeUrlsAsString(false)
+            .contains((String) m.getValueAt(8, 1)));
     Assert.assertEquals(prov.getPrimaryUrl("seqid"), m.getValueAt(6, 2)
             .toString().replace(DELIM + SEQUENCE_ID + DELIM, "seqid"));
   }