X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FUrlLinkTest.java;h=d07206f891ffeb73d80ec51c839b10d569e7657f;hb=refs%2Fheads%2Ffeatures%2FJAL-2326_JOptionPane-refactoring;hp=c98d8ceda968841b7e2783cff38c32c9b9f243a6;hpb=8c53a6c0bda186beb949efd99cecbb815eab2210;p=jalview.git

diff --git a/test/jalview/util/UrlLinkTest.java b/test/jalview/util/UrlLinkTest.java
index c98d8ce..d07206f 100644
--- a/test/jalview/util/UrlLinkTest.java
+++ b/test/jalview/util/UrlLinkTest.java
@@ -30,17 +30,26 @@ import static org.testng.AssertJUnit.assertTrue;
 import jalview.datamodel.DBRefEntry;
 import jalview.datamodel.DBRefSource;
 import jalview.datamodel.Sequence;
+import jalview.gui.JvOptionPane;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 public class UrlLinkTest
 {
 
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   final static String DB = "Test";
 
   final static String URL_PREFIX = "http://www.jalview.org/";
@@ -64,7 +73,7 @@ public class UrlLinkTest
     // SEQUENCE_ID
     UrlLink ul = new UrlLink(DB + SEP + URL_PREFIX + DELIM + SEQUENCE_ID
             + DELIM + URL_SUFFIX);
-    assertEquals(DB.toUpperCase(), ul.getTarget());
+    assertEquals(DB, ul.getTarget());
     assertEquals(DB, ul.getLabel());
     assertEquals(URL_PREFIX, ul.getUrl_prefix());
     assertEquals(URL_SUFFIX, ul.getUrl_suffix());
@@ -77,7 +86,7 @@ public class UrlLinkTest
     // DB_ACCESSION
     ul = new UrlLink(DB + SEP + URL_PREFIX + DELIM + DB_ACCESSION + DELIM
             + URL_SUFFIX);
-    assertEquals(DB.toUpperCase(), ul.getTarget());
+    assertEquals(DB, ul.getTarget());
     assertEquals(DB, ul.getLabel());
     assertEquals(URL_PREFIX, ul.getUrl_prefix());
     assertEquals(URL_SUFFIX, ul.getUrl_suffix());
@@ -89,7 +98,7 @@ public class UrlLinkTest
 
     // Not dynamic
     ul = new UrlLink(DB + SEP + URL_PREFIX + URL_SUFFIX.substring(1));
-    assertEquals(DB.toUpperCase(), ul.getTarget());
+    assertEquals(DB, ul.getTarget());
     assertEquals(DB, ul.getLabel());
     assertEquals(URL_PREFIX + URL_SUFFIX.substring(1), ul.getUrl_prefix());
     assertFalse(ul.isDynamic());
@@ -108,7 +117,7 @@ public class UrlLinkTest
     // SEQUENCE_ID
     UrlLink ul = new UrlLink(DB + SEP + URL_PREFIX + DELIM + SEQUENCE_ID
             + REGEX_NESTED + DELIM + URL_SUFFIX);
-    assertEquals(DB.toUpperCase(), ul.getTarget());
+    assertEquals(DB, ul.getTarget());
     assertEquals(DB, ul.getLabel());
     assertEquals(URL_PREFIX, ul.getUrl_prefix());
     assertEquals(URL_SUFFIX, ul.getUrl_suffix());
@@ -122,7 +131,7 @@ public class UrlLinkTest
     // DB_ACCESSION
     ul = new UrlLink(DB + SEP + URL_PREFIX + DELIM + DB_ACCESSION
             + REGEX_NESTED + DELIM + URL_SUFFIX);
-    assertEquals(DB.toUpperCase(), ul.getTarget());
+    assertEquals(DB, ul.getTarget());
     assertEquals(DB, ul.getLabel());
     assertEquals(URL_PREFIX, ul.getUrl_prefix());
     assertEquals(URL_SUFFIX, ul.getUrl_suffix());
@@ -136,7 +145,7 @@ public class UrlLinkTest
     // invalid regex
     ul = new UrlLink(DB + SEP + URL_PREFIX + DELIM + DB_ACCESSION
             + REGEX_RUBBISH + DELIM + URL_SUFFIX);
-    assertEquals(DB.toUpperCase(), ul.getTarget());
+    assertEquals(DB, ul.getTarget());
     assertEquals(DB, ul.getLabel());
     assertEquals(URL_PREFIX, ul.getUrl_prefix());
     assertEquals(URL_SUFFIX, ul.getUrl_suffix());
@@ -268,7 +277,7 @@ public class UrlLinkTest
     String key = DB + SEP + URL_PREFIX;
     assertEquals(1, linkset.size());
     assertTrue(linkset.containsKey(key));
-    assertEquals(linkset.get(key).get(0), DB.toUpperCase());
+    assertEquals(linkset.get(key).get(0), DB);
     assertEquals(linkset.get(key).get(1), DB);
     assertEquals(linkset.get(key).get(2), null);
     assertEquals(linkset.get(key).get(3), URL_PREFIX);
@@ -288,7 +297,7 @@ public class UrlLinkTest
     String key = DB + SEP + URL_PREFIX + URL_SUFFIX;
     assertEquals(1, linkset.size());
     assertTrue(linkset.containsKey(key));
-    assertEquals(linkset.get(key).get(0), DB.toUpperCase());
+    assertEquals(linkset.get(key).get(0), DB);
     assertEquals(linkset.get(key).get(1), DB);
     assertEquals(linkset.get(key).get(2), null);
     assertEquals(linkset.get(key).get(3), URL_PREFIX + URL_SUFFIX);
@@ -339,7 +348,7 @@ public class UrlLinkTest
             + URL_SUFFIX;
     assertEquals(1, linkset.size());
     assertTrue(linkset.containsKey(key));
-    assertEquals(linkset.get(key).get(0), DB.toUpperCase());
+    assertEquals(linkset.get(key).get(0), DB);
     assertEquals(linkset.get(key).get(1), DB);
     assertEquals(linkset.get(key).get(2), seq0.getName());
     assertEquals(linkset.get(key).get(3), URL_PREFIX + seq0.getName()