JAL-2316 Adjusted unit tests. Tidied UrlLinkProviderI interface.

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

diff --git a/test/jalview/urls/CustomUrlProviderTest.java b/test/jalview/urls/CustomUrlProviderTest.java
index 62d7806..35ec5ff 100644 (file)
--- a/test/jalview/urls/CustomUrlProviderTest.java
+++ b/test/jalview/urls/CustomUrlProviderTest.java
@@ -24,6 +24,8 @@ import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
+import jalview.util.UrlConstants;
+
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Vector;
@@ -52,7 +54,7 @@ public class CustomUrlProviderTest
       "TEST|http://someurl.blah/$DB_ACCESSION$",
       "ANOTHER|http://test/t$SEQUENCE_ID$",
       "TEST2|http://address/$SEQUENCE_ID$",
- UrlProviderI.DEFAULT_STRING };
+ UrlConstants.DEFAULT_STRING };
 
   private static final Vector<String> displayLinks = new Vector<String>(
           Arrays.asList(dlinks));
@@ -82,8 +84,10 @@ public class CustomUrlProviderTest
     
     // default url can be set
     assertTrue(customProv.setDefaultUrl("ANOTHER"));
-    String result = customProv.getDefaultUrl();
-    assertEquals("ANOTHER", result);
+
+    // supplied replacement id must be more than 4 chars
+    String result = customProv.getDefaultUrl("123");
+    assertEquals(null, result);
 
     // default url can be retrieved given a sequence id
     result = customProv.getDefaultUrl("seqid");
@@ -91,14 +95,14 @@ public class CustomUrlProviderTest
 
     // if there is no default url it sets the default to null
     assertFalse(customProv.setDefaultUrl("No default"));
-    result = customProv.getDefaultUrl();
+    result = customProv.getDefaultUrl("testid");
     assertEquals(null, result);
     
     // choosing the default picks the DEFAULT_STRING option
     customProv.chooseDefaultUrl();
     result = customProv.getDefaultUrl("seqid");
     assertEquals(
-            UrlProviderI.DEFAULT_STRING.split("\\|")[1].split("\\$")[0]
+            UrlConstants.DEFAULT_STRING.split("\\|")[1].split("\\$")[0]
             + "seqid",
             result);
   }
@@ -111,28 +115,21 @@ public class CustomUrlProviderTest
   {
     // creation from cached url list works + old links upgraded
     UrlProviderI customProv = new CustomUrlProvider(cachedList);
-    assertTrue(displayLinks.containsAll(customProv.getLinksForDisplay()));
+    assertTrue(displayLinks.containsAll(customProv.getLinksForMenu()));
 
     // creation from map works + old links upgraded
     UrlProviderI customProv2 = new CustomUrlProvider(urlMap);
-    assertTrue(displayLinks.containsAll(customProv2.getLinksForDisplay()));
+    assertTrue(displayLinks.containsAll(customProv2.getLinksForMenu()));
 
     // writing url links as a string works
     // because UrlProvider does not guarantee order of links, we can't just
     // compare the output of writeUrlsAsString to a string, hence the hoops here
     String result = customProv.writeUrlsAsString();
     UrlProviderI up = new CustomUrlProvider(result);
-    assertTrue(displayLinks.containsAll(up.getLinksForDisplay()));
+    assertTrue(displayLinks.containsAll(up.getLinksForMenu()));
 
     result = customProv2.writeUrlsAsString();
     UrlProviderI up2 = new CustomUrlProvider(result);
-    assertTrue(displayLinks.containsAll(up2.getLinksForDisplay()));
-
-    // resetting urls from a pair of lists works
-    customProv.setUrlLinks(names, urls);
-    assertTrue(displayLinks2.containsAll(customProv.getLinksForDisplay()));
-
-    customProv2.setUrlLinks(names, urls);
-    assertTrue(displayLinks2.containsAll(customProv2.getLinksForDisplay()));
+    assertTrue(displayLinks.containsAll(up2.getLinksForMenu()));
   }
 }