JAL-2843 unit tests for writing filters to Jalview features file

[jalview.git] / test / jalview / urls / AppletUrlProviderFactoryTest.java

diff --git a/test/jalview/urls/AppletUrlProviderFactoryTest.java b/test/jalview/urls/AppletUrlProviderFactoryTest.java
index baf9c63..2a967e4 100644 (file)
--- 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());
   }
 }