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-2808 ensure test setUp/tearDown alwaysRun
[jalview.git]
/
test
/
jalview
/
datamodel
/
HiddenColumnsTest.java
diff --git
a/test/jalview/datamodel/HiddenColumnsTest.java
b/test/jalview/datamodel/HiddenColumnsTest.java
index
f15f7ad
..
2916199
100644
(file)
--- a/
test/jalview/datamodel/HiddenColumnsTest.java
+++ b/
test/jalview/datamodel/HiddenColumnsTest.java
@@
-1129,7
+1129,7
@@
public class HiddenColumnsTest
public void testBoundedStartIterator()
{
HiddenColumns h = new HiddenColumns();
public void testBoundedStartIterator()
{
HiddenColumns h = new HiddenColumns();
- Iterator<Integer> it = h.getBoundedStartIterator(0, 10);
+ Iterator<Integer> it = h.getStartRegionIterator(0, 10);
// no hidden columns = nothing to iterate over
assertFalse(it.hasNext());
// no hidden columns = nothing to iterate over
assertFalse(it.hasNext());
@@
-1138,7
+1138,7
@@
public class HiddenColumnsTest
// all regions are returned
h.hideColumns(3, 10);
h.hideColumns(14, 16);
// all regions are returned
h.hideColumns(3, 10);
h.hideColumns(14, 16);
- it = h.getBoundedStartIterator(0, 20);
+ it = h.getStartRegionIterator(0, 20);
assertTrue(it.hasNext());
int next = it.next();
assertEquals(3, next);
assertTrue(it.hasNext());
int next = it.next();
assertEquals(3, next);
@@
-1148,12
+1148,12
@@
public class HiddenColumnsTest
// [start,end] does not contain a start of a region
// no regions to iterate over
// [start,end] does not contain a start of a region
// no regions to iterate over
- it = h.getBoundedStartIterator(4, 5);
+ it = h.getStartRegionIterator(4, 5);
assertFalse(it.hasNext());
// [start,end] fully contains 1 region and start of last
// - 2 regions returned
assertFalse(it.hasNext());
// [start,end] fully contains 1 region and start of last
// - 2 regions returned
- it = h.getBoundedStartIterator(3, 7);
+ it = h.getStartRegionIterator(3, 7);
assertTrue(it.hasNext());
next = it.next();
assertEquals(3, next);
assertTrue(it.hasNext());
next = it.next();
assertEquals(3, next);
@@
-1163,7
+1163,7
@@
public class HiddenColumnsTest
// [start,end] contains whole of last region
// - 1 region returned
// [start,end] contains whole of last region
// - 1 region returned
- it = h.getBoundedStartIterator(4, 20);
+ it = h.getStartRegionIterator(4, 20);
assertTrue(it.hasNext());
next = it.next();
assertEquals(6, next);
assertTrue(it.hasNext());
next = it.next();
assertEquals(6, next);