X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Furls%2FAppletUrlProviderFactoryTest.java;h=42948550990b35586c3ab91eb594f9ec8167f432;hb=56d72101b0584635cf539d5413db27abc8deb575;hp=baf9c6381054ef769229afebc7971d58a7dfc8df;hpb=ab658ca1052ede3491f4bf93630103a7c82776dc;p=jalview.git

diff --git a/test/jalview/urls/AppletUrlProviderFactoryTest.java b/test/jalview/urls/AppletUrlProviderFactoryTest.java
index baf9c63..4294855 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;
@@ -29,7 +32,8 @@ import java.util.Map;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-public class AppletUrlProviderFactoryTest {
+public class AppletUrlProviderFactoryTest
+{
 
   @Test(groups = { "Functional" })
   public void testCreateUrlProvider()
@@ -50,10 +54,9 @@ public class AppletUrlProviderFactoryTest {
     UrlProviderI prov = factory.createUrlProvider();
 
     // default url correctly set
-    Assert.assertEquals(prov.getDefaultUrlId(), "Test2");
-    Assert.assertEquals(prov.getDefaultUrl("FER_CAPAN"),
-            defaultUrl.replace("$SEQUENCE_ID$",
-                    "FER_CAPAN"));
+    Assert.assertEquals(prov.getPrimaryUrlId(), "Test2");
+    Assert.assertEquals(prov.getPrimaryUrl("FER_CAPAN"),
+            defaultUrl.replace("$SEQUENCE_ID$", "FER_CAPAN"));
 
     List<UrlLinkDisplay> allLinks = prov.getLinksForTable();
 
@@ -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());
   }
 }