X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FHiddenColumnsCursorTest.java;h=cfd2814cd7c93e49bf442113249dbadae9ba6494;hb=a0ccef9cc78fffa7be85f3b658a5768958a301ce;hp=3b1bc5536e3949a6abb75ab18506e382e7949daa;hpb=ecdbc96815298ac853543640881ef8d2384b48a1;p=jalview.git diff --git a/test/jalview/datamodel/HiddenColumnsCursorTest.java b/test/jalview/datamodel/HiddenColumnsCursorTest.java index 3b1bc55..cfd2814 100644 --- a/test/jalview/datamodel/HiddenColumnsCursorTest.java +++ b/test/jalview/datamodel/HiddenColumnsCursorTest.java @@ -30,6 +30,31 @@ import org.testng.annotations.Test; public class HiddenColumnsCursorTest { + + @Test(groups = { "Functional" }) + public void testConstructor() + { + HiddenColumnsCursor cursor = new HiddenColumnsCursor(); + assertNull(cursor.findRegionForColumn(0, false)); + + List hlist = new ArrayList<>(); + cursor = new HiddenColumnsCursor(hlist); + assertNull(cursor.findRegionForColumn(0, false)); + + cursor = new HiddenColumnsCursor(hlist, 3, 12); + assertNull(cursor.findRegionForColumn(0, false)); + + hlist.add(new int[] { 3, 7 }); + hlist.add(new int[] { 15, 25 }); + cursor = new HiddenColumnsCursor(hlist); + HiddenCursorPosition p = cursor.findRegionForColumn(8, false); + assertEquals(1, p.getRegionIndex()); + + cursor = new HiddenColumnsCursor(hlist, 1, 5); + p = cursor.findRegionForColumn(8, false); + assertEquals(1, p.getRegionIndex()); + } + /** * Test the method which finds the corresponding region given a column */ @@ -37,17 +62,18 @@ public class HiddenColumnsCursorTest public void testFindRegionForColumn() { HiddenColumnsCursor cursor = new HiddenColumnsCursor(); - + HiddenCursorPosition pos = cursor.findRegionForColumn(20, false); assertNull(pos); - + List hidden = new ArrayList<>(); hidden.add(new int[] { 53, 76 }); hidden.add(new int[] { 104, 125 }); cursor = new HiddenColumnsCursor(hidden); - int regionIndex = cursor.findRegionForColumn(126, false).getRegionIndex(); + int regionIndex = cursor.findRegionForColumn(126, false) + .getRegionIndex(); assertEquals(2, regionIndex); regionIndex = cursor.findRegionForColumn(125, false).getRegionIndex(); @@ -92,7 +118,7 @@ public class HiddenColumnsCursorTest * Test the method which counts the number of hidden columns before a column */ @Test(groups = { "Functional" }) - public void testGetHiddenOffset() + public void testFindRegionForColumn_Visible() { HiddenColumnsCursor cursor = new HiddenColumnsCursor(); @@ -129,5 +155,4 @@ public class HiddenColumnsCursorTest offset = cursor.findRegionForColumn(80, true).getHiddenSoFar(); assertEquals(46, offset); } - }