JAL-3563 Bamboo test with detail

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

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index bb3bc05..abcdc35 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -23,10 +23,10 @@ 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 java.awt.Font;
 import java.awt.FontMetrics;
@@ -43,6 +43,7 @@ public class SeqCanvasTest
   public void setUp()
   {
     Cache.initLogger();
+    Jalview.setSynchronous(true);
   }
 
   /**
@@ -221,7 +222,10 @@ public class SeqCanvasTest
     canvasWidth += 2;
     wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
             canvasHeight);
-    assertEquals(wrappedWidth, Platform.isMac() ? 24 : 25); // 2px not enough
+    Assert.assertTrue(wrappedWidth == 24 || wrappedWidth == 25,
+            "WrappedWidth [" + wrappedWidth + "] should be 24 or 25"); // 2px
+                                                                       // not
+                                                                       // enough
     canvasWidth += 1;
     wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
             canvasHeight);
@@ -374,12 +378,16 @@ public class SeqCanvasTest
     AlignmentI al = av.getAlignment();
     assertEquals(al.getWidth(), 157);
     assertEquals(al.getHeight(), 15);
+    String ss = "";
+    ss += " 1:" + av.getRanges();
     av.getRanges().setStartEndSeq(0, 3);
+    ss += " 2:" + av.getRanges();
     av.setShowAnnotation(false);
     av.setScaleAboveWrapped(true);
-
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
     av.setWrapAlignment(true);
+    ss += " 4:" + av.getRanges() + " canvasdim w,h=" + testee.getWidth()
+            + " " + testee.getHeight();
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
@@ -390,13 +398,13 @@ public class SeqCanvasTest
     int canvasWidth = 400;
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
+
+    ss += " 5:" + av.getRanges();
+
     int repeatingHeight = (int) PA.getValue(testee,
             "wrappedRepeatHeightPx");
-
     assertEquals(av.getRanges().getEndSeq(), 3,
-            "av.getRanges endseq=" + av.getRanges().getEndSeq() + " repht "
-                    + repeatingHeight + " x="
-                    + (charHeight * (2 + al.getHeight()))); // unchanged
+            "endSeq should be 3; av.getRanges=" + ss); // unchanged
     assertEquals(repeatingHeight, charHeight * (2 + al.getHeight()));
   }
 }