bamboo tests

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

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index bb3bc05..d5776be 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -23,6 +23,7 @@ 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;
@@ -43,6 +44,7 @@ public class SeqCanvasTest
   public void setUp()
   {
     Cache.initLogger();
+    Jalview.setSynchronous(true);
   }
 
   /**
@@ -82,8 +84,7 @@ public class SeqCanvasTest
     av.setScaleRightWrapped(true);
     FontMetrics fm = testee.getFontMetrics(av.getFont());
     int labelWidth = fm.stringWidth("000") + charWidth;
-    // BH 2020.03.22 It is not really necessary to be this detailed. Different
-    // OS-based UIs will
+    // BH 2020.03.22 It is not really necessary to be this detailed. Different OS-based UIs will
     // always have slightly different parameters. StringgWidths are not
     // necessarily linear sums of the letters involved.
     // for example, the calculation for JavaScript is a float that has to be
@@ -275,27 +276,8 @@ public class SeqCanvasTest
 
     FontMetrics fm = testee.getFontMetrics(av.getFont());
     int labelWidth = fm.stringWidth("000") + charWidth;
-    // BH 2020.03.22 It is not really necessary to be this detailed. Different
-    // OS-based UIs will
-    // always have slightly different parameters. StringgWidths are not
-    // necessarily linear sums of the letters involved.
-    // for example, the calculation for JavaScript is a float that has to be
-    // rounded.
-    // ..............................mac................PC................linux?
-    Assert.assertTrue(
-            labelWidth == 39 || labelWidth == 35 || labelWidth == 36);// 3 * 9 +
-                                                                      // charWidth
-                                                                      // ||
-                                                                      // labelWidth
-                                                                      // == 3 *
-                                                                      // 8 +
-                                                                      // charWidth,
-                                                                      // "labelWidth
-                                                                      // 36 or
-                                                                      // 39");
-    // int labelWidth = fm.stringWidth("000") + charWidth;
-    // assertEquals(labelWidth,
-    // Platform.isMac() ? 3 * 9 + charWidth : 3 * 8 + charWidth);
+    assertEquals(labelWidth,
+            Platform.isMac() ? 3 * 9 + charWidth : 3 * 8 + charWidth);
 
     int annotationHeight = testee.getAnnotationHeight();
 
@@ -390,13 +372,10 @@ public class SeqCanvasTest
     int canvasWidth = 400;
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
+
+    assertEquals(av.getRanges().getEndSeq(), 3); // unchanged
     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
     assertEquals(repeatingHeight, charHeight * (2 + al.getHeight()));
   }
 }