JAL-2759 minor refactor to hiding bitsets

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 38536c8..1cc9a96 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -868,7 +868,7 @@ public class HiddenColumnsTest
     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));
 
@@ -876,7 +876,7 @@ public class HiddenColumnsTest
     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);
@@ -886,19 +886,19 @@ public class HiddenColumnsTest
 
     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);
-    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);
-    h.hideColumns(tohide, 17, 50);
+    h.clearAndHideColumns(tohide, 17, 50);
     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
-    hc.hideColumns(tohide, 1, 70);
+    hc.clearAndHideColumns(tohide, 1, 70);
     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
-    hc.hideColumns(tohide, 23, 40);
+    hc.clearAndHideColumns(tohide, 23, 40);
     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();