JAL-2388 Hidden cols separated from column selection (almost complete)

[jalview.git] / test / jalview / util / MappingUtilsTest.java

diff --git a/test/jalview/util/MappingUtilsTest.java b/test/jalview/util/MappingUtilsTest.java
index b84e770..78a867e 100644 (file)
--- a/test/jalview/util/MappingUtilsTest.java
+++ b/test/jalview/util/MappingUtilsTest.java
@@ -887,11 +887,11 @@ public class MappingUtilsTest
      * Column 0 in protein picks up Seq2/L, Seq3/G which map to cols 0-4 and 0-3
      * in dna respectively, overall 0-4
      */
-    proteinSelection.hideColumns(0);
+    proteinSelection.hideSelectedColumns(0);
     ColumnSelection dnaSelection = MappingUtils.mapColumnSelection(
             proteinSelection, proteinView, dnaView);
     assertEquals("[]", dnaSelection.getSelected().toString());
-    List<int[]> hidden = dnaSelection.getHiddenColumns();
+    List<int[]> hidden = dnaSelection.getListOfCols();
     assertEquals(1, hidden.size());
     assertEquals("[0, 4]", Arrays.toString(hidden.get(0)));
 
@@ -903,10 +903,10 @@ public class MappingUtilsTest
     assertEquals("[0]", proteinSelection.getSelected().toString());
     // deselect these or hideColumns will be expanded to include 0
     proteinSelection.clear();
-    proteinSelection.hideColumns(1);
+    proteinSelection.hideSelectedColumns(1);
     dnaSelection = MappingUtils.mapColumnSelection(proteinSelection,
             proteinView, dnaView);
-    hidden = dnaSelection.getHiddenColumns();
+    hidden = dnaSelection.getListOfCols();
     assertEquals(1, hidden.size());
     assertEquals("[0, 3]", Arrays.toString(hidden.get(0)));
 
@@ -915,10 +915,10 @@ public class MappingUtilsTest
      */
     proteinSelection.revealAllHiddenColumns();
     proteinSelection.clear();
-    proteinSelection.hideColumns(2);
+    proteinSelection.hideSelectedColumns(2);
     dnaSelection = MappingUtils.mapColumnSelection(proteinSelection,
             proteinView, dnaView);
-    assertTrue(dnaSelection.getHiddenColumns().isEmpty());
+    assertTrue(dnaSelection.getListOfCols().isEmpty());
 
     /*
      * Column 3 in protein picks up Seq1/P, Seq2/Q, Seq3/S which map to columns
@@ -926,12 +926,12 @@ public class MappingUtilsTest
      */
     proteinSelection.revealAllHiddenColumns();
     proteinSelection.clear();
-    proteinSelection.hideColumns(3); // 5-10 hidden in dna
+    proteinSelection.hideSelectedColumns(3); // 5-10 hidden in dna
     proteinSelection.addElement(1); // 0-3 selected in dna
     dnaSelection = MappingUtils.mapColumnSelection(proteinSelection,
             proteinView, dnaView);
     assertEquals("[0, 1, 2, 3]", dnaSelection.getSelected().toString());
-    hidden = dnaSelection.getHiddenColumns();
+    hidden = dnaSelection.getListOfCols();
     assertEquals(1, hidden.size());
     assertEquals("[5, 10]", Arrays.toString(hidden.get(0)));
 
@@ -940,11 +940,11 @@ public class MappingUtilsTest
      */
     proteinSelection.revealAllHiddenColumns();
     proteinSelection.clear();
-    proteinSelection.hideColumns(1);
-    proteinSelection.hideColumns(3);
+    proteinSelection.hideSelectedColumns(1);
+    proteinSelection.hideSelectedColumns(3);
     dnaSelection = MappingUtils.mapColumnSelection(proteinSelection,
             proteinView, dnaView);
-    hidden = dnaSelection.getHiddenColumns();
+    hidden = dnaSelection.getListOfCols();
     assertEquals(2, hidden.size());
     assertEquals("[0, 3]", Arrays.toString(hidden.get(0)));
     assertEquals("[5, 10]", Arrays.toString(hidden.get(1)));