X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=cc13fb91f55f8c2ffd059fae3dc2b3d680088e1d;hb=e88567692c9f1f3adfb9764a802474e83ff4c69f;hp=40e624dc96ce3f5df8da23fb1ff5191bbfa2bcf1;hpb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;p=jalview.git diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java index 40e624d..cc13fb9 100644 --- a/test/jalview/gui/PopupMenuTest.java +++ b/test/jalview/gui/PopupMenuTest.java @@ -24,15 +24,38 @@ import static jalview.util.UrlConstants.DB_ACCESSION; import static jalview.util.UrlConstants.SEQUENCE_ID; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertFalse; +import static org.testng.AssertJUnit.assertNotNull; +import static org.testng.AssertJUnit.assertNull; import static org.testng.AssertJUnit.assertTrue; +import java.awt.Component; +import java.awt.Container; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; + +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import javax.swing.JPopupMenu; +import javax.swing.JSeparator; + +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + import jalview.bin.Cache; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.Annotation; +import jalview.datamodel.ColumnSelection; import jalview.datamodel.DBRefEntry; import jalview.datamodel.DBRefSource; +import jalview.datamodel.HiddenColumns; +import jalview.datamodel.Sequence; import jalview.datamodel.SequenceFeature; +import jalview.datamodel.SequenceGroup; import jalview.datamodel.SequenceI; import jalview.io.DataSourceType; import jalview.io.FileFormat; @@ -42,21 +65,6 @@ import jalview.urls.desktop.DesktopUrlProviderFactory; import jalview.util.MessageManager; import jalview.util.UrlConstants; -import java.awt.Component; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.swing.JMenu; -import javax.swing.JMenuItem; -import javax.swing.JPopupMenu; -import javax.swing.JSeparator; - -import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - public class PopupMenuTest { @@ -86,6 +94,8 @@ public class PopupMenuTest public void setUp() throws IOException { Cache.loadProperties("test/jalview/io/testProps.jvprops"); + Cache.initLogger(); + String inMenuString = ("EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$" + SEQUENCE_ID + "$" @@ -108,7 +118,7 @@ public class PopupMenuTest DataSourceType.PASTE, FileFormat.Fasta); AlignFrame af = new AlignFrame(alignment, 700, 500); parentPanel = new AlignmentPanel(af, af.getViewport()); - testee = new PopupMenu(parentPanel, null, null); + testee = new PopupMenu(parentPanel, alignment.getSequenceAt(0), null); int i = 0; for (SequenceI seq : alignment.getSequences()) { @@ -124,7 +134,7 @@ public class PopupMenuTest public void testConfigureReferenceAnnotationsMenu_noSequenceSelected() { JMenuItem menu = new JMenuItem(); - List seqs = new ArrayList(); + List seqs = new ArrayList<>(); testee.configureReferenceAnnotationsMenu(menu, seqs); assertFalse(menu.isEnabled()); // now try null list @@ -191,8 +201,9 @@ 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
"; assertEquals(expected, menu.getToolTipText()); } @@ -214,8 +225,9 @@ 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
"; assertEquals(expected, menu.getToolTipText()); } @@ -484,109 +496,274 @@ public class PopupMenuTest } /** - * Test for adding feature links + * Test for adding sequence id, dbref and feature links */ @Test(groups = { "Functional" }) - public void testAddFeatureLinks() + public void testBuildLinkMenu() { - // sequences from the alignment List seqs = parentPanel.getAlignment().getSequences(); - - // create list of links and list of DBRefs - List links = new ArrayList(); - List refs = new ArrayList(); - - // 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("UNIPROT | http://www.uniprot.org/uniprot/$" + DB_ACCESSION - + "$"); - links.add("INTERPRO | http://www.ebi.ac.uk/interpro/entry/$" - + DB_ACCESSION + "$"); - // Gene3D entry tests for case (in)sensitivity - links.add("Gene3D | http://gene3d.biochem.ucl.ac.uk/Gene3D/search?sterm=$" - + DB_ACCESSION + "$&mode=protein"); - - // make seq0 dbrefs - refs.add(new DBRefEntry(DBRefSource.UNIPROT, "1", "P83527")); - refs.add(new DBRefEntry("INTERPRO", "1", "IPR001041")); - refs.add(new DBRefEntry("INTERPRO", "1", "IPR006058")); - refs.add(new DBRefEntry("INTERPRO", "1", "IPR012675")); - - // make seq1 dbrefs - refs.add(new DBRefEntry(DBRefSource.UNIPROT, "1", "Q9ZTS2")); - refs.add(new DBRefEntry("GENE3D", "1", "3.10.20.30")); - - // add all the dbrefs to the sequences: Uniprot 1 each, Interpro all 3 to - // seq0, Gene3D to seq1 - SequenceI seq = seqs.get(0); - seq.addDBRef(refs.get(0)); - - seq.addDBRef(refs.get(1)); - seq.addDBRef(refs.get(2)); - seq.addDBRef(refs.get(3)); + final SequenceI seq0 = seqs.get(0); + final SequenceI seq1 = seqs.get(1); + final List noFeatures = Collections + . emptyList(); + final String linkText = MessageManager.getString("action.link"); + + seq0.addDBRef(new DBRefEntry(DBRefSource.UNIPROT, "1", "P83527")); + seq0.addDBRef(new DBRefEntry("INTERPRO", "1", "IPR001041")); + seq0.addDBRef(new DBRefEntry("INTERPRO", "1", "IPR012675")); + seq0.addDBRef(new DBRefEntry("INTERPRO", "1", "IPR006058")); + seq1.addDBRef(new DBRefEntry(DBRefSource.UNIPROT, "1", "Q9ZTS2")); + seq1.addDBRef(new DBRefEntry("GENE3D", "1", "3.10.20.30")); - seqs.get(1).addDBRef(refs.get(4)); - seqs.get(1).addDBRef(refs.get(5)); - - // get the Popup Menu for first sequence - List noFeatures = Collections. emptyList(); - testee = new PopupMenu(parentPanel, seq, noFeatures); - Component[] seqItems = testee.sequenceMenu.getMenuComponents(); - JMenu linkMenu = (JMenu) seqItems[6]; + /* + * check the Link Menu for the first sequence + */ + JMenu linkMenu = PopupMenu.buildLinkMenu(seq0, noFeatures); + assertEquals(linkText, linkMenu.getText()); Component[] linkItems = linkMenu.getMenuComponents(); - // check the number of links are the expected number + /* + * menu items are ordered: SEQUENCE_ID search first, then dbrefs in order + * of database name (and within that by order of dbref addition) + */ assertEquals(5, linkItems.length); + assertEquals("EMBL-EBI Search", ((JMenuItem) linkItems[0]).getText()); + assertEquals("INTERPRO|IPR001041", + ((JMenuItem) linkItems[1]).getText()); + assertEquals("INTERPRO|IPR012675", + ((JMenuItem) linkItems[2]).getText()); + assertEquals("INTERPRO|IPR006058", + ((JMenuItem) linkItems[3]).getText()); + assertEquals("UNIPROT|P83527", ((JMenuItem) linkItems[4]).getText()); - // first entry is EMBL-EBI which just uses sequence id not accession id? + /* + * check the Link Menu for the second sequence + * note dbref GENE3D is matched to link Gene3D, the latter is displayed + */ + linkMenu = PopupMenu.buildLinkMenu(seq1, noFeatures); + linkItems = linkMenu.getMenuComponents(); + assertEquals(3, linkItems.length); assertEquals("EMBL-EBI Search", ((JMenuItem) linkItems[0]).getText()); + assertEquals("Gene3D|3.10.20.30", ((JMenuItem) linkItems[1]).getText()); + assertEquals("UNIPROT|Q9ZTS2", ((JMenuItem) linkItems[2]).getText()); - // sequence id for each link should match corresponding DB accession id - for (int i = 1; i < 4; i++) - { - String msg = seq.getName() + " link[" + i + "]"; - assertEquals(msg, refs.get(i - 1).getSource(), - ((JMenuItem) linkItems[i]) - .getText().split("\\|")[0]); - assertEquals(msg, refs.get(i - 1).getAccessionId(), - ((JMenuItem) linkItems[i]) - .getText().split("\\|")[1]); - } + /* + * if there are no valid links the Links submenu is still shown, but + * reduced to the EMBL-EBI lookup only (inserted by + * CustomUrlProvider.choosePrimaryUrl()) + */ + String unmatched = "NOMATCH|http://www.uniprot.org/uniprot/$" + + DB_ACCESSION + "$"; + UrlProviderFactoryI factory = new DesktopUrlProviderFactory(null, + unmatched, ""); + Preferences.sequenceUrlLinks = factory.createUrlProvider(); + + linkMenu = PopupMenu.buildLinkMenu(seq1, noFeatures); + linkItems = linkMenu.getMenuComponents(); + assertEquals(1, linkItems.length); + assertEquals("EMBL-EBI Search", ((JMenuItem) linkItems[0]).getText()); + + /* + * if sequence is null, only feature links are shown (alignment popup submenu) + */ + linkMenu = PopupMenu.buildLinkMenu(null, noFeatures); + linkItems = linkMenu.getMenuComponents(); + assertEquals(0, linkItems.length); - // get the Popup Menu for second sequence - seq = seqs.get(1); - testee = new PopupMenu(parentPanel, seq, noFeatures); - seqItems = testee.sequenceMenu.getMenuComponents(); - linkMenu = (JMenu) seqItems[6]; + List features = new ArrayList<>(); + SequenceFeature sf = new SequenceFeature("type", "desc", 1, 20, null); + features.add(sf); + linkMenu = PopupMenu.buildLinkMenu(null, features); linkItems = linkMenu.getMenuComponents(); + assertEquals(0, linkItems.length); // feature has no links + + sf.addLink("Pfam family|http://pfam.xfam.org/family/PF00111"); + linkMenu = PopupMenu.buildLinkMenu(null, features); + linkItems = linkMenu.getMenuComponents(); + assertEquals(1, linkItems.length); + JMenuItem item = (JMenuItem) linkItems[0]; + assertEquals("Pfam family", item.getText()); + // ? no way to verify URL, compiled into link's actionListener + } + + @Test(groups = { "Functional" }) + public void testHideInsertions() + { + // get sequences from the alignment + List seqs = parentPanel.getAlignment().getSequences(); - // check the number of links are the expected number - assertEquals(3, linkItems.length); + // add our own seqs to avoid problems with changes to existing sequences + // (gap at end of sequences varies depending on how tests are run!) + Sequence seqGap1 = new Sequence("GappySeq", + "AAAA----AA-AAAAAAA---AAA-----------AAAAAAAAAA--"); + seqGap1.createDatasetSequence(); + seqs.add(seqGap1); + Sequence seqGap2 = new Sequence("LessGappySeq", + "AAAAAA-AAAAA---AAA--AAAAA--AAAAAAA-AAAAAA"); + seqGap2.createDatasetSequence(); + seqs.add(seqGap2); + Sequence seqGap3 = new Sequence("AnotherGapSeq", + "AAAAAA-AAAAAA--AAAAAA-AAAAAAAAAAA---AAAAAAAA"); + seqGap3.createDatasetSequence(); + seqs.add(seqGap3); + Sequence seqGap4 = new Sequence("NoGaps", + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); + seqGap4.createDatasetSequence(); + seqs.add(seqGap4); + + ColumnSelection sel = new ColumnSelection(); + parentPanel.av.getAlignment().getHiddenColumns() + .revealAllHiddenColumns(sel); + + // get the Popup Menu for 7th sequence - no insertions + testee = new PopupMenu(parentPanel, seqs.get(7), null); + testee.hideInsertions_actionPerformed(null); + + HiddenColumns hidden = parentPanel.av.getAlignment().getHiddenColumns(); + Iterator it = hidden.iterator(); + assertFalse(it.hasNext()); + + // get the Popup Menu for GappySeq - this time we have insertions + testee = new PopupMenu(parentPanel, seqs.get(4), null); + testee.hideInsertions_actionPerformed(null); + hidden = parentPanel.av.getAlignment().getHiddenColumns(); + it = hidden.iterator(); + + assertTrue(it.hasNext()); + int[] region = it.next(); + assertEquals(region[0], 4); + assertEquals(region[1], 7); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 10); + assertEquals(region[1], 10); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 18); + assertEquals(region[1], 20); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 24); + assertEquals(region[1], 34); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 45); + assertEquals(region[1], 46); + + assertFalse(it.hasNext()); + + sel = new ColumnSelection(); + hidden.revealAllHiddenColumns(sel); + + // make a sequence group and hide insertions within the group + SequenceGroup sg = new SequenceGroup(); + sg.setStartRes(8); + sg.setEndRes(42); + sg.addSequence(seqGap2, false); + sg.addSequence(seqGap3, false); + parentPanel.av.setSelectionGroup(sg); + + // hide columns outside and within selection + // only hidden columns outside the collection will be retained (unless also + // gaps in the selection) + hidden.hideColumns(1, 10); + hidden.hideColumns(31, 40); + + // get the Popup Menu for LessGappySeq in the sequence group + testee = new PopupMenu(parentPanel, seqs.get(5), null); + testee.hideInsertions_actionPerformed(null); + hidden = parentPanel.av.getAlignment().getHiddenColumns(); + it = hidden.iterator(); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 1); + assertEquals(region[1], 7); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 13); + assertEquals(region[1], 14); + + assertTrue(it.hasNext()); + region = it.next(); + assertEquals(region[0], 34); + assertEquals(region[1], 34); + } - // first entry is EMBL-EBI which just uses sequence id not accession id? - assertEquals("EMBL-EBI Search", ((JMenuItem) linkItems[0]).getText()); + @Test(groups = { "Functional" }) + public void testAddFeatureDetails() + { + String menuText = MessageManager.getString("label.feature_details"); - // sequence id for each link should match corresponding DB accession id - for (int i = 1; i < 3; i++) - { - String msg = seq.getName() + " link[" + i + "]"; - assertEquals(msg, refs.get(i + 3).getSource(), - ((JMenuItem) linkItems[i]) - .getText().split("\\|")[0].toUpperCase()); - assertEquals(msg, refs.get(i + 3).getAccessionId(), - ((JMenuItem) linkItems[i]).getText().split("\\|")[1]); - } + /* + * with no features, sub-menu should not be created + */ + List features = new ArrayList<>(); + SequenceI seq = this.alignment.getSequenceAt(0); // FER_CAPAA/1-12 + testee.addFeatureDetails(features, seq, 10); + JMenu menu = findMenu(testee, menuText); + assertNull(menu); - // if there are no valid links the Links submenu is disabled - List nomatchlinks = new ArrayList(); - nomatchlinks.add("NOMATCH | http://www.uniprot.org/uniprot/$" - + DB_ACCESSION + "$"); + /* + * add some features; the menu item text is wrapped in html, and includes + * feature type, position, description, group (if not null) + */ + SequenceFeature sf1 = new SequenceFeature("helix", "curly", 2, 6, null); + SequenceFeature sf2 = new SequenceFeature("chain", "straight", 1, 1, + "uniprot"); + features.add(sf1); + features.add(sf2); + testee.addFeatureDetails(features, seq, 10); + menu = findMenu(testee, menuText); + assertNotNull(menu); + assertEquals(2, menu.getItemCount()); + JMenuItem item = menu.getItem(0); + assertEquals("helix 2-6 curly", item.getText()); + item = menu.getItem(1); + assertEquals("chain 1 straight (uniprot)", item.getText()); - testee = new PopupMenu(parentPanel, seq, noFeatures); - seqItems = testee.sequenceMenu.getMenuComponents(); - linkMenu = (JMenu) seqItems[6]; - assertFalse(linkMenu.isEnabled()); + /* + * long feature descriptions are truncated to 40 characters + */ + sf1.setDescription( + "this is a quite extraordinarily long description"); + testee.remove(menu); // don't create the sub-menu twice + testee.addFeatureDetails(features, seq, 10); + menu = findMenu(testee, menuText); + item = menu.getItem(0); + assertEquals( + "helix 2-6 this is a quite extraordinarily long des...", + item.getText()); + } + /** + * Returns the first component which is a JMenu with the given text + * + * @param c + * @param text + * @return + */ + private JMenu findMenu(Container c, String text) + { + for (int i = 0; i < c.getComponentCount(); i++) + { + Component comp = c.getComponent(i); + if ((comp instanceof JMenu) && ((JMenu) comp).getText().equals(text)) + { + return (JMenu) comp; + } + } + return null; + } + + @Test(groups = { "Functional" }) + public void testAddFeatureDetails_linkedFeatures() + { + // todo tests that verify menu items for complement features } }