X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FUrlLinkTest.java;fp=test%2Fjalview%2Futil%2FUrlLinkTest.java;h=cea1bf2a973cd4b7b0d80eb7be2d63096e08e4f0;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=c7d37b097a20e805f9961857208633fc65ef691d;hpb=49db0dff1da16c3355b43a41498c1fc93ef47e91;p=jalview.git diff --git a/test/jalview/util/UrlLinkTest.java b/test/jalview/util/UrlLinkTest.java index c7d37b0..cea1bf2 100644 --- a/test/jalview/util/UrlLinkTest.java +++ b/test/jalview/util/UrlLinkTest.java @@ -62,7 +62,7 @@ public class UrlLinkTest final static String DELIM = "$"; final static String REGEX_NESTED = "=/^(?:Label:)?(?:(?:gi\\|(\\d+))|([^:]+))/="; - + final static String REGEX_RUBBISH = "=/[0-9]++/="; /** @@ -155,11 +155,9 @@ public class UrlLinkTest assertEquals(REGEX_RUBBISH.substring(2, REGEX_RUBBISH.length() - 2), ul.getRegexReplace()); assertFalse(ul.isValid()); - assertEquals( - "Invalid Regular Expression : '" - + REGEX_RUBBISH.substring(2, REGEX_RUBBISH.length() - 2) - + "'\n", - ul.getInvalidMessage()); + assertEquals("Invalid Regular Expression : '" + + REGEX_RUBBISH.substring(2, REGEX_RUBBISH.length() - 2) + + "'\n", ul.getInvalidMessage()); } /** @@ -316,8 +314,9 @@ public class UrlLinkTest List refs = new ArrayList<>(); // links as might be added into Preferences | Connections dialog - links.add("EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$" - + SEQUENCE_ID + "$"); + links.add( + "EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$" + + SEQUENCE_ID + "$"); links.add("UNIPROT | http://www.uniprot.org/uniprot/$" + DB_ACCESSION + "$"); links.add("INTERPRO | http://www.ebi.ac.uk/interpro/entry/$" @@ -352,8 +351,8 @@ public class UrlLinkTest assertEquals(DB, linkset.get(key).get(0)); assertEquals(DB, linkset.get(key).get(1)); assertEquals(seq0.getName(), linkset.get(key).get(2)); - assertEquals(URL_PREFIX + seq0.getName() + URL_SUFFIX, linkset.get(key) - .get(3)); + assertEquals(URL_PREFIX + seq0.getName() + URL_SUFFIX, + linkset.get(key).get(3)); // Test where link takes a db annotation id and only has one dbref ul = new UrlLink(links.get(1)); @@ -364,11 +363,11 @@ public class UrlLinkTest assertEquals(linkset.size(), 1); assertTrue(linkset.containsKey(key)); assertEquals(DBRefSource.UNIPROT, linkset.get(key).get(0)); - assertEquals(DBRefSource.UNIPROT + SEP + "P83527", linkset.get(key) - .get(1)); + assertEquals(DBRefSource.UNIPROT + SEP + "P83527", + linkset.get(key).get(1)); assertEquals("P83527", linkset.get(key).get(2)); - assertEquals("http://www.uniprot.org/uniprot/P83527", linkset.get(key) - .get(3)); + assertEquals("http://www.uniprot.org/uniprot/P83527", + linkset.get(key).get(3)); // Test where link takes a db annotation id and has multiple dbrefs ul = new UrlLink(links.get(2)); @@ -382,24 +381,24 @@ public class UrlLinkTest assertEquals("INTERPRO", linkset.get(key).get(0)); assertEquals("INTERPRO" + SEP + "IPR001041", linkset.get(key).get(1)); assertEquals("IPR001041", linkset.get(key).get(2)); - assertEquals("http://www.ebi.ac.uk/interpro/entry/IPR001041", linkset - .get(key).get(3)); + assertEquals("http://www.ebi.ac.uk/interpro/entry/IPR001041", + linkset.get(key).get(3)); key = "IPR006058|http://www.ebi.ac.uk/interpro/entry/IPR006058"; assertTrue(linkset.containsKey(key)); assertEquals("INTERPRO", linkset.get(key).get(0)); assertEquals("INTERPRO" + SEP + "IPR006058", linkset.get(key).get(1)); assertEquals("IPR006058", linkset.get(key).get(2)); - assertEquals("http://www.ebi.ac.uk/interpro/entry/IPR006058", linkset - .get(key).get(3)); + assertEquals("http://www.ebi.ac.uk/interpro/entry/IPR006058", + linkset.get(key).get(3)); key = "IPR012675|http://www.ebi.ac.uk/interpro/entry/IPR012675"; assertTrue(linkset.containsKey(key)); assertEquals("INTERPRO", linkset.get(key).get(0)); assertEquals("INTERPRO" + SEP + "IPR012675", linkset.get(key).get(1)); assertEquals("IPR012675", linkset.get(key).get(2)); - assertEquals("http://www.ebi.ac.uk/interpro/entry/IPR012675", linkset - .get(key).get(3)); + assertEquals("http://www.ebi.ac.uk/interpro/entry/IPR012675", + linkset.get(key).get(3)); // Test where there are no matching dbrefs for the link ul = new UrlLink(DB + SEP + URL_PREFIX + DELIM + DB_ACCESSION + DELIM