JAL-2759 Updated test

[jalview.git] / test / jalview / datamodel / HiddenColumnsTest.java

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 462957b..3aadcb7 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -1160,7 +1160,7 @@ public class HiddenColumnsTest
   }
 
   @Test(groups = "Functional")
-  public void testHideColumns_BitSet()
+  public void testHideColumns_BitSet_range()
   {
     HiddenColumns h = new HiddenColumns();
     HiddenColumns h2 = new HiddenColumns();
@@ -1169,16 +1169,34 @@ public class HiddenColumnsTest
     h.hideColumns(tohide);
     assertTrue(h.equals(h2));
 
-    // NB in hideMarkedBits, the last bit is not set to hidden
+    // when setting bitset, first param is invlusive, second exclusive
     tohide.set(3, 6);
     tohide.set(9);
-    tohide.set(19, 21);
-    h.hideColumns(tohide);
+    tohide.set(15, 21);
+    h.hideColumns(tohide, 5, 23);
 
-    h2.hideColumns(3, 5);
+    h2.hideColumns(5, 5);
     h2.hideColumns(9, 9);
-    h2.hideColumns(19, 20);
+    h2.hideColumns(15, 20);
+    assertTrue(h.equals(h2));
+
+    tohide.clear();
+    tohide.set(41);
+    h.hideColumns(tohide, 23, 30);
+    assertTrue(h.equals(h2));
+
+    tohide.set(41);
+    h.hideColumns(tohide, 30, 45);
+    h2.hideColumns(41, 41);
     assertTrue(h.equals(h2));
+
+    tohide.clear();
+    tohide.set(25, 28);
+    h.hideColumns(tohide, 17, 50);
+    h2 = new HiddenColumns();
+    h2.hideColumns(17, 20);
+    h2.hideColumns(25, 27);
+    h2.hideColumns(41, 41);
   }
 
   @Test(groups = "Functional")