X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FHiddenSequencesTest.java;h=779598808f8622ef88748c6e4006c20770d1686b;hb=6d183feafe3e566501af586286bbd1d2107ee5a9;hp=a55645856028d715c091b197913388c6fa61b743;hpb=97b26ba418dec7a6e926378205d25470bf098633;p=jalview.git diff --git a/test/jalview/datamodel/HiddenSequencesTest.java b/test/jalview/datamodel/HiddenSequencesTest.java index a556458..7795988 100644 --- a/test/jalview/datamodel/HiddenSequencesTest.java +++ b/test/jalview/datamodel/HiddenSequencesTest.java @@ -219,15 +219,15 @@ public class HiddenSequencesTest // test that without hidden rows, findIndexNFromRow returns // position n above provided position - int pos = hs.findIndexNAboveRow(3, 10); + int pos = hs.subtractVisibleRows(3, 10); assertEquals(7, pos); // 0 returns same position - pos = hs.findIndexNAboveRow(0, 10); + pos = hs.subtractVisibleRows(0, 10); assertEquals(10, pos); // overflow to top returns negative number - pos = hs.findIndexNAboveRow(3, 0); + pos = hs.subtractVisibleRows(3, 0); assertEquals(-3, pos); // test that with hidden rows above result row @@ -237,11 +237,11 @@ public class HiddenSequencesTest hs.hideSequence(seqs[3]); // position n above provided position - pos = hs.findIndexNAboveRow(3, 10); + pos = hs.subtractVisibleRows(3, 10); assertEquals(7, pos); // 0 returns same position - pos = hs.findIndexNAboveRow(0, 10); + pos = hs.subtractVisibleRows(0, 10); assertEquals(10, pos); // test with one set of hidden rows between start and required position @@ -249,13 +249,13 @@ public class HiddenSequencesTest hs.hideSequence(seqs[13]); hs.hideSequence(seqs[14]); hs.hideSequence(seqs[15]); - pos = hs.findIndexNAboveRow(8, 17); + pos = hs.subtractVisibleRows(8, 17); assertEquals(5, pos); // test with two sets of hidden rows between start and required position hs.hideSequence(seqs[20]); hs.hideSequence(seqs[21]); - pos = hs.findIndexNAboveRow(8, 23); + pos = hs.subtractVisibleRows(8, 23); assertEquals(9, pos); // repeat last 2 tests with no hidden columns to left of required position @@ -266,13 +266,13 @@ public class HiddenSequencesTest hs.hideSequence(seqs[13]); hs.hideSequence(seqs[14]); hs.hideSequence(seqs[15]); - pos = hs.findIndexNAboveRow(8, 17); + pos = hs.subtractVisibleRows(8, 17); assertEquals(5, pos); // test with two sets of hidden rows between start and required position hs.hideSequence(seqs[20]); hs.hideSequence(seqs[21]); - pos = hs.findIndexNAboveRow(8, 23); + pos = hs.subtractVisibleRows(8, 23); assertEquals(9, pos); }