JAL-2281 Unit test updates

diff --git a/test/jalview/util/DBRefUtilsTest.java b/test/jalview/util/DBRefUtilsTest.java
index 8d2901d..0431cf6 100644 (file)
--- a/test/jalview/util/DBRefUtilsTest.java
+++ b/test/jalview/util/DBRefUtilsTest.java
@@ -74,7 +74,7 @@ public class DBRefUtilsTest
     assertSame(ref2, selected[0]);
     assertSame(ref3, selected[1]);
 
-    sources = new String[] { "Uniprot", "EMBLCDS" };
+    sources = new String[] { "EMBLCDS" };
     selected = DBRefUtils.selectRefs(dbrefs, sources);
     assertNull(selected);
   }

diff --git a/test/jalview/util/UrlLinkTest.java b/test/jalview/util/UrlLinkTest.java
index c98d8ce..f219fb8 100644 (file)
--- a/test/jalview/util/UrlLinkTest.java
+++ b/test/jalview/util/UrlLinkTest.java
@@ -64,7 +64,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 +77,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 +89,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 +108,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 +122,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 +136,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 +268,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 +288,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 +339,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()