X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqPanelTest.java;h=f905ef2f7a5dbf18f7badfc937dbacd192540c1b;hb=fbfbbe26bee37143d5279fe4d254a5a89c96b021;hp=678351432cc6f418769e26789ad788751a464638;hpb=87e1ada6a62777b415f14b0444fdcc63336c8f73;p=jalview.git diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java index 6783514..f905ef2 100644 --- a/test/jalview/gui/SeqPanelTest.java +++ b/test/jalview/gui/SeqPanelTest.java @@ -24,6 +24,17 @@ import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; +import java.awt.EventQueue; +import java.awt.FontMetrics; +import java.awt.event.MouseEvent; +import java.lang.reflect.InvocationTargetException; + +import javax.swing.JLabel; + +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + import jalview.api.AlignViewportI; import jalview.bin.Cache; import jalview.bin.Jalview; @@ -33,24 +44,15 @@ import jalview.commands.EditCommand.Edit; import jalview.datamodel.Alignment; import jalview.datamodel.AlignmentAnnotation; import jalview.datamodel.AlignmentI; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SearchResultsI; import jalview.datamodel.Sequence; import jalview.datamodel.SequenceI; import jalview.gui.SeqPanel.MousePos; import jalview.io.DataSourceType; import jalview.io.FileLoader; import jalview.util.MessageManager; - -import java.awt.Event; -import java.awt.EventQueue; -import java.awt.event.MouseEvent; -import java.lang.reflect.InvocationTargetException; - -import javax.swing.JLabel; - -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - +import jalview.viewmodel.ViewportRanges; import junit.extensions.PA; public class SeqPanelTest @@ -63,6 +65,7 @@ public class SeqPanelTest JvOptionPane.setInteractiveMode(false); JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION); } + @Test(groups = "Functional") public void testSetStatusReturnsNearestResiduePosition() { @@ -74,25 +77,21 @@ public class SeqPanelTest AlignmentI visAl = alignFrame.getViewport().getAlignment(); // Test either side of gap - assertEquals( - alignFrame.alignPanel.getSeqPanel().setStatusMessage( - visAl.getSequenceAt(1), 1, 1), 2); + assertEquals(alignFrame.alignPanel.getSeqPanel() + .setStatusMessage(visAl.getSequenceAt(1), 1, 1), 2); 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.alignPanel.getSeqPanel() + .setStatusMessage(visAl.getSequenceAt(1), 4, 1), 3); 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.alignPanel.getSeqPanel() + .setStatusMessage(visAl.getSequenceAt(1), 2, 1), 3); assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), "Sequence 2 ID: Seq2"); - assertEquals( - alignFrame.alignPanel.getSeqPanel().setStatusMessage( - visAl.getSequenceAt(1), 3, 1), 3); + assertEquals(alignFrame.alignPanel.getSeqPanel() + .setStatusMessage(visAl.getSequenceAt(1), 3, 1), 3); assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), "Sequence 2 ID: Seq2"); } @@ -107,9 +106,8 @@ public class SeqPanelTest al.getHeight()); AlignmentI visAl = alignFrame.getViewport().getAlignment(); - assertEquals( - alignFrame.alignPanel.getSeqPanel().setStatusMessage( - visAl.getSequenceAt(1), 1, 1), 2); + assertEquals(alignFrame.alignPanel.getSeqPanel() + .setStatusMessage(visAl.getSequenceAt(1), 1, 1), 2); assertEquals(((JLabel) PA.getValue(alignFrame, "statusBar")).getText(), "Sequence 2 ID: Seq2 Residue: B (2)"); } @@ -123,7 +121,7 @@ public class SeqPanelTest assertNull(SeqPanel.getEditStatusMessage(edit)); SequenceI[] seqs = new SequenceI[] { new Sequence("a", "b") }; - + // 1 gap edit.addEdit(edit.new Edit(Action.INSERT_GAP, seqs, 1, 1, '-')); String expected = MessageManager.formatMessage("label.insert_gap", "1"); @@ -163,7 +161,7 @@ public class SeqPanelTest { EditCommand edit = new EditCommand(); // empty SequenceI[] seqs = new SequenceI[] { new Sequence("a", "b") }; - + // 1 gap inserted, balanced by 1 delete Edit e1 = edit.new Edit(Action.INSERT_GAP, seqs, 1, 1, '-'); edit.addEdit(e1); @@ -172,7 +170,7 @@ public class SeqPanelTest edit.addEdit(e2); String expected = MessageManager.formatMessage("label.insert_gap", "1"); assertEquals(SeqPanel.getEditStatusMessage(edit), expected); - + // 2 more gaps makes +3 Edit e3 = edit.new Edit(Action.INSERT_GAP, seqs, 1, 2, '-'); edit.addEdit(e3); @@ -181,7 +179,7 @@ public class SeqPanelTest edit.addEdit(e4); expected = MessageManager.formatMessage("label.insert_gaps", "3"); assertEquals(SeqPanel.getEditStatusMessage(edit), expected); - + // 2 deletes makes + 1 Edit e5 = edit.new Edit(Action.DELETE_GAP, seqs, 1, 2, '-'); edit.addEdit(e5); @@ -190,7 +188,7 @@ public class SeqPanelTest edit.addEdit(e6); expected = MessageManager.formatMessage("label.insert_gap", "1"); assertEquals(SeqPanel.getEditStatusMessage(edit), expected); - + // 1 more delete makes 0 - no text Edit e7 = edit.new Edit(Action.DELETE_GAP, seqs, 1, 1, '-'); edit.addEdit(e7); @@ -199,7 +197,7 @@ public class SeqPanelTest edit.addEdit(e8); expected = MessageManager.formatMessage("label.insert_gaps", "2"); assertNull(SeqPanel.getEditStatusMessage(edit)); - + // 1 more delete makes 1 delete Edit e9 = edit.new Edit(Action.DELETE_GAP, seqs, 1, 1, '-'); edit.addEdit(e9); @@ -208,7 +206,7 @@ public class SeqPanelTest edit.addEdit(e10); expected = MessageManager.formatMessage("label.delete_gap", "1"); assertEquals(SeqPanel.getEditStatusMessage(edit), expected); - + // 2 more deletes makes 3 deletes Edit e11 = edit.new Edit(Action.DELETE_GAP, seqs, 1, 2, '-'); edit.addEdit(e11); @@ -241,8 +239,8 @@ public class SeqPanelTest /* * mouse at top left of unwrapped panel */ - MouseEvent evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, - 0, 0, 0, false, 0); + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, + x, y, 0, 0, 0, false, 0); MousePos pos = testee.findMousePosition(evt); assertEquals(pos.column, 0); assertEquals(pos.seqIndex, 0); @@ -272,22 +270,22 @@ public class SeqPanelTest final int charHeight = av.getCharHeight(); final int charWidth = av.getCharWidth(); final int alignmentHeight = av.getAlignment().getHeight(); - + // sanity checks: assertTrue(charHeight > 0); assertTrue(charWidth > 0); assertTrue(alignFrame.alignPanel.getSeqPanel().getWidth() > 0); - + SeqPanel testee = alignFrame.alignPanel.getSeqPanel(); int x = 0; int y = 0; - + /* * mouse at top left of wrapped panel; there is a gap of charHeight * above the alignment */ - MouseEvent evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, - 0, 0, 0, false, 0); + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, + x, y, 0, 0, 0, false, 0); MousePos pos = testee.findMousePosition(evt); assertEquals(pos.column, 0); assertEquals(pos.seqIndex, -1); // above sequences @@ -297,8 +295,8 @@ public class SeqPanelTest * cursor at bottom of gap above */ y = charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); @@ -307,8 +305,8 @@ public class SeqPanelTest * cursor over top of first sequence */ y = charHeight; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); @@ -317,8 +315,8 @@ public class SeqPanelTest * cursor at bottom of first sequence */ y = 2 * charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); @@ -327,8 +325,8 @@ public class SeqPanelTest * cursor at top of second sequence */ y = 2 * charHeight; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 1); assertEquals(pos.annotationIndex, -1); @@ -337,8 +335,8 @@ public class SeqPanelTest * cursor at bottom of second sequence */ y = 3 * charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 1); assertEquals(pos.annotationIndex, -1); @@ -347,8 +345,8 @@ public class SeqPanelTest * cursor at bottom of last sequence */ y = charHeight * (1 + alignmentHeight) - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); @@ -358,8 +356,8 @@ public class SeqPanelTest * method reports index of nearest sequence above */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); @@ -368,8 +366,8 @@ public class SeqPanelTest * cursor still in the gap above annotations, now at the bottom of it */ y += SeqCanvas.SEQS_ANNOTATION_GAP - 1; // 3-1 = 2 - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); @@ -382,8 +380,8 @@ public class SeqPanelTest * cursor at the top of the n'th annotation */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, + 0, 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, n); // over n'th annotation @@ -392,8 +390,8 @@ public class SeqPanelTest * cursor at the bottom of the n'th annotation */ y += annotationRows[n].height - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, + 0, 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, n); @@ -403,8 +401,8 @@ public class SeqPanelTest * cursor in gap between wrapped widths */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); @@ -413,8 +411,8 @@ public class SeqPanelTest * cursor at bottom of gap between wrapped widths */ y += charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); @@ -423,8 +421,8 @@ public class SeqPanelTest * cursor at top of first sequence, second wrapped width */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); @@ -446,119 +444,120 @@ public class SeqPanelTest final int charHeight = av.getCharHeight(); final int charWidth = av.getCharWidth(); final int alignmentHeight = av.getAlignment().getHeight(); - + // sanity checks: assertTrue(charHeight > 0); assertTrue(charWidth > 0); assertTrue(alignFrame.alignPanel.getSeqPanel().getWidth() > 0); - + SeqPanel testee = alignFrame.alignPanel.getSeqPanel(); int x = 0; int y = 0; - + /* * mouse at top left of wrapped panel; there is a gap of charHeight * above the alignment */ - MouseEvent evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, - 0, 0, 0, false, 0); + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, + x, y, 0, 0, 0, false, 0); MousePos pos = testee.findMousePosition(evt); assertEquals(pos.column, 0); assertEquals(pos.seqIndex, -1); // above sequences assertEquals(pos.annotationIndex, -1); - + /* * cursor at bottom of gap above * two charHeights including scale panel */ y = 2 * charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); - + /* * cursor over top of first sequence */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); - + /* * cursor at bottom of first sequence */ y += charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); - + /* * cursor at top of second sequence */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 1); assertEquals(pos.annotationIndex, -1); - + /* * cursor at bottom of second sequence */ y += charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 1); assertEquals(pos.annotationIndex, -1); - + /* * cursor at bottom of last sequence * (scale + gap + sequences) */ y = charHeight * (2 + alignmentHeight) - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); - + /* * cursor below sequences, in 3-pixel gap above annotations */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); - + /* * cursor still in the gap above annotations, now at the bottom of it * method reports index of nearest sequence above */ y += SeqCanvas.SEQS_ANNOTATION_GAP - 1; // 3-1 = 2 - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); - - AlignmentAnnotation[] annotationRows = av.getAlignment().getAlignmentAnnotation(); + + AlignmentAnnotation[] annotationRows = av.getAlignment() + .getAlignmentAnnotation(); for (int n = 0; n < annotationRows.length; n++) { /* * cursor at the top of the n'th annotation */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, + 0, 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, n); // over n'th annotation @@ -567,39 +566,44 @@ public class SeqPanelTest * cursor at the bottom of the n'th annotation */ y += annotationRows[n].height - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, + 0, 0, false, 0); pos = testee.findMousePosition(evt); - assertEquals(pos.seqIndex, alignmentHeight - 1); + SeqCanvas sc = testee.seqCanvas; + assertEquals(pos.seqIndex, alignmentHeight - 1, + String.format("%s n=%d y=%d %d, %d, %d, %d", + annotationRows[n].label, n, y, sc.getWidth(), + sc.getHeight(), sc.wrappedRepeatHeightPx, + sc.wrappedSpaceAboveAlignment)); assertEquals(pos.annotationIndex, n); } - + /* * cursor in gap between wrapped widths */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); - + /* * cursor at bottom of gap between wrapped widths */ y += charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); - + /* * cursor at top of scale, second wrapped width */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); @@ -608,8 +612,8 @@ public class SeqPanelTest * cursor at bottom of scale, second wrapped width */ y += charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); @@ -618,8 +622,8 @@ public class SeqPanelTest * cursor at top of first sequence, second wrapped width */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); @@ -630,6 +634,7 @@ public class SeqPanelTest { Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS", "false"); Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", "true"); + Cache.applicationProperties.setProperty("FONT_SIZE", "10"); AlignFrame alignFrame = new FileLoader().LoadFileWaitTillLoaded( "examples/uniref50.fa", DataSourceType.FILE); AlignViewportI av = alignFrame.getViewport(); @@ -641,33 +646,33 @@ public class SeqPanelTest final int charHeight = av.getCharHeight(); final int charWidth = av.getCharWidth(); final int alignmentHeight = av.getAlignment().getHeight(); - + // sanity checks: assertTrue(charHeight > 0); assertTrue(charWidth > 0); assertTrue(alignFrame.alignPanel.getSeqPanel().getWidth() > 0); - + SeqPanel testee = alignFrame.alignPanel.getSeqPanel(); int x = 0; int y = 0; - + /* * mouse at top left of wrapped panel; there is a gap of charHeight * above the alignment */ - MouseEvent evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, - 0, 0, 0, false, 0); + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, + x, y, 0, 0, 0, false, 0); MousePos pos = testee.findMousePosition(evt); assertEquals(pos.column, 0); assertEquals(pos.seqIndex, -1); // above sequences assertEquals(pos.annotationIndex, -1); - + /* * cursor over top of first sequence */ y = charHeight; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); @@ -676,38 +681,38 @@ public class SeqPanelTest * cursor at bottom of last sequence */ y = charHeight * (1 + alignmentHeight) - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, alignmentHeight - 1); assertEquals(pos.annotationIndex, -1); - + /* * cursor below sequences, at top of charHeight gap between widths */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); - + /* * cursor below sequences, at top of charHeight gap between widths */ y += charHeight - 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, -1); assertEquals(pos.annotationIndex, -1); - + /* * cursor at the top of the first sequence, second width */ y += 1; - evt = new MouseEvent(testee, Event.MOUSE_MOVE, 0L, 0, x, y, 0, 0, 0, - false, 0); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); pos = testee.findMousePosition(evt); assertEquals(pos.seqIndex, 0); assertEquals(pos.annotationIndex, -1); @@ -723,49 +728,52 @@ public class SeqPanelTest int x = 0; final int charWidth = alignFrame.getViewport().getCharWidth(); assertTrue(charWidth > 0); // sanity check - assertEquals(alignFrame.getViewport().getRanges().getStartRes(), 0); + ViewportRanges ranges = alignFrame.getViewport().getRanges(); + assertEquals(ranges.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); + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + x = charWidth - 1; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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; + // limited to number of whole columns, base 0, + // and to end of visible range + int expected = w / charWidth; + expected = Math.min(expected, ranges.getEndRes()); assertEquals(testee.findColumn(evt), expected); /* @@ -774,8 +782,8 @@ public class SeqPanelTest 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0, + 0, false, 0); assertEquals(testee.findColumn(evt), 11); } @@ -795,28 +803,28 @@ public class SeqPanelTest 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); + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + x = charWidth - 1; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0, + 0, false, 0); assertEquals(testee.findColumn(evt), 1); /* @@ -828,13 +836,13 @@ public class SeqPanelTest 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0, + 0, false, 0); assertEquals(testee.findColumn(evt), 0); /* @@ -843,8 +851,8 @@ public class SeqPanelTest 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0, + 0, false, 0); assertEquals(testee.findColumn(evt), residuesWide - 1); /* @@ -858,13 +866,14 @@ public class SeqPanelTest 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); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 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 { @@ -894,4 +903,158 @@ public class SeqPanelTest e.printStackTrace(); } } + + @Test(groups = "Functional") + public void testFindMousePosition_wrapped_scales_longSequence() + { + Cache.applicationProperties.setProperty("SHOW_ANNOTATIONS", "false"); + Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", "true"); + Cache.applicationProperties.setProperty("FONT_SIZE", "14"); + Cache.applicationProperties.setProperty("FONT_NAME", "SansSerif"); + Cache.applicationProperties.setProperty("FONT_STYLE", "0"); + // sequence of 50 bases, doubled 10 times, = 51200 bases + String dna = "ATGGCCATTGGGCCCAAATTTCCCAAAGGGTTTCCCTGAGGTCAGTCAGA"; + for (int i = 0; i < 10; i++) + { + dna += dna; + } + assertEquals(dna.length(), 51200); + AlignFrame alignFrame = new FileLoader() + .LoadFileWaitTillLoaded("dna "+dna, DataSourceType.PASTE); + SeqPanel testee = alignFrame.alignPanel.getSeqPanel(); + AlignViewport av = alignFrame.getViewport(); + av.setScaleAboveWrapped(true); + av.setScaleLeftWrapped(true); + av.setScaleRightWrapped(true); + alignFrame.alignPanel.updateLayout(); + + try + { + Thread.sleep(200); + } catch (InterruptedException e) + { + } + + final int charHeight = av.getCharHeight(); + final int charWidth = av.getCharWidth(); + assertEquals(charHeight, 17); + assertEquals(charWidth, 12); + + FontMetrics fm = testee.getFontMetrics(av.getFont()); + int labelWidth = fm.stringWidth("00000") + charWidth; + assertEquals(labelWidth, 57); // 5 x 9 + charWidth + assertEquals(testee.seqCanvas.getLabelWidthWest(), labelWidth); + + int x = 0; + int y = 0; + + /* + * mouse at top left of wrapped panel; there is a gap of 2 * charHeight + * above the alignment + */ + MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, + x, y, 0, 0, 0, false, 0); + MousePos pos = testee.findMousePosition(evt); + assertEquals(pos.column, -1); // over scale left, not an alignment column + assertEquals(pos.seqIndex, -1); // above sequences + assertEquals(pos.annotationIndex, -1); + + /* + * cursor over scale above first sequence + */ + y += charHeight; + x = labelWidth; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, -1); + assertEquals(pos.column, 0); + assertEquals(pos.annotationIndex, -1); + + /* + * cursor over scale left of first sequence + */ + y += charHeight; + x = 0; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, 0); + assertEquals(pos.column, -1); + assertEquals(pos.annotationIndex, -1); + + /* + * cursor over start of first sequence + */ + x = labelWidth; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, 0); + assertEquals(pos.column, 0); + assertEquals(pos.annotationIndex, -1); + + /* + * move one character right, to bottom pixel of same row + */ + x += charWidth; + y += charHeight - 1; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, 0); + assertEquals(pos.column, 1); + + /* + * move down one pixel - now in the no man's land between rows + */ + y += 1; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, -1); + assertEquals(pos.column, 1); + + /* + * move down two char heights less one pixel - still in the no man's land + * (scale above + spacer line) + */ + y += (2 * charHeight - 1); + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, -1); + assertEquals(pos.column, 1); + + /* + * move down one more pixel - now on the next row of the sequence + */ + y += 1; + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, 0); + assertEquals(pos.column, 1 + av.getWrappedWidth()); + + /* + * scroll to near the end of the sequence + */ + SearchResultsI sr = new SearchResults(); + int scrollTo = dna.length() - 1000; + sr.addResult(av.getAlignment().getSequenceAt(0), scrollTo, scrollTo); + alignFrame.alignPanel.scrollToPosition(sr); + + /* + * place the mouse on the first column of the 6th sequence, and + * verify that (computed) findMousePosition matches (actual) ViewportRanges + */ + x = labelWidth; + y = 17 * charHeight; // 17 = 6 times two header rows and 5 sequence rows + evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, y, 0, 0, + 0, false, 0); + pos = testee.findMousePosition(evt); + assertEquals(pos.seqIndex, 0); + int expected = av.getRanges().getStartRes() + 5 * av.getWrappedWidth(); + assertEquals(pos.column, expected); + } }