Code tidy up. Unit test passes.

[jalview.git] / test / jalview / gui / PopupMenuTest.java

diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index fe52e92..b4e8629 100644 (file)
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -458,7 +458,7 @@ public class PopupMenuTest
     List<DBRefEntry> refs = new ArrayList<DBRefEntry>();
 
     // links as might be added into Preferences | Connections dialog
-    links.add("EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_ID$");
+    links.add("EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$SEQUENCE_NAME$");
     links.add("UNIPROT | http://www.uniprot.org/uniprot/$SEQUENCE_ID$");
     links.add("INTERPRO | http://www.ebi.ac.uk/interpro/entry/$SEQUENCE_ID$");
     // Gene3D entry tests for case (in)sensitivity
@@ -500,10 +500,11 @@ public class PopupMenuTest
     // sequence id for each link should match corresponding DB accession id
     for (int i = 1; i < 4; i++)
     {
-      assertEquals(refs.get(i).getSource(), ((JMenuItem) linkItems[i])
-              .getText().split(" \\|")[0]);
-      assertEquals(refs.get(i).getAccessionId(), ((JMenuItem) linkItems[i])
-              .getText().split(" \\|")[1]);
+      assertEquals(refs.get(i - 1).getSource(), ((JMenuItem) linkItems[i])
+              .getText().split("\\|")[0]);
+      assertEquals(refs.get(i - 1).getAccessionId(),
+              ((JMenuItem) linkItems[i])
+              .getText().split("\\|")[1]);
     }
 
     // get the Popup Menu for second sequence
@@ -519,12 +520,12 @@ public class PopupMenuTest
     assertEquals("EMBL-EBI Search", ((JMenuItem) linkItems[0]).getText());
 
     // sequence id for each link should match corresponding DB accession id
-    for (int i = 5; i < 7; i++)
+    for (int i = 1; i < 3; i++)
     {
-      assertEquals(refs.get(i).getSource(), ((JMenuItem) linkItems[i - 4])
-              .getText().split(" \\|")[0]);
-      assertEquals(refs.get(i).getAccessionId(),
-              ((JMenuItem) linkItems[i - 4]).getText().split(" \\|")[1]);
+      assertEquals(refs.get(i + 3).getSource(), ((JMenuItem) linkItems[i])
+              .getText().split("\\|")[0].toUpperCase());
+      assertEquals(refs.get(i + 3).getAccessionId(),
+              ((JMenuItem) linkItems[i]).getText().split("\\|")[1]);
     }