X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=e42c34c6406d4737b26bbd99b275740091213635;hb=418006c3714eb8da78234660698231597eb90fb1;hp=e04be685a979d2bb7e1529b00afa02d4d4ecbad6;hpb=b22e1863f9c10dbff13ca8bc889255b91f0c4d1c;p=jalview.git
diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java
index e04be68..e42c34c 100644
--- a/test/jalview/gui/PopupMenuTest.java
+++ b/test/jalview/gui/PopupMenuTest.java
@@ -196,8 +196,12 @@ public class PopupMenuTest
testee.configureReferenceAnnotationsMenu(menu, seqs);
assertTrue(menu.isEnabled());
String s = MessageManager.getString("label.add_annotations_for");
- String expected = ""
- + s + "
Jmol/secondary structure
PDB/Temp
";
+ // String expected = ""
+ // + s + "
Jmol/secondary structure
PDB/Temp
";
+ String expected = ""
+ + "" + s
+ + "
Jmol/secondary structure
PDB/Temp
";
assertEquals(expected, menu.getToolTipText());
}
@@ -219,8 +223,11 @@ public class PopupMenuTest
testee.configureReferenceAnnotationsMenu(menu, seqs);
assertTrue(menu.isEnabled());
String s = MessageManager.getString("label.add_annotations_for");
- String expected = ""
- + s + "
Jmol/secondary structure
PDB/Temp
";
+ // String expected = ""
+ // + s + "
Jmol/secondary structure
PDB/Temp
";
+ String expected = ""
+ + "Add annotations for
Jmol/secondary structure
PDB/Temp
";
assertEquals(expected, menu.getToolTipText());
}
@@ -492,7 +499,7 @@ public class PopupMenuTest
* Test for adding sequence id, dbref and feature links
*/
@Test(groups = { "Functional" })
- public void testConstructor_links()
+ public void testBuildLinkMenu()
{
List seqs = parentPanel.getAlignment().getSequences();
final SequenceI seq0 = seqs.get(0);
@@ -509,11 +516,9 @@ public class PopupMenuTest
seq1.addDBRef(new DBRefEntry("GENE3D", "1", "3.10.20.30"));
/*
- * check the Popup Menu for the first sequence
+ * check the Link Menu for the first sequence
*/
- testee = new PopupMenu(parentPanel, seq0, noFeatures);
- Component[] seqItems = testee.sequenceMenu.getMenuComponents();
- JMenu linkMenu = (JMenu) seqItems[6];
+ JMenu linkMenu = PopupMenu.buildLinkMenu(seq0, noFeatures);
assertEquals(linkText, linkMenu.getText());
Component[] linkItems = linkMenu.getMenuComponents();
@@ -532,12 +537,10 @@ public class PopupMenuTest
assertEquals("UNIPROT|P83527", ((JMenuItem) linkItems[4]).getText());
/*
- * check the Popup Menu for second sequence
+ * check the Link Menu for the second sequence
* note dbref GENE3D is matched to link Gene3D, the latter is displayed
*/
- testee = new PopupMenu(parentPanel, seq1, noFeatures);
- seqItems = testee.sequenceMenu.getMenuComponents();
- linkMenu = (JMenu) seqItems[6];
+ linkMenu = PopupMenu.buildLinkMenu(seq1, noFeatures);
assertEquals(linkText, linkMenu.getText());
linkItems = linkMenu.getMenuComponents();
assertEquals(3, linkItems.length);
@@ -556,9 +559,7 @@ public class PopupMenuTest
unmatched, "");
Preferences.sequenceUrlLinks = factory.createUrlProvider();
- testee = new PopupMenu(parentPanel, seq1, noFeatures);
- seqItems = testee.sequenceMenu.getMenuComponents();
- linkMenu = (JMenu) seqItems[6];
+ linkMenu = PopupMenu.buildLinkMenu(seq1, noFeatures);
assertEquals(linkText, linkMenu.getText());
linkItems = linkMenu.getMenuComponents();
assertEquals(1, linkItems.length);