X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FCustomUrlProviderTest.java;h=f9ed893d9ad03cccf01082a27c85f6d567102f5e;hb=5a631296dd1dcc1df7b50487a647c27333696c74;hp=52b3fcd0a6a9e62a903c55dfba3b00ba9613c816;hpb=e63a4d52c27252dfb83efeeee1bda6c89b6dddec;p=jalview.git diff --git a/test/jalview/urls/CustomUrlProviderTest.java b/test/jalview/urls/CustomUrlProviderTest.java index 52b3fcd..f9ed893 100644 --- a/test/jalview/urls/CustomUrlProviderTest.java +++ b/test/jalview/urls/CustomUrlProviderTest.java @@ -24,6 +24,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; import static org.testng.AssertJUnit.assertTrue; +import jalview.urls.api.UrlProviderI; import jalview.util.UrlConstants; import java.util.Arrays; @@ -101,24 +102,24 @@ public class CustomUrlProviderTest unselectedList); // default url can be set - assertTrue(customProv.setDefaultUrl("ANOTHER")); + assertTrue(customProv.setPrimaryUrl("ANOTHER")); // supplied replacement id must be more than 4 chars - String result = customProv.getDefaultUrl("123"); + String result = customProv.getPrimaryUrl("123"); assertEquals(null, result); // default url can be retrieved given a sequence id - result = customProv.getDefaultUrl("seqid"); + result = customProv.getPrimaryUrl("seqid"); assertEquals("http://test/tseqid", result); // if there is no default url it sets the default to null - assertFalse(customProv.setDefaultUrl("No default")); - result = customProv.getDefaultUrl("testid"); + assertFalse(customProv.setPrimaryUrl("No default")); + result = customProv.getPrimaryUrl("testid"); assertEquals(null, result); // choosing the default picks the DEFAULT_STRING option - customProv.chooseDefaultUrl(); - result = customProv.getDefaultUrl("seqid"); + customProv.choosePrimaryUrl(); + result = customProv.getPrimaryUrl("seqid"); assertEquals( UrlConstants.DEFAULT_STRING.split("\\|")[1].split("\\$")[0] + "seqid",