X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FCustomUrlProviderTest.java;fp=test%2Fjalview%2Furls%2FCustomUrlProviderTest.java;h=58b273161556f491d383df6b105119ab44aa630e;hb=9c98d4bd666346f6ad3892c5394b7da3be82d93e;hp=f9ed893d9ad03cccf01082a27c85f6d567102f5e;hpb=c7b2143c9cf7c5e05ad63251f7d3910751b16d20;p=jalview.git diff --git a/test/jalview/urls/CustomUrlProviderTest.java b/test/jalview/urls/CustomUrlProviderTest.java index f9ed893..58b2731 100644 --- a/test/jalview/urls/CustomUrlProviderTest.java +++ b/test/jalview/urls/CustomUrlProviderTest.java @@ -47,13 +47,13 @@ public class CustomUrlProviderTest private static final HashMap urlMap = new HashMap() { { - put("TEST","http://someurl.blah/$DB_ACCESSION$"); - put("ANOTHER","http://test/t$SEQUENCE_ID$"); + put("TEST", "http://someurl.blah/$DB_ACCESSION$"); + put("ANOTHER", "http://test/t$SEQUENCE_ID$"); put("TEST2", "http://address/$SEQUENCE_ID$"); put("SRS", "http://theSRSlink/$SEQUENCE_ID$"); } }; - + private static final HashMap unselUrlMap = new HashMap() { { @@ -65,8 +65,7 @@ public class CustomUrlProviderTest private static final String[] dlinks = { "TEST|http://someurl.blah/$DB_ACCESSION$", "ANOTHER|http://test/t$SEQUENCE_ID$", - "TEST2|http://address/$SEQUENCE_ID$", - UrlConstants.DEFAULT_STRING }; + "TEST2|http://address/$SEQUENCE_ID$", UrlConstants.DEFAULT_STRING }; private static final String[] unselDlinks = { "NON1|http://x/y/$DB_ACCESSION$", "NON2|http://a/b/c/$DB_ACCESSION" }; @@ -77,7 +76,8 @@ public class CustomUrlProviderTest private static final Vector unselDisplayLinks = new Vector( Arrays.asList(unselDlinks)); - private static final String[] dlinks2 = { "a|http://x.y.z/$SEQUENCE_ID$" }; + private static final String[] dlinks2 = { + "a|http://x.y.z/$SEQUENCE_ID$" }; private static final Vector displayLinks2 = new Vector( Arrays.asList(dlinks2)); @@ -100,7 +100,7 @@ public class CustomUrlProviderTest { UrlProviderI customProv = new CustomUrlProvider(cachedList, unselectedList); - + // default url can be set assertTrue(customProv.setPrimaryUrl("ANOTHER")); @@ -116,14 +116,12 @@ public class CustomUrlProviderTest assertFalse(customProv.setPrimaryUrl("No default")); result = customProv.getPrimaryUrl("testid"); assertEquals(null, result); - + // choosing the default picks the DEFAULT_STRING option customProv.choosePrimaryUrl(); result = customProv.getPrimaryUrl("seqid"); - assertEquals( - UrlConstants.DEFAULT_STRING.split("\\|")[1].split("\\$")[0] - + "seqid", - result); + assertEquals(UrlConstants.DEFAULT_STRING.split("\\|")[1].split("\\$")[0] + + "seqid", result); } /*