JAL-2316 Changes following review.

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

diff --git a/test/jalview/urls/IdentifiersUrlProviderTest.java b/test/jalview/urls/IdentifiersUrlProviderTest.java
index 8ea47c9..107dcda 100644 (file)
--- a/test/jalview/urls/IdentifiersUrlProviderTest.java
+++ b/test/jalview/urls/IdentifiersUrlProviderTest.java
@@ -25,6 +25,8 @@ import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertTrue;
 
+import jalview.urls.api.UrlProviderI;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.util.Arrays;
@@ -64,9 +66,14 @@ public class IdentifiersUrlProviderTest
           + "MIR:00000011|http://identifiers.org/interpro/$DB_ACCESSION$"
           + "MIR:00000372|http://identifiers.org/ena.embl/$DB_ACCESSION$";
 
+  private static final String[] unselDlinks = { "ChEBI|http://identifiers.org/chebi/$DB_ACCESSION$" };
+
   private static final Vector<String> displayLinks = new Vector<String>(
         Arrays.asList(dlinks));
   
+  private static final Vector<String> unselDisplayLinks = new Vector<String>(
+          Arrays.asList(unselDlinks));
+
   private static final Vector<String> displayLinks1 = new Vector<String>(
           Arrays.asList(dlinks1));
 
@@ -105,6 +112,8 @@ public class IdentifiersUrlProviderTest
     {
       System.err.println(ex);
     }
+
+    IdOrgSettings.setDownloadLocation(testfile);
   }
 
   /*
@@ -115,16 +124,20 @@ public class IdentifiersUrlProviderTest
   {
     // creation from cached id list
     String idList = "MIR:00000005|MIR:00000011|MIR:00000372";
-    UrlProviderI idProv = new IdentifiersUrlProvider(idList, testfile);
+    UrlProviderI idProv = new IdentifiersUrlProvider(idList);
     
     assertTrue(displayLinks.containsAll(idProv.getLinksForMenu()));
 
     // 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 = idProv.writeUrlsAsString();
-    UrlProviderI up = new IdentifiersUrlProvider(result, testfile);
+    String result = idProv.writeUrlsAsString(true);
+    UrlProviderI up = new IdentifiersUrlProvider(result);
     assertTrue(displayLinks.containsAll(up.getLinksForMenu()));
 
+    result = idProv.writeUrlsAsString(false);
+    up = new IdentifiersUrlProvider(result);
+    assertTrue(unselDisplayLinks.containsAll(up.getLinksForMenu()));
+
   }
 
   /*
@@ -135,26 +148,26 @@ public class IdentifiersUrlProviderTest
   {
     // creation from cached id list
     String idList = "MIR:00000005|MIR:00000011|MIR:00000372";
-    UrlProviderI idProv = new IdentifiersUrlProvider(idList, testfile);
+    UrlProviderI idProv = new IdentifiersUrlProvider(idList);
     
     // initially no default
-    assertEquals(null, idProv.getDefaultUrl("seqid"));
+    assertEquals(null, idProv.getPrimaryUrl("seqid"));
     
     // set and then retrieve default
-    assertTrue(idProv.setDefaultUrl("MIR:00000005"));
+    assertTrue(idProv.setPrimaryUrl("MIR:00000005"));
     assertEquals("http://identifiers.org/uniprot/seqid",
-            idProv.getDefaultUrl("seqid"));
+            idProv.getPrimaryUrl("seqid"));
 
     // ids less than length 4 return null
     assertEquals(null,
-            idProv.getDefaultUrl("123"));
+            idProv.getPrimaryUrl("123"));
 
     // attempt to set bad default
-    assertFalse(idProv.setDefaultUrl("MIR:00001234"));
+    assertFalse(idProv.setPrimaryUrl("MIR:00001234"));
     // default set to null (as default should have been set elsewhere)
-    assertEquals(null, idProv.getDefaultUrl("seqid"));
+    assertEquals(null, idProv.getPrimaryUrl("seqid"));
 
     // chooseDefaultUrl not implemented for IdentifiersUrlProvider
-    assertEquals(null, idProv.chooseDefaultUrl());
+    assertEquals(null, idProv.choosePrimaryUrl());
   }
 }