JAL-2591 Further refactoring (still incomplete)

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

diff --git a/test/jalview/datamodel/HiddenColumnsTest.java b/test/jalview/datamodel/HiddenColumnsTest.java
index 5b92677..62c2d22 100644 (file)
--- a/test/jalview/datamodel/HiddenColumnsTest.java
+++ b/test/jalview/datamodel/HiddenColumnsTest.java
@@ -20,6 +20,7 @@
  */
 package jalview.datamodel;
 
+import static org.testng.Assert.assertNull;
 import static org.testng.AssertJUnit.assertEquals;
 import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.AssertJUnit.assertSame;
@@ -590,11 +591,15 @@ public class HiddenColumnsTest
   public void testFindHiddenRegionPositions()
   {
     HiddenColumns hc = new HiddenColumns();
+
+    List<Integer> positions = hc.findHiddenRegionPositions();
+    assertTrue(positions.isEmpty());
+
     hc.hideColumns(3, 7);
     hc.hideColumns(10, 10);
     hc.hideColumns(14, 15);
 
-    List<Integer> positions = hc.findHiddenRegionPositions();
+    positions = hc.findHiddenRegionPositions();
     assertEquals(3, positions.size());
     assertEquals(3, positions.get(0).intValue());
     assertEquals(5, positions.get(1).intValue());
@@ -605,11 +610,15 @@ public class HiddenColumnsTest
   public void testRegionsToString()
   {
     HiddenColumns hc = new HiddenColumns();
+
+    String result = hc.regionsToString(",", "--");
+    assertEquals("", result);
+
     hc.hideColumns(3, 7);
     hc.hideColumns(10, 10);
     hc.hideColumns(14, 15);
 
-    String result = hc.regionsToString(",", "--");
+    result = hc.regionsToString(",", "--");
     assertEquals("3--7,10--10,14--15", result);
   }
 
@@ -642,4 +651,28 @@ public class HiddenColumnsTest
     assertEquals(23, startEnd[1]);
   }
 
+  @Test(groups = "Functional")
+  public void testGetRegionWithEdgeAtRes()
+  {
+    HiddenColumns hc = new HiddenColumns();
+
+    int[] result = hc.getRegionWithEdgeAtRes(5);
+    assertNull(result);
+
+    hc.hideColumns(3, 7);
+    hc.hideColumns(10, 10);
+    hc.hideColumns(14, 15);
+
+    result = hc.getRegionWithEdgeAtRes(3);
+    assertEquals(3, result[0]);
+    assertEquals(7, result[1]);
+
+    result = hc.getRegionWithEdgeAtRes(5);
+    assertEquals(10, result[0]);
+    assertEquals(10, result[1]);
+
+    result = hc.getRegionWithEdgeAtRes(6);
+    assertNull(result);
+  }
+
 }