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-2388 Renamed column and row subtraction functions
[jalview.git]
/
test
/
jalview
/
datamodel
/
ColumnSelectionTest.java
diff --git
a/test/jalview/datamodel/ColumnSelectionTest.java
b/test/jalview/datamodel/ColumnSelectionTest.java
index
49f29d7
..
4d3f611
100644
(file)
--- a/
test/jalview/datamodel/ColumnSelectionTest.java
+++ b/
test/jalview/datamodel/ColumnSelectionTest.java
@@
-150,15
+150,15
@@
public class ColumnSelectionTest
// test that without hidden columns, findColumnNToLeft returns
// position n to left of provided position
// test that without hidden columns, findColumnNToLeft returns
// position n to left of provided position
- int pos = cs.findColumnNToLeft(3, 10);
+ int pos = cs.subtractVisibleColumns(3, 10);
assertEquals(7, pos);
// 0 returns same position
assertEquals(7, pos);
// 0 returns same position
- pos = cs.findColumnNToLeft(0, 10);
+ pos = cs.subtractVisibleColumns(0, 10);
assertEquals(10, pos);
// overflow to left returns negative number
assertEquals(10, pos);
// overflow to left returns negative number
- pos = cs.findColumnNToLeft(3, 0);
+ pos = cs.subtractVisibleColumns(3, 0);
assertEquals(-3, pos);
// test that with hidden columns to left of result column
assertEquals(-3, pos);
// test that with hidden columns to left of result column
@@
-166,21
+166,21
@@
public class ColumnSelectionTest
cs.hideColumns(1, 3);
// position n to left of provided position
cs.hideColumns(1, 3);
// position n to left of provided position
- pos = cs.findColumnNToLeft(3, 10);
+ pos = cs.subtractVisibleColumns(3, 10);
assertEquals(7, pos);
// 0 returns same position
assertEquals(7, pos);
// 0 returns same position
- pos = cs.findColumnNToLeft(0, 10);
+ pos = cs.subtractVisibleColumns(0, 10);
assertEquals(10, pos);
// test with one set of hidden columns between start and required position
cs.hideColumns(12, 15);
assertEquals(10, pos);
// test with one set of hidden columns between start and required position
cs.hideColumns(12, 15);
- pos = cs.findColumnNToLeft(8, 17);
+ pos = cs.subtractVisibleColumns(8, 17);
assertEquals(5, pos);
// test with two sets of hidden columns between start and required position
cs.hideColumns(20, 21);
assertEquals(5, pos);
// test with two sets of hidden columns between start and required position
cs.hideColumns(20, 21);
- pos = cs.findColumnNToLeft(8, 23);
+ pos = cs.subtractVisibleColumns(8, 23);
assertEquals(9, pos);
// repeat last 2 tests with no hidden columns to left of required position
assertEquals(9, pos);
// repeat last 2 tests with no hidden columns to left of required position
@@
-188,12
+188,12
@@
public class ColumnSelectionTest
// test with one set of hidden columns between start and required position
cs.hideColumns(12, 15);
// test with one set of hidden columns between start and required position
cs.hideColumns(12, 15);
- pos = cs.findColumnNToLeft(8, 17);
+ pos = cs.subtractVisibleColumns(8, 17);
assertEquals(5, pos);
// test with two sets of hidden columns between start and required position
cs.hideColumns(20, 21);
assertEquals(5, pos);
// test with two sets of hidden columns between start and required position
cs.hideColumns(20, 21);
- pos = cs.findColumnNToLeft(8, 23);
+ pos = cs.subtractVisibleColumns(8, 23);
assertEquals(9, pos);
}
assertEquals(9, pos);
}