Bamboo text #35 - simpler logic; avoids impossible repaint, validation?

[jalview.git] / test / jalview / gui / SeqCanvasTest.java

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index 78f6cd3..0e14a6b 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -23,10 +23,12 @@ package jalview.gui;
 import static org.testng.Assert.assertEquals;
 
 import jalview.bin.Cache;
+import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentI;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
 import jalview.util.Platform;
+import jalview.viewmodel.ViewportRanges;
 
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -41,6 +43,7 @@ public class SeqCanvasTest
   @BeforeClass(alwaysRun = true)
   public void setUp()
   {
+    Jalview.setInteractive(false);
     Cache.initLogger();
   }
 
@@ -65,8 +68,8 @@ public class SeqCanvasTest
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
-    assertEquals(charHeight, Platform.isMac() ? 17 : 19);
-    assertEquals(charWidth, Platform.isMac() ? 12 : 11);
+    assertEquals(charHeight, !Platform.isWin() ? 17 : 19);
+    assertEquals(charWidth, !Platform.isWin() ? 12 : 11);
 
     /*
      * first with scales above, left, right
@@ -78,7 +81,7 @@ public class SeqCanvasTest
     FontMetrics fm = testee.getFontMetrics(av.getFont());
     int labelWidth = fm.stringWidth("000") + charWidth;
     assertEquals(labelWidth,
-            Platform.isMac() ? 3 * 9 + charWidth : 3 * 8 + charWidth);
+            !Platform.isWin() ? 3 * 9 + charWidth : 3 * 8 + charWidth);
 
     /*
      * width 400 pixels leaves (400 - 2*labelWidth) for residue columns
@@ -200,7 +203,7 @@ public class SeqCanvasTest
     canvasWidth += 2;
     wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
             canvasHeight);
-    assertEquals(wrappedWidth, Platform.isMac() ? 24 : 25); // 2px not enough
+    assertEquals(wrappedWidth, !Platform.isWin() ? 24 : 25); // 2px not enough
     canvasWidth += 1;
     wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
             canvasHeight);
@@ -235,8 +238,8 @@ public class SeqCanvasTest
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
 
-    assertEquals(charHeight, Platform.isMac() ? 17 : 19);
-    assertEquals(charWidth, Platform.isMac() ? 12 : 11);
+    assertEquals(charHeight, !Platform.isWin() ? 17 : 19);
+    assertEquals(charWidth, !Platform.isWin() ? 12 : 11);
 
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
   
@@ -251,7 +254,7 @@ public class SeqCanvasTest
     FontMetrics fm = testee.getFontMetrics(av.getFont());
     int labelWidth = fm.stringWidth("000") + charWidth;
     assertEquals(labelWidth,
-            Platform.isMac() ? 3 * 9 + charWidth : 3 * 8 + charWidth);
+            !Platform.isWin() ? 3 * 9 + charWidth : 3 * 8 + charWidth);
 
     int annotationHeight = testee.getAnnotationHeight();
 
@@ -330,24 +333,31 @@ public class SeqCanvasTest
     AlignmentI al = av.getAlignment();
     assertEquals(al.getWidth(), 157);
     assertEquals(al.getHeight(), 15);
-    av.getRanges().setStartEndSeq(0, 3);
+
+    ViewportRanges ranges = av.getRanges();
+    ranges.setStartEndSeq(0, 3);
+    System.out.println(ranges);
     av.setShowAnnotation(false);
     av.setScaleAboveWrapped(true);
 
+    System.out.println(ranges);
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
     av.setWrapAlignment(true);
+    System.out.println(ranges);
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
+    System.out.println(ranges);
     // Windows h=19, w=11.
-    assertEquals(charHeight, Platform.isMac() ? 17 : 19);
-    assertEquals(charWidth, Platform.isMac() ? 12 : 11);
-
+    assertEquals(charHeight, !Platform.isWin() ? 17 : 19);
+    assertEquals(charWidth, !Platform.isWin() ? 12 : 11);
+    System.out.println(ranges);
+    
     int canvasWidth = 400;
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
-
-    assertEquals(av.getRanges().getEndSeq(), 3); // unchanged
+    System.out.println(ranges);
+    assertEquals(ranges.getEndSeq(), 3); // unchanged
     int repeatingHeight = (int) PA.getValue(testee,
             "wrappedRepeatHeightPx");
     int h = charHeight * (2 + al.getHeight());