X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FAppletUrlProviderFactoryTest.java;h=2a967e4589f1fae53961b713901eeb586a19fef4;hb=4f30214e8098748469c6a4269ac2ed6c5750e4b0;hp=f6794904a928e8247a301c8ad6166edb4624395e;hpb=a45bb4b4b3f6ce4067fc94acbfc546637fb30b06;p=jalview.git diff --git a/test/jalview/urls/AppletUrlProviderFactoryTest.java b/test/jalview/urls/AppletUrlProviderFactoryTest.java index f679490..2a967e4 100644 --- a/test/jalview/urls/AppletUrlProviderFactoryTest.java +++ b/test/jalview/urls/AppletUrlProviderFactoryTest.java @@ -53,8 +53,8 @@ public class AppletUrlProviderFactoryTest { UrlProviderI prov = factory.createUrlProvider(); // default url correctly set - Assert.assertEquals(prov.getDefaultUrlId(), "Test2"); - Assert.assertEquals(prov.getDefaultUrl("FER_CAPAN"), + Assert.assertEquals(prov.getPrimaryUrlId(), "Test2"); + Assert.assertEquals(prov.getPrimaryUrl("FER_CAPAN"), defaultUrl.replace("$SEQUENCE_ID$", "FER_CAPAN")); @@ -65,17 +65,17 @@ public class AppletUrlProviderFactoryTest { // first link set correctly Assert.assertEquals(allLinks.get(0).getId(), "Test1"); - Assert.assertEquals(allLinks.get(0).getName(), "Test1"); + Assert.assertEquals(allLinks.get(0).getDescription(), "Test1"); Assert.assertEquals(allLinks.get(0).getUrl(), "http://identifiers.org/uniprot/$DB_ACCESSION$"); - Assert.assertFalse(allLinks.get(0).getIsDefault()); + Assert.assertFalse(allLinks.get(0).getIsPrimary()); Assert.assertTrue(allLinks.get(0).getIsSelected()); // second link set correctly Assert.assertEquals(allLinks.get(1).getId(), "Test2"); - Assert.assertEquals(allLinks.get(1).getName(), "Test2"); + Assert.assertEquals(allLinks.get(1).getDescription(), "Test2"); Assert.assertEquals(allLinks.get(1).getUrl(), defaultUrl); - Assert.assertTrue(allLinks.get(1).getIsDefault()); + Assert.assertTrue(allLinks.get(1).getIsPrimary()); Assert.assertTrue(allLinks.get(1).getIsSelected()); } }