X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPopupMenuTest.java;h=7636bdafb636ef7d1d10db714add807160eb263c;hb=3684934fd25c4941bd2d6ec8bc9dc7d760979f4e;hp=6d0422d16ddec2fa53f94affce5e4ae0705e36e7;hpb=8e566fb53ad6f8ae7c12c4c1cb640215edea4810;p=jalview.git diff --git a/test/jalview/gui/PopupMenuTest.java b/test/jalview/gui/PopupMenuTest.java index 6d0422d..7636bda 100644 --- a/test/jalview/gui/PopupMenuTest.java +++ b/test/jalview/gui/PopupMenuTest.java @@ -24,9 +24,29 @@ 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.bin.Console; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; import jalview.datamodel.Annotation; @@ -46,22 +66,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.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; - public class PopupMenuTest { @@ -91,16 +95,15 @@ public class PopupMenuTest public void setUp() throws IOException { Cache.loadProperties("test/jalview/io/testProps.jvprops"); + Console.initLogger(); + String inMenuString = ("EMBL-EBI Search | http://www.ebi.ac.uk/ebisearch/search.ebi?db=allebi&query=$" - + SEQUENCE_ID - + "$" - + "|" - + "UNIPROT | http://www.uniprot.org/uniprot/$" + DB_ACCESSION + "$") - + "|" + + SEQUENCE_ID + "$" + "|" + + "UNIPROT | http://www.uniprot.org/uniprot/$" + DB_ACCESSION + + "$") + "|" + ("INTERPRO | http://www.ebi.ac.uk/interpro/entry/$" + DB_ACCESSION + "$") - + "|" - + + + "|" + // Gene3D entry tests for case (in)sensitivity ("Gene3D | http://gene3d.biochem.ucl.ac.uk/Gene3D/search?sterm=$" + DB_ACCESSION + "$&mode=protein"); @@ -113,7 +116,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()) { @@ -196,9 +199,6 @@ 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
"
- // + s + "
Jmol/secondary structure
PDB/Temp