JAL-2388 Working hidden regions hide/show in desktop

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 5eaecd3..b767cf7 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -45,6 +45,29 @@ public class HiddenColumnsTest
   }
 
   /**
+   * Test the method which counts the number of hidden columns
+   */
+  @Test(groups = { "Functional" })
+  public void testGetSize()
+  {
+    HiddenColumns hidden = new HiddenColumns();
+    assertEquals(0, hidden.getSize());
+
+    hidden.hideColumns(3, 5);
+    assertEquals(3, hidden.getSize());
+
+    hidden.hideColumns(8, 8);
+    assertEquals(4, hidden.getSize());
+
+    hidden.hideColumns(9, 14);
+    assertEquals(10, hidden.getSize());
+
+    ColumnSelection cs = new ColumnSelection();
+    hidden.revealAllHiddenColumns(cs);
+    assertEquals(0, hidden.getSize());
+  }
+
+  /**
    * Test the method that finds the visible column position of an alignment
    * column, allowing for hidden columns.
    */
@@ -207,14 +230,14 @@ public class HiddenColumnsTest
     HiddenColumns cs = new HiddenColumns();
     cs.hideColumns(10, 11);
     cs.hideColumns(5, 7);
-    assertEquals("[5, 7]", Arrays.toString(cs.getListOfCols().get(0)));
+    assertEquals("[5, 7]", Arrays.toString(cs.getHiddenRegions().get(0)));
 
     HiddenColumns cs2 = new HiddenColumns(cs);
     assertTrue(cs2.hasHiddenColumns());
-    assertEquals(2, cs2.getListOfCols().size());
+    assertEquals(2, cs2.getHiddenRegions().size());
     // hidden columns are held in column order
-    assertEquals("[5, 7]", Arrays.toString(cs2.getListOfCols().get(0)));
-    assertEquals("[10, 11]", Arrays.toString(cs2.getListOfCols().get(1)));
+    assertEquals("[5, 7]", Arrays.toString(cs2.getHiddenRegions().get(0)));
+    assertEquals("[10, 11]", Arrays.toString(cs2.getHiddenRegions().get(1)));
   }
 
   /**
@@ -311,51 +334,51 @@ public class HiddenColumnsTest
     ColumnSelection colsel = new ColumnSelection();
     HiddenColumns cs = al.getHiddenColumns();
     colsel.hideSelectedColumns(5, al.getHiddenColumns());
-    List<int[]> hidden = cs.getListOfCols();
+    List<int[]> hidden = cs.getHiddenRegions();
     assertEquals(1, hidden.size());
     assertEquals("[5, 5]", Arrays.toString(hidden.get(0)));
 
     colsel.hideSelectedColumns(3, al.getHiddenColumns());
     assertEquals(2, hidden.size());
     // two hidden ranges, in order:
-    assertSame(hidden, cs.getListOfCols());
+    assertSame(hidden, cs.getHiddenRegions());
     assertEquals("[3, 3]", Arrays.toString(hidden.get(0)));
     assertEquals("[5, 5]", Arrays.toString(hidden.get(1)));
 
     // hiding column 4 expands [3, 3] to [3, 4]
     // and merges to [5, 5] to make [3, 5]
     colsel.hideSelectedColumns(4, al.getHiddenColumns());
-    hidden = cs.getListOfCols();
+    hidden = cs.getHiddenRegions();
     assertEquals(1, hidden.size());
     assertEquals("[3, 5]", Arrays.toString(hidden.get(0)));
 
     // clear hidden columns (note they are added to selected)
     cs.revealAllHiddenColumns(colsel);
     // it is now actually null but getter returns an empty list
-    assertTrue(cs.getListOfCols().isEmpty());
+    assertTrue(cs.getHiddenRegions().isEmpty());
 
     cs.hideColumns(3, 6);
-    hidden = cs.getListOfCols();
+    hidden = cs.getHiddenRegions();
     int[] firstHiddenRange = hidden.get(0);
     assertEquals("[3, 6]", Arrays.toString(firstHiddenRange));
 
     // adding a subrange of already hidden should do nothing
     cs.hideColumns(4, 5);
     assertEquals(1, hidden.size());
-    assertSame(firstHiddenRange, cs.getListOfCols().get(0));
+    assertSame(firstHiddenRange, cs.getHiddenRegions().get(0));
     cs.hideColumns(3, 5);
     assertEquals(1, hidden.size());
-    assertSame(firstHiddenRange, cs.getListOfCols().get(0));
+    assertSame(firstHiddenRange, cs.getHiddenRegions().get(0));
     cs.hideColumns(4, 6);
     assertEquals(1, hidden.size());
-    assertSame(firstHiddenRange, cs.getListOfCols().get(0));
+    assertSame(firstHiddenRange, cs.getHiddenRegions().get(0));
     cs.hideColumns(3, 6);
     assertEquals(1, hidden.size());
-    assertSame(firstHiddenRange, cs.getListOfCols().get(0));
+    assertSame(firstHiddenRange, cs.getHiddenRegions().get(0));
 
     cs.revealAllHiddenColumns(colsel);
     cs.hideColumns(2, 4);
-    hidden = cs.getListOfCols();
+    hidden = cs.getHiddenRegions();
     assertEquals(1, hidden.size());
     assertEquals("[2, 4]", Arrays.toString(hidden.get(0)));
 
@@ -388,7 +411,7 @@ public class HiddenColumnsTest
     colsel.addElement(10);
     cs.revealHiddenColumns(5, colsel);
     // hidden columns list now null but getter returns empty list:
-    assertTrue(cs.getListOfCols().isEmpty());
+    assertTrue(cs.getHiddenRegions().isEmpty());
     // revealed columns are marked as selected (added to selection):
     assertEquals("[10, 5, 6, 7, 8]", colsel.getSelected().toString());
 
@@ -396,9 +419,9 @@ public class HiddenColumnsTest
     colsel = new ColumnSelection();
     cs = new HiddenColumns();
     cs.hideColumns(5, 8);
-    List<int[]> hidden = cs.getListOfCols();
+    List<int[]> hidden = cs.getHiddenRegions();
     cs.revealHiddenColumns(6, colsel);
-    assertSame(hidden, cs.getListOfCols());
+    assertSame(hidden, cs.getHiddenRegions());
     assertTrue(colsel.getSelected().isEmpty());
   }
 
@@ -417,7 +440,7 @@ public class HiddenColumnsTest
      * revealing hidden columns adds them (in order) to the (unordered)
      * selection list
      */
-    assertTrue(cs.getListOfCols().isEmpty());
+    assertTrue(cs.getHiddenRegions().isEmpty());
     assertEquals("[11, 1, 2, 3, 5, 6, 7, 8]", colsel.getSelected()
             .toString());
   }
@@ -453,13 +476,13 @@ public class HiddenColumnsTest
     HiddenColumns cs = new HiddenColumns();
     cs.hideColumns(49, 59);
     cs.hideColumns(69, 79);
-    List<int[]> hidden = cs.getListOfCols();
+    List<int[]> hidden = cs.getHiddenRegions();
     assertEquals(2, hidden.size());
     assertEquals("[49, 59]", Arrays.toString(hidden.get(0)));
     assertEquals("[69, 79]", Arrays.toString(hidden.get(1)));
 
     cs.hideColumns(48, 80);
-    hidden = cs.getListOfCols();
+    hidden = cs.getHiddenRegions();
     assertEquals(1, hidden.size());
     assertEquals("[48, 80]", Arrays.toString(hidden.get(0)));
 
@@ -472,7 +495,7 @@ public class HiddenColumnsTest
     cs.hideColumns(50, 60);
     // hiding 21-49 should merge to one range
     cs.hideColumns(21, 49);
-    hidden = cs.getListOfCols();
+    hidden = cs.getHiddenRegions();
     assertEquals(1, hidden.size());
     assertEquals("[10, 60]", Arrays.toString(hidden.get(0)));
 
@@ -488,7 +511,7 @@ public class HiddenColumnsTest
     cs.hideColumns(60, 70);
 
     cs.hideColumns(15, 45);
-    hidden = cs.getListOfCols();
+    hidden = cs.getHiddenRegions();
     assertEquals(2, hidden.size());
     assertEquals("[10, 50]", Arrays.toString(hidden.get(0)));
     assertEquals("[60, 70]", Arrays.toString(hidden.get(1)));