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-3725 restrict mapped virtual feature location to mapped region
[jalview.git]
/
test
/
jalview
/
datamodel
/
HiddenColumnsTest.java
diff --git
a/test/jalview/datamodel/HiddenColumnsTest.java
b/test/jalview/datamodel/HiddenColumnsTest.java
index
38536c8
..
2916199
100644
(file)
--- a/
test/jalview/datamodel/HiddenColumnsTest.java
+++ b/
test/jalview/datamodel/HiddenColumnsTest.java
@@
-739,7
+739,7
@@
public class HiddenColumnsTest
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")
- public void testGetHiddenBoundaryLeft()
+ public void testGetNextHiddenBoundary_Left()
{
HiddenColumns h = new HiddenColumns();
{
HiddenColumns h = new HiddenColumns();
@@
-757,7
+757,7
@@
public class HiddenColumnsTest
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")
- public void testGetNextHiddenBoundary()
+ public void testGetNextHiddenBoundary_Right()
{
HiddenColumns h = new HiddenColumns();
{
HiddenColumns h = new HiddenColumns();
@@
-868,7
+868,7
@@
public class HiddenColumnsTest
HiddenColumns h = new HiddenColumns();
HiddenColumns h2 = new HiddenColumns();
HiddenColumns h = new HiddenColumns();
HiddenColumns h2 = new HiddenColumns();
- BitSet tohide = new BitSet(21);
+ BitSet tohide = new BitSet(25);
h.hideColumns(tohide);
assertTrue(h.equals(h2));
h.hideColumns(tohide);
assertTrue(h.equals(h2));
@@
-876,7
+876,7
@@
public class HiddenColumnsTest
tohide.set(3, 6);
tohide.set(9);
tohide.set(15, 21);
tohide.set(3, 6);
tohide.set(9);
tohide.set(15, 21);
- h.hideColumns(tohide, 5, 23);
+ h.clearAndHideColumns(tohide, 5, 23);
h2.hideColumns(5, 5);
h2.hideColumns(9, 9);
h2.hideColumns(5, 5);
h2.hideColumns(9, 9);
@@
-886,19
+886,19
@@
public class HiddenColumnsTest
tohide.clear();
tohide.set(41);
tohide.clear();
tohide.set(41);
- h.hideColumns(tohide, 23, 30);
+ h.clearAndHideColumns(tohide, 23, 30);
assertTrue(h.equals(h2));
assertEquals(h.getSize(), h2.getSize());
tohide.set(41);
assertTrue(h.equals(h2));
assertEquals(h.getSize(), h2.getSize());
tohide.set(41);
- h.hideColumns(tohide, 30, 45);
+ h.clearAndHideColumns(tohide, 30, 45);
h2.hideColumns(41, 41);
assertTrue(h.equals(h2));
assertEquals(h.getSize(), h2.getSize());
tohide.clear();
tohide.set(25, 28);
h2.hideColumns(41, 41);
assertTrue(h.equals(h2));
assertEquals(h.getSize(), h2.getSize());
tohide.clear();
tohide.set(25, 28);
- h.hideColumns(tohide, 17, 50);
+ h.clearAndHideColumns(tohide, 17, 50);
h2 = new HiddenColumns();
h2.hideColumns(5, 5);
h2.hideColumns(9, 9);
h2 = new HiddenColumns();
h2.hideColumns(5, 5);
h2.hideColumns(9, 9);
@@
-915,7
+915,7
@@
public class HiddenColumnsTest
tohide = new BitSet();
// all unhidden if tohide is empty and range covers hidden
tohide = new BitSet();
// all unhidden if tohide is empty and range covers hidden
- hc.hideColumns(tohide, 1, 70);
+ hc.clearAndHideColumns(tohide, 1, 70);
assertTrue(!hc.hasHiddenColumns());
assertEquals(0, hc.getSize());
assertTrue(!hc.hasHiddenColumns());
assertEquals(0, hc.getSize());
@@
-925,12
+925,12
@@
public class HiddenColumnsTest
assertEquals(25, hc.getSize());
// but not if range does not cover hidden
assertEquals(25, hc.getSize());
// but not if range does not cover hidden
- hc.hideColumns(tohide, 23, 40);
+ hc.clearAndHideColumns(tohide, 23, 40);
assertTrue(hc.hasHiddenColumns());
assertEquals(25, hc.getSize());
// and partial unhide if range partially covers
assertTrue(hc.hasHiddenColumns());
assertEquals(25, hc.getSize());
// and partial unhide if range partially covers
- hc.hideColumns(tohide, 1, 17);
+ hc.clearAndHideColumns(tohide, 1, 17);
Iterator<int[]> it = hc.iterator();
assertTrue(it.hasNext());
int[] region = it.next();
Iterator<int[]> it = hc.iterator();
assertTrue(it.hasNext());
int[] region = it.next();
@@
-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);
@@
-1309,7
+1309,7
@@
public class HiddenColumnsTest
HiddenColumns h = new HiddenColumns();
Iterator<Integer> it = h.getVisibleColsIterator(0, 10);
HiddenColumns h = new HiddenColumns();
Iterator<Integer> it = h.getVisibleColsIterator(0, 10);
- assertTrue(it instanceof VisibleColsIterator);
+ assertTrue(it instanceof RangeElementsIterator);
}
@Test(groups = "Functional")
}
@Test(groups = "Functional")