X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Furls%2FAppletUrlProviderFactoryTest.java;h=2a967e4589f1fae53961b713901eeb586a19fef4;hb=1dab7652c8e85071f68f5a4889e071d6a480ae80;hp=baf9c6381054ef769229afebc7971d58a7dfc8df;hpb=ab658ca1052ede3491f4bf93630103a7c82776dc;p=jalview.git diff --git a/test/jalview/urls/AppletUrlProviderFactoryTest.java b/test/jalview/urls/AppletUrlProviderFactoryTest.java index baf9c63..2a967e4 100644 --- a/test/jalview/urls/AppletUrlProviderFactoryTest.java +++ b/test/jalview/urls/AppletUrlProviderFactoryTest.java @@ -20,6 +20,9 @@ */ package jalview.urls; +import jalview.urls.api.UrlProviderFactoryI; +import jalview.urls.api.UrlProviderI; +import jalview.urls.applet.AppletUrlProviderFactory; import jalview.util.UrlConstants; import java.util.HashMap; @@ -50,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")); @@ -62,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()); } }