X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FIdentifiersUrlProviderTest.java;fp=test%2Fjalview%2Furls%2FIdentifiersUrlProviderTest.java;h=1fb31468945ee78ccef213c9d54205db241fca7f;hb=3459a8a691cb22508d7067f240b7254e588e77d3;hp=eed58b0eeee55c1d15ef62785513c0acc9c8145a;hpb=5b27f1062b2203c4c31702e205f4c78e1992063e;p=jalview.git diff --git a/test/jalview/urls/IdentifiersUrlProviderTest.java b/test/jalview/urls/IdentifiersUrlProviderTest.java index eed58b0..1fb3146 100644 --- a/test/jalview/urls/IdentifiersUrlProviderTest.java +++ b/test/jalview/urls/IdentifiersUrlProviderTest.java @@ -47,7 +47,7 @@ public class IdentifiersUrlProviderTest + "\"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\"}]}"; - + private static final String[] dlinks = { "UniProt Knowledgebase|http://identifiers.org/uniprot/$DB_ACCESSION$|uniprot", "InterPro|http://identifiers.org/interpro/$DB_ACCESSION$|interpro", @@ -65,11 +65,12 @@ public class IdentifiersUrlProviderTest + "MIR:00000011|http://identifiers.org/interpro/$DB_ACCESSION$" + "MIR:00000372|http://identifiers.org/ena.embl/$DB_ACCESSION$"; - private static final String[] unselDlinks = { "ChEBI|http://identifiers.org/chebi/$DB_ACCESSION$" }; + private static final String[] unselDlinks = { + "ChEBI|http://identifiers.org/chebi/$DB_ACCESSION$" }; private static final Vector displayLinks = new Vector( - Arrays.asList(dlinks)); - + Arrays.asList(dlinks)); + private static final Vector unselDisplayLinks = new Vector( Arrays.asList(unselDlinks)); @@ -90,7 +91,6 @@ public class IdentifiersUrlProviderTest private String testfile = ""; - @BeforeClass(alwaysRun = true) public void setup() { @@ -124,7 +124,7 @@ public class IdentifiersUrlProviderTest // creation from cached id list String idList = "MIR:00000005|MIR:00000011|MIR:00000372"; UrlProviderI idProv = new IdentifiersUrlProvider(idList); - + assertTrue(displayLinks.containsAll(idProv.getLinksForMenu())); // because UrlProvider does not guarantee order of links, we can't just @@ -148,18 +148,17 @@ public class IdentifiersUrlProviderTest // creation from cached id list String idList = "MIR:00000005|MIR:00000011|MIR:00000372"; UrlProviderI idProv = new IdentifiersUrlProvider(idList); - + // initially no default assertEquals(null, idProv.getPrimaryUrl("seqid")); - + // set and then retrieve default assertTrue(idProv.setPrimaryUrl("MIR:00000005")); assertEquals("http://identifiers.org/uniprot/seqid", idProv.getPrimaryUrl("seqid")); // ids less than length 4 return null - assertEquals(null, - idProv.getPrimaryUrl("123")); + assertEquals(null, idProv.getPrimaryUrl("123")); // attempt to set bad default assertFalse(idProv.setPrimaryUrl("MIR:00001234"));