import jalview.analysis.AlignmentGenerator;
import jalview.datamodel.AlignmentI;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.HiddenColumns;
+import jalview.datamodel.HiddenSequences;
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
public class ViewportRangesTest {
AlignmentI al = gen.generate(20, 30, 1, 5, 5);
+ AlignmentI smallAl = gen.generate(7, 2, 2, 5, 5);
+
+ @BeforeMethod(alwaysRun = true)
+ public void cleanUp()
+ {
+ ColumnSelection sel = new ColumnSelection();
+ al.getHiddenColumns().revealAllHiddenColumns(sel);
+ al.getHiddenSequences().showAll(null);
+ smallAl.getHiddenColumns().revealAllHiddenColumns(sel);
+ smallAl.getHiddenSequences().showAll(null);
+ }
+
@Test(groups = { "Functional" })
public void testViewportRanges()
{
vr.setStartSeq(-1);
assertEquals(vr.getStartSeq(), 0);
- vr.setStartSeq(al.getHeight());
- assertEquals(vr.getStartSeq(), al.getHeight() - 1);
+ vr.setStartSeq(al.getHeight() - vr.getViewportHeight() + 1);
+ assertEquals(vr.getStartSeq(), al.getHeight() - vr.getViewportHeight());
- vr.setStartSeq(al.getHeight() - 1);
- assertEquals(vr.getStartSeq(), al.getHeight() - 1);
+ vr.setStartSeq(al.getHeight() - vr.getViewportHeight());
+ assertEquals(vr.getStartSeq(), al.getHeight() - vr.getViewportHeight());
}
@Test(groups = { "Functional" })
assertEquals(vr.getEndRes(), 19);
vr.setStartEndRes(al.getWidth(), al.getWidth());
- assertEquals(vr.getEndRes(), al.getWidth());
+ assertEquals(vr.getEndRes(), al.getWidth() - 1);
+
+ ViewportRanges vrsmall = new ViewportRanges(smallAl);
+ vrsmall.setStartEndRes(al.getWidth(), al.getWidth());
+ assertEquals(vrsmall.getEndRes(), 6);
+
+ // make visible alignment width = 0
+ smallAl.getHiddenColumns().hideColumns(0, 6);
+ vrsmall.setStartEndRes(0, 4);
+ assertEquals(vrsmall.getStartRes(), 0);
+ assertEquals(vrsmall.getEndRes(), 0);
}
@Test(groups = { "Functional" })
vr.setStartEndSeq(al.getHeight(), al.getHeight());
assertEquals(vr.getEndSeq(), al.getHeight() - 1);
+
+ // make visible alignment height = 0
+ smallAl.getHiddenSequences().hideSequence(smallAl.getSequenceAt(0));
+ smallAl.getHiddenSequences().hideSequence(smallAl.getSequenceAt(0));
+ ViewportRanges vrsmall = new ViewportRanges(smallAl);
+ vrsmall.setStartEndSeq(0, 3);
+ assertEquals(vrsmall.getStartSeq(), 0);
+ assertEquals(vrsmall.getEndSeq(), 0);
}
@Test(groups = { "Functional" })
// reset out of bounds start values to within bounds
vr.setViewportStartAndWidth(35, 5);
assertEquals(vr.getViewportWidth(), 5);
- assertEquals(vr.getStartRes(), 20);
+ assertEquals(vr.getStartRes(), 16);
+
+ // small alignment doesn't get bounds reset
+ ViewportRanges vrsmall = new ViewportRanges(smallAl);
+ vrsmall.setViewportStartAndWidth(0, 63);
+ assertEquals(vrsmall.getViewportWidth(), 7);
+ assertEquals(vrsmall.getStartRes(), 0);
}
@Test(groups = { "Functional" })
vr.pageDown();
// pagedown to bottom does not go beyond end, and height stays same
- assertEquals(vr.getStartSeq(), 23);
+ assertEquals(vr.getStartSeq(), 24);
assertEquals(vr.getViewportHeight(), 6);
}
vr.scrollUp(true);
assertEquals(vr.getStartSeq(), 0);
+ vr.setViewportStartAndHeight(24, 5);
+ vr.scrollUp(false);
+ assertEquals(vr.getStartSeq(), 25);
+ // can't scroll beyond bottom
+ vr.scrollUp(false);
+ assertEquals(vr.getStartSeq(), 25);
+ }
+
+ @Test(groups = { "Functional" })
+ public void testScrollUpWithHidden()
+ {
+ ViewportRanges vr = new ViewportRanges(al);
+
+ // hide last sequence
+ HiddenSequences hidden = new HiddenSequences(al);
+ hidden.hideSequence(al.getSequenceAt(29));
+
+ vr.setViewportStartAndHeight(1, 5);
+ vr.scrollUp(true);
+ assertEquals(vr.getStartSeq(), 0);
+ // can't scroll above top
+ vr.scrollUp(true);
+ assertEquals(vr.getStartSeq(), 0);
+
vr.setViewportStartAndHeight(23, 5);
vr.scrollUp(false);
assertEquals(vr.getStartSeq(), 24);
vr.scrollRight(false);
assertEquals(vr.getStartRes(), 0);
- vr.setViewportStartAndWidth(19, 5);
+ vr.setViewportStartAndWidth(15, 5);
vr.scrollRight(true);
- assertEquals(vr.getStartRes(), 20);
+ assertEquals(vr.getStartRes(), 16);
// can't scroll right past end
vr.scrollRight(true);
- assertEquals(vr.getStartRes(), 20);
+ assertEquals(vr.getStartRes(), 16);
+ }
+
+ @Test(groups = { "Functional" })
+ public void testScrollRightWithHidden()
+ {
+ ViewportRanges vr = new ViewportRanges(al);
+
+ // hide last 2 columns
+ HiddenColumns cols = new HiddenColumns();
+ cols.hideColumns(19, 20);
+ al.setHiddenColumns(cols);
+
+ vr.setViewportStartAndWidth(1, 5);
+ vr.scrollRight(false);
+ assertEquals(vr.getStartRes(), 0);
+ // can't scroll left past start
+ vr.scrollRight(false);
+ assertEquals(vr.getStartRes(), 0);
+
+ vr.setViewportStartAndWidth(13, 5);
+ vr.scrollRight(true);
+ assertEquals(vr.getStartRes(), 14);
+ // can't scroll right past last visible col
+ vr.scrollRight(true);
+ assertEquals(vr.getStartRes(), 14);
}
@Test(groups = { "Functional" })
{
ViewportRanges vr = new ViewportRanges(al);
MockPropChangeListener l = new MockPropChangeListener(vr);
- List<String> emptylist = new ArrayList<String>();
+ List<String> emptylist = new ArrayList<>();
+
+ vr.setViewportWidth(5);
+ vr.setViewportHeight(5);
+ l.reset();
// one event fired when startRes is called with new value
vr.setStartRes(4);
assertTrue(l.verify(0, emptylist));
l.reset();
+ // check new value fired by event is corrected startres
+ vr.setStartEndRes(-1, 5);
+ assertTrue(l.verify(1, Arrays.asList("startres"), Arrays.asList(0)));
+ l.reset();
+
+ // check new value fired by event is corrected endres
+ vr.setStartEndRes(0, -1);
+ assertTrue(l.verify(1, Arrays.asList("endres"), Arrays.asList(0)));
+ l.reset();
+
vr.setStartEndSeq(2, 15);
assertTrue(l.verify(1, Arrays.asList("startseq")));
l.reset();
assertTrue(l.verify(0, emptylist));
l.reset();
+ vr.setStartEndRes(2, 2); // so seq and res values should be different, in
+ // case of transposing in code
+ l.reset();
+
+ // check new value fired by event is corrected startseq
+ vr.setStartEndSeq(-1, 5);
+ assertTrue(l.verify(1, Arrays.asList("startseq"), Arrays.asList(0)));
+ l.reset();
+
+ // check new value fired by event is corrected endseq
+ vr.setStartEndSeq(0, -1);
+ assertTrue(l.verify(1, Arrays.asList("endseq"), Arrays.asList(0)));
+ l.reset();
+
+ // reset for later tests
+ vr.setStartEndSeq(2, 15);
+ l.reset();
+
// test viewport height and width setting triggers event
vr.setViewportHeight(10);
assertTrue(l.verify(1, Arrays.asList("endseq")));
assertTrue(l.verify(1, Arrays.asList("startres")));
l.reset();
- // TODO test scrollToVisibble once hidden columns JAL-2388 merged in
- // to avoid somersaults with align viewport
- /*vr.scrollToVisible(10, 10);
- assertTrue(l.verify(1, Arrays.asList("startres")));
- l.reset();*/
+ vr.scrollToVisible(10, 10);
+ assertTrue(l.verify(4,
+ Arrays.asList("startseq", "startseq", "startseq", "startseq")));
+ l.reset();
vr.scrollToWrappedVisible(5);
assertTrue(l.verify(1, Arrays.asList("startres")));
{
private int firecount = 0;
- private List<String> events = new ArrayList<String>();
+ private List<String> events = new ArrayList<>();
+
+ private List<Integer> newvalues = new ArrayList<>();
public MockPropChangeListener(ViewportRanges vr)
{
{
firecount++;
events.add(evt.getPropertyName());
+ newvalues.add((Integer) evt.getNewValue());
+ }
+
+ public boolean verify(int count, List<String> eventslist,
+ List<Integer> valueslist)
+ {
+ return (count == firecount) && events.equals(eventslist)
+ && newvalues.equals(valueslist);
}
public boolean verify(int count, List<String> eventslist)
{
firecount = 0;
events.clear();
+ newvalues.clear();
}
}
git://source.jalview.org / jalview.git / blobdiff