X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqPanelTest.java;h=d2344cc8f77ffa21dbcc83ae0d66b8bd645e56a2;hb=f484ffbf14ae725e55c80396be1889708988fd8b;hp=d5c012ec430057509dfd6ddfead2c7b6e0bda4b2;hpb=518c10ed28fbc64c637bbe1a0f336d8e3bf594a6;p=jalview.git diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java index d5c012e..d2344cc 100644 --- a/test/jalview/gui/SeqPanelTest.java +++ b/test/jalview/gui/SeqPanelTest.java @@ -37,10 +37,14 @@ import jalview.io.FileLoader; import java.awt.Event; import java.awt.event.MouseEvent; +import javax.swing.JLabel; + import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import junit.extensions.PA; + public class SeqPanelTest { AlignFrame af; @@ -65,22 +69,24 @@ public class SeqPanelTest assertEquals( alignFrame.alignPanel.getSeqPanel().setStatusMessage( visAl.getSequenceAt(1), 1, 1), 2); - assertEquals(alignFrame.statusBar.getText(), + assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), "Sequence 2 ID: Seq2 Residue: ALA (2)"); assertEquals( alignFrame.alignPanel.getSeqPanel().setStatusMessage( visAl.getSequenceAt(1), 4, 1), 3); - assertEquals(alignFrame.statusBar.getText(), + assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), "Sequence 2 ID: Seq2 Residue: GLU (3)"); // no status message at a gap, returns next residue position to the right assertEquals( alignFrame.alignPanel.getSeqPanel().setStatusMessage( visAl.getSequenceAt(1), 2, 1), 3); - assertEquals(alignFrame.statusBar.getText(), "Sequence 2 ID: Seq2"); + assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), + "Sequence 2 ID: Seq2"); assertEquals( alignFrame.alignPanel.getSeqPanel().setStatusMessage( visAl.getSequenceAt(1), 3, 1), 3); - assertEquals(alignFrame.statusBar.getText(), "Sequence 2 ID: Seq2"); + assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), + "Sequence 2 ID: Seq2"); } @Test(groups = "Functional") @@ -96,7 +102,7 @@ public class SeqPanelTest assertEquals( alignFrame.alignPanel.getSeqPanel().setStatusMessage( visAl.getSequenceAt(1), 1, 1), 2); - assertEquals(alignFrame.statusBar.getText(), + assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), "Sequence 2 ID: Seq2 Residue: B (2)"); } @@ -149,6 +155,7 @@ public class SeqPanelTest av.setScaleLeftWrapped(false); av.setScaleRightWrapped(false); alignFrame.alignPanel.paintAlignment(false, false); + waitForSwing(); // for Swing thread final int charHeight = av.getCharHeight(); final int charWidth = av.getCharWidth(); @@ -358,7 +365,8 @@ public class SeqPanelTest av.setScaleLeftWrapped(false); av.setScaleRightWrapped(false); alignFrame.alignPanel.paintAlignment(false, false); - + waitForSwing(); + final int charHeight = av.getCharHeight(); final int charWidth = av.getCharWidth(); final int alignmentHeight = av.getAlignment().getHeight(); @@ -576,6 +584,7 @@ public class SeqPanelTest assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); } + @Test(groups = "Functional") public void testFindMousePosition_wrapped_noAnnotations() { @@ -588,7 +597,8 @@ public class SeqPanelTest av.setScaleLeftWrapped(false); av.setScaleRightWrapped(false); alignFrame.alignPanel.paintAlignment(false, false); - + waitForSwing(); + final int charHeight = av.getCharHeight(); final int charWidth = av.getCharWidth(); final int alignmentHeight = av.getAlignment().getHeight(); @@ -663,6 +673,163 @@ public class SeqPanelTest assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); } + + @Test(groups = "Functional") + public void testFindColumn_unwrapped() + { + Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", "false"); + AlignFrame alignFrame = new FileLoader().LoadFileWaitTillLoaded( + "examples/uniref50.fa", DataSourceType.FILE); + SeqPanel testee = alignFrame.alignPanel.getSeqPanel(); + int x = 0; + final int charWidth = alignFrame.getViewport().getCharWidth(); + assertTrue(charWidth > 0); // sanity check + assertEquals(alignFrame.getViewport().getRanges().getStartRes(), 0); + + /* + * mouse at top left of unwrapped panel + */ + MouseEvent evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, + 0, 0, 0, false, 0); + assertEquals(testee.findColumn(evt), 0); + + /* + * not quite one charWidth across + */ + x = charWidth-1; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, + 0, 0, 0, false, 0); + assertEquals(testee.findColumn(evt), 0); + + /* + * one charWidth across + */ + x = charWidth; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), 1); + + /* + * two charWidths across + */ + x = 2 * charWidth; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), 2); + + /* + * limited to last column of seqcanvas + */ + x = 20000; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + SeqCanvas seqCanvas = alignFrame.alignPanel.getSeqPanel().seqCanvas; + int w = seqCanvas.getWidth(); + // limited to number of whole columns, base 0 + int expected = w / charWidth - 1; + assertEquals(testee.findColumn(evt), expected); + + /* + * hide columns 5-10 (base 1) + */ + alignFrame.getViewport().hideColumns(4, 9); + x = 5 * charWidth + 2; + // x is in 6th visible column, absolute column 12, or 11 base 0 + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), 11); + } + + @Test(groups = "Functional") + public void testFindColumn_wrapped() + { + Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", "true"); + AlignFrame alignFrame = new FileLoader().LoadFileWaitTillLoaded( + "examples/uniref50.fa", DataSourceType.FILE); + AlignViewport av = alignFrame.getViewport(); + av.setScaleAboveWrapped(false); + av.setScaleLeftWrapped(false); + av.setScaleRightWrapped(false); + alignFrame.alignPanel.paintAlignment(false, false); + // need to wait for repaint to finish! + waitForSwing(); + SeqPanel testee = alignFrame.alignPanel.getSeqPanel(); + int x = 0; + final int charWidth = av.getCharWidth(); + assertTrue(charWidth > 0); // sanity check + assertEquals(av.getRanges().getStartRes(), 0); + + /* + * mouse at top left of wrapped panel, no West (left) scale + */ + MouseEvent evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, + 0, 0, 0, false, 0); + assertEquals(testee.findColumn(evt), 0); + + /* + * not quite one charWidth across + */ + x = charWidth-1; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, + 0, 0, 0, false, 0); + assertEquals(testee.findColumn(evt), 0); + + /* + * one charWidth across + */ + x = charWidth; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), 1); + + /* + * x over scale left (before drawn columns) results in -1 + */ + av.setScaleLeftWrapped(true); + alignFrame.alignPanel.paintAlignment(false, false); + waitForSwing(); + SeqCanvas seqCanvas = testee.seqCanvas; + int labelWidth = (int) PA.getValue(seqCanvas, "labelWidthWest"); + assertTrue(labelWidth > 0); + x = labelWidth - 1; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), -1); + + x = labelWidth; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), 0); + + /* + * x over right edge of last residue (including scale left) + */ + int residuesWide = av.getRanges().getViewportWidth(); + assertTrue(residuesWide > 0); + x = labelWidth + charWidth * residuesWide - 1; + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), residuesWide - 1); + + /* + * x over scale right (beyond drawn columns) results in -1 + */ + av.setScaleRightWrapped(true); + alignFrame.alignPanel.paintAlignment(false, false); + waitForSwing(); + labelWidth = (int) PA.getValue(seqCanvas, "labelWidthEast"); + assertTrue(labelWidth > 0); + int residuesWide2 = av.getRanges().getViewportWidth(); + assertTrue(residuesWide2 > 0); + assertTrue(residuesWide2 < residuesWide); // available width reduced + x += 1; // just over left edge of scale right + evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, 0, 0, 0, 0, + false, 0); + assertEquals(testee.findColumn(evt), -1); + + // todo add startRes offset, hidden columns + + } @BeforeClass(alwaysRun = true) public static void setUpBeforeClass() throws Exception { @@ -672,4 +839,18 @@ public class SeqPanelTest Cache.loadProperties("test/jalview/io/testProps.jvprops"); Jalview.main(new String[] { "-nonews" }); } + + /** + * waits a few ms for Swing to do something + */ + synchronized void waitForSwing() + { + try + { + super.wait(10); + } catch (InterruptedException e) + { + e.printStackTrace(); + } + } }