JAL-2388 Remove OverviewDimensions dependency on gui classes

[jalview.git] / test / jalview / viewmodel / OverviewDimensionsTest.java

diff --git a/test/jalview/viewmodel/OverviewDimensionsTest.java b/test/jalview/viewmodel/OverviewDimensionsTest.java
index d470c35..be8154c 100644 (file)
--- a/test/jalview/viewmodel/OverviewDimensionsTest.java
+++ b/test/jalview/viewmodel/OverviewDimensionsTest.java
@@ -121,7 +121,7 @@ public class OverviewDimensionsTest {
     
     av = af.getViewport();
 
-    od = new OverviewDimensions(av, true);
+    od = new OverviewDimensions(av.getPosProps(), true);
 
     while (av.isCalcInProgress())
     {
@@ -135,7 +135,8 @@ public class OverviewDimensionsTest {
     }
 
     // Initial box sizing - default path through code
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
 
     init();
   }
@@ -167,6 +168,7 @@ public class OverviewDimensionsTest {
     viewWidth = av.getEndRes() - av.getStartRes();
 
     // wait for gui to get set up
+    // this does actually appear to be necessary
     while (viewHeight != 17 || viewWidth != 62)
     {
       try
@@ -232,7 +234,7 @@ public class OverviewDimensionsTest {
     al1.setDataset(null);
     AlignViewport av1 = new AlignViewport(al1);
 
-    OverviewDimensions od = new OverviewDimensions(av1, true);
+    OverviewDimensions od = new OverviewDimensions(av1.getPosProps(), true);
     int scaledHeight = 266;
     assertEquals(od.getGraphHeight(), defaultGraphHeight);
     assertEquals(od.getSequencesHeight(), scaledHeight);
@@ -245,7 +247,7 @@ public class OverviewDimensionsTest {
     al2.setDataset(null);
     AlignViewport av2 = new AlignViewport(al2);
 
-    od = new OverviewDimensions(av2, true);
+    od = new OverviewDimensions(av2.getPosProps(), true);
     int scaledWidth = 300;
     assertEquals(od.getGraphHeight(), defaultGraphHeight);
     assertEquals(od.getSequencesHeight(), maxSeqHeight);
@@ -259,7 +261,7 @@ public class OverviewDimensionsTest {
     al3.setDataset(null);
     AlignViewport av3 = new AlignViewport(al3);
 
-    od = new OverviewDimensions(av3, true);
+    od = new OverviewDimensions(av3.getPosProps(), true);
     assertEquals(od.getGraphHeight(), defaultGraphHeight);
     assertEquals(od.getSequencesHeight(), minSeqHeight);
     assertEquals(od.getWidth(), maxWidth);
@@ -272,7 +274,7 @@ public class OverviewDimensionsTest {
     al4.setDataset(null);
     AlignViewport av4 = new AlignViewport(al4);
 
-    od = new OverviewDimensions(av4, true);
+    od = new OverviewDimensions(av4.getPosProps(), true);
     assertEquals(od.getGraphHeight(), defaultGraphHeight);
     assertEquals(od.getSequencesHeight(), maxSeqHeight);
     assertEquals(od.getWidth(), minWidth);
@@ -282,7 +284,7 @@ public class OverviewDimensionsTest {
     al5.setDataset(null);
     AlignViewport av5 = new AlignViewport(al5);
 
-    od = new OverviewDimensions(av5, false);
+    od = new OverviewDimensions(av5.getPosProps(), false);
     assertEquals(od.getGraphHeight(), 0);
     assertEquals(od.getSequencesHeight(), maxSeqHeight);
     assertEquals(od.getWidth(), minWidth);
@@ -302,7 +304,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testSetBoxFromMouseClick()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -396,7 +400,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testFromMouseWithHiddenColsAtStart()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -408,7 +414,8 @@ public class OverviewDimensionsTest {
     int lastHiddenCol = 30;
     hideColumns(0, lastHiddenCol);
 
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(),
             Math.round((float) (lastHiddenCol + 1) * od.getWidth()
                     / alwidth));
@@ -460,7 +467,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testFromMouseWithHiddenColsInMiddle()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -472,7 +481,8 @@ public class OverviewDimensionsTest {
     int lastHidden = 73;
     hideColumns(firstHidden, lastHidden);
 
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -565,7 +575,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testFromMouseWithHiddenColsAtEnd()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -576,7 +588,8 @@ public class OverviewDimensionsTest {
     int firstHidden = 140;
     int lastHidden = 157;
     hideColumns(firstHidden, lastHidden);
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -909,7 +922,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testFromMouseWithHiddenRowsAtStart()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxHeight(), boxHeight);
@@ -922,7 +937,8 @@ public class OverviewDimensionsTest {
     int lastHiddenRow = 30;
     hideSequences(0, lastHiddenRow + 1, lastHiddenRow + 1);
 
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(),
             Math.round((float) (lastHiddenRow + 1)
@@ -955,7 +971,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testFromMouseWithHiddenRowsInMiddle()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
 
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
@@ -970,7 +988,8 @@ public class OverviewDimensionsTest {
     int lastHiddenRow = 60;
     hideSequences(firstHiddenRow, lastHiddenRow + 1, lastHiddenRow + 1);
 
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
 
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
@@ -1015,7 +1034,9 @@ public class OverviewDimensionsTest {
   @Test(groups = { "Functional" })
   public void testFromMouseWithHiddenRowsAtEnd()
   {
-    od.updateViewportFromMouse(0, 0);
+    od.updateViewportFromMouse(0, 0,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -1029,7 +1050,8 @@ public class OverviewDimensionsTest {
     int lastHidden = 524;
     hideSequences(firstHidden - 1, lastHidden, firstHidden - 1);
 
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
     assertEquals(od.getBoxX(), 0);
     assertEquals(od.getBoxY(), 0);
     assertEquals(od.getBoxWidth(), boxWidth);
@@ -1079,7 +1101,8 @@ public class OverviewDimensionsTest {
   {
     av.setStartRes(startRes);
     av.setEndRes(startRes + viewWidth);
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
   }
 
   /*
@@ -1089,7 +1112,8 @@ public class OverviewDimensionsTest {
   {
     av.setStartSeq(startSeq);
     av.setEndSeq(startSeq + viewHeight);
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
   }
 
   /*
@@ -1101,7 +1125,8 @@ public class OverviewDimensionsTest {
     av.setEndRes(startRes + viewWidth);
     av.setStartSeq(startSeq);
     av.setEndSeq(startSeq + viewHeight);
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
   }
 
   /*
@@ -1109,7 +1134,9 @@ public class OverviewDimensionsTest {
    */
   private void mouseClick(OverviewDimensions od, int x, int y)
   {
-    od.updateViewportFromMouse(x, y);
+    od.updateViewportFromMouse(x, y,
+            av.getAlignment().getHiddenSequences(),
+            av.getColumnSelection(), av.getPosProps());
     // updates require an OverviewPanel to exist which it doesn't here
     // so call setBoxPosition() as it would be called by the AlignmentPanel
     // normally
@@ -1119,7 +1146,8 @@ public class OverviewDimensionsTest {
     av.setEndRes(od.getScrollCol() + viewWidth);
     av.setStartSeq(od.getScrollRow());
     av.setEndSeq(od.getScrollRow() + viewHeight);
-    od.setBoxPosition();
+    od.setBoxPosition(av.getAlignment()
+            .getHiddenSequences(), av.getColumnSelection(), av.getPosProps());
   }
   
   private void testBoxIsAtClickPoint(int xpos, int ypos)