X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fviewmodel%2FOverviewDimensionsTest.java;h=dc414fb5aa3ba83be4e177d5bb790ff90553c361;hb=2feac6dabe64b144783f8538fab352e987eadcb6;hp=398fec302d0578a99b5edded73f9553a8698ee62;hpb=2ca081eebf90c6731cd79bde140ca2fecc9c9644;p=jalview.git diff --git a/test/jalview/viewmodel/OverviewDimensionsTest.java b/test/jalview/viewmodel/OverviewDimensionsTest.java index 398fec3..dc414fb 100644 --- a/test/jalview/viewmodel/OverviewDimensionsTest.java +++ b/test/jalview/viewmodel/OverviewDimensionsTest.java @@ -42,7 +42,7 @@ import org.testng.annotations.Test; public class OverviewDimensionsTest { AlignmentI al; - OverviewDimensions od; + OverviewDimensionsWithHidden od; // cached widths and heights int boxWidth; @@ -86,7 +86,7 @@ public class OverviewDimensionsTest ColumnSelection hiddenCols = new ColumnSelection(); - od = new OverviewDimensions(vpranges, true); + od = new OverviewDimensionsWithHidden(vpranges, true); // Initial box sizing - default path through code od.setBoxPosition(al.getHiddenSequences(), hiddenCols, vpranges); @@ -136,7 +136,7 @@ public class OverviewDimensionsTest Alignment al1 = new Alignment(seqs1); ViewportRanges props = new ViewportRanges(al1); - OverviewDimensions od = new OverviewDimensions(props, true); + OverviewDimensions od = new OverviewDimensionsWithHidden(props, true); int scaledHeight = 267; assertEquals(od.getGraphHeight(), defaultGraphHeight); assertEquals(od.getSequencesHeight(), scaledHeight); @@ -148,7 +148,7 @@ public class OverviewDimensionsTest Alignment al2 = new Alignment(seqs2); props = new ViewportRanges(al2); - od = new OverviewDimensions(props, true); + od = new OverviewDimensionsWithHidden(props, true); int scaledWidth = 300; assertEquals(od.getGraphHeight(), defaultGraphHeight); assertEquals(od.getSequencesHeight(), maxSeqHeight); @@ -161,7 +161,7 @@ public class OverviewDimensionsTest Alignment al3 = new Alignment(seqs3); props = new ViewportRanges(al3); - od = new OverviewDimensions(props, true); + od = new OverviewDimensionsWithHidden(props, true); assertEquals(od.getGraphHeight(), defaultGraphHeight); assertEquals(od.getSequencesHeight(), minSeqHeight); assertEquals(od.getWidth(), maxWidth); @@ -173,7 +173,7 @@ public class OverviewDimensionsTest Alignment al4 = new Alignment(seqs4); props = new ViewportRanges(al4); - od = new OverviewDimensions(props, true); + od = new OverviewDimensionsWithHidden(props, true); assertEquals(od.getGraphHeight(), defaultGraphHeight); assertEquals(od.getSequencesHeight(), maxSeqHeight); assertEquals(od.getWidth(), minWidth); @@ -182,7 +182,7 @@ public class OverviewDimensionsTest Alignment al5 = new Alignment(seqs4); props = new ViewportRanges(al5); - od = new OverviewDimensions(props, false); + od = new OverviewDimensionsWithHidden(props, false); assertEquals(od.getGraphHeight(), 0); assertEquals(od.getSequencesHeight(), maxSeqHeight); assertEquals(od.getWidth(), minWidth); @@ -988,7 +988,7 @@ public class OverviewDimensionsTest /* * Mouse click as position x,y in overview window */ - private void mouseClick(OverviewDimensions od, int x, int y) + private void mouseClick(OverviewDimensionsWithHidden od, int x, int y) { od.updateViewportFromMouse(x, y, al.getHiddenSequences(), hiddenCols, vpranges);