JAL-2316 Changes following review.

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

diff --git a/test/jalview/urls/UrlProviderTest.java b/test/jalview/urls/UrlProviderTest.java
index 3b52c03..be40c81 100644 (file)
--- a/test/jalview/urls/UrlProviderTest.java
+++ b/test/jalview/urls/UrlProviderTest.java
@@ -9,7 +9,6 @@ import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
-import java.util.Vector;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
@@ -70,11 +69,11 @@ public class UrlProviderTest {
             UrlConstants.DEFAULT_STRING.length());
 
     // chooses EMBL url when default Url id does not exist in provided url lists
-    Assert.assertEquals(prov.getDefaultUrlId(), UrlConstants.DEFAULT_LABEL);
-    Assert.assertEquals(prov.getDefaultUrl("FER_CAPAN"),
+    Assert.assertEquals(prov.getPrimaryUrlId(), UrlConstants.DEFAULT_LABEL);
+    Assert.assertEquals(prov.getPrimaryUrl("FER_CAPAN"),
             emblUrl.replace("$SEQUENCE_ID$", "FER_CAPAN"));
 
-    Vector<String> menulinks = prov.getLinksForMenu();
+    List<String> menulinks = prov.getLinksForMenu();
     List<UrlLinkDisplay> allLinks = prov.getLinksForTable();
 
     // 9 links in provider - 4 from id file, 4 custom links, 1 additional
@@ -102,12 +101,12 @@ public class UrlProviderTest {
   public void testSetDefaultUrl()
   {
     // set custom url as default
-    Assert.assertTrue(prov.setDefaultUrl("Test1"));
-    Assert.assertEquals(prov.getDefaultUrlId(), "Test1");
+    Assert.assertTrue(prov.setPrimaryUrl("Test1"));
+    Assert.assertEquals(prov.getPrimaryUrlId(), "Test1");
 
     // set identifiers url as default
-    Assert.assertTrue(prov.setDefaultUrl("MIR:00000011"));
-    Assert.assertEquals(prov.getDefaultUrlId(), "MIR:00000011");
+    Assert.assertTrue(prov.setPrimaryUrl("MIR:00000011"));
+    Assert.assertEquals(prov.getPrimaryUrlId(), "MIR:00000011");
   }
 
   @Test(
@@ -116,6 +115,6 @@ public class UrlProviderTest {
   public void testSetDefaultUrlWrongly()
   {
     // don't allow default to be a non-key
-    prov.setDefaultUrl("not-a-key");
+    prov.setPrimaryUrl("not-a-key");
   }
 }