git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-192 need visible and actual sequence limits for scale
[jalview.git]
/
test
/
jalview
/
datamodel
/
ColumnSelectionTest.java
diff --git
a/test/jalview/datamodel/ColumnSelectionTest.java
b/test/jalview/datamodel/ColumnSelectionTest.java
index
36932d1
..
63f80b2
100644
(file)
--- a/
test/jalview/datamodel/ColumnSelectionTest.java
+++ b/
test/jalview/datamodel/ColumnSelectionTest.java
@@
-107,7
+107,8
@@
public class ColumnSelectionTest
assertEquals(
Arrays.toString(new int[] { seq.findIndex(seq.getStart()) - 1,
seq.findIndex(seq.getEnd()) - 1, seq.getStart(),
assertEquals(
Arrays.toString(new int[] { seq.findIndex(seq.getStart()) - 1,
seq.findIndex(seq.getEnd()) - 1, seq.getStart(),
- seq.getEnd() }),
+ seq.getEnd(), seq.findIndex(seq.getStart()) - 1,
+ seq.findIndex(seq.getEnd()) - 1 }),
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
// hidden column on gap after end of sequence - should not affect bounds
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
// hidden column on gap after end of sequence - should not affect bounds
@@
-115,7
+116,8
@@
public class ColumnSelectionTest
assertEquals(
Arrays.toString(new int[] { seq.findIndex(seq.getStart()) - 1,
seq.findIndex(seq.getEnd()) - 1, seq.getStart(),
assertEquals(
Arrays.toString(new int[] { seq.findIndex(seq.getStart()) - 1,
seq.findIndex(seq.getEnd()) - 1, seq.getStart(),
- seq.getEnd() }),
+ seq.getEnd(), seq.findIndex(seq.getStart()) - 1,
+ seq.findIndex(seq.getEnd()) - 1 }),
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
cs.revealAllHiddenColumns();
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
cs.revealAllHiddenColumns();
@@
-125,7
+127,8
@@
public class ColumnSelectionTest
assertEquals(
Arrays.toString(new int[] { seq.findIndex(seq.getStart()) - 2,
seq.findIndex(seq.getEnd()) - 2, seq.getStart(),
assertEquals(
Arrays.toString(new int[] { seq.findIndex(seq.getStart()) - 2,
seq.findIndex(seq.getEnd()) - 2, seq.getStart(),
- seq.getEnd() }),
+ seq.getEnd(), seq.findIndex(seq.getStart()) - 1,
+ seq.findIndex(seq.getEnd()) - 1 }),
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
cs.revealAllHiddenColumns();
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
cs.revealAllHiddenColumns();
@@
-134,14
+137,20
@@
public class ColumnSelectionTest
cs.hideColumns(6, 11);
assertEquals("-D",
cs.getVisibleSequenceStrings(0, 5, new SequenceI[] { seq })[0]);
cs.hideColumns(6, 11);
assertEquals("-D",
cs.getVisibleSequenceStrings(0, 5, new SequenceI[] { seq })[0]);
- assertEquals(Arrays.toString(new int[] { 1, 1, 3, 3 }),
+ assertEquals(
+ Arrays.toString(new int[] { 1, 1, 3, 3,
+ seq.findIndex(seq.getStart()) - 1,
+ seq.findIndex(seq.getEnd()) - 1 }),
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
cs.revealAllHiddenColumns();
// hide whole sequence - should just get location of hidden region
// containing sequence
cs.hideColumns(1, 11);
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
cs.revealAllHiddenColumns();
// hide whole sequence - should just get location of hidden region
// containing sequence
cs.hideColumns(1, 11);
- assertEquals(Arrays.toString(new int[] { 0, 1, 0, 0 }),
+ assertEquals(
+ Arrays.toString(new int[] { 0, 1, 0, 0,
+ seq.findIndex(seq.getStart()) - 1,
+ seq.findIndex(seq.getEnd()) - 1 }),
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
}
Arrays.toString(cs.locateVisibleBoundsOfSequence(seq)));
}