bamboo tests

diff --git a/test/jalview/gui/AlignFrameTest.java b/test/jalview/gui/AlignFrameTest.java
index b972c48..8b975bd 100644 (file)
--- a/test/jalview/gui/AlignFrameTest.java
+++ b/test/jalview/gui/AlignFrameTest.java
@@ -66,6 +66,7 @@ public class AlignFrameTest
   {
     JvOptionPane.setInteractiveMode(false);
     JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+    Jalview.setSynchronous(true);
   }
 
   @Test(groups = "Functional")

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index abcdc35..d5776be 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -27,6 +27,7 @@ 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;
@@ -83,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
@@ -222,10 +222,7 @@ public class SeqCanvasTest
     canvasWidth += 2;
     wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
             canvasHeight);
-    Assert.assertTrue(wrappedWidth == 24 || wrappedWidth == 25,
-            "WrappedWidth [" + wrappedWidth + "] should be 24 or 25"); // 2px
-                                                                       // not
-                                                                       // enough
+    assertEquals(wrappedWidth, Platform.isMac() ? 24 : 25); // 2px not enough
     canvasWidth += 1;
     wrappedWidth = testee.calculateWrappedGeometry(canvasWidth,
             canvasHeight);
@@ -279,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();
 
@@ -378,16 +356,12 @@ 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();
@@ -399,12 +373,9 @@ public class SeqCanvasTest
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);
 
-    ss += " 5:" + av.getRanges();
-
+    assertEquals(av.getRanges().getEndSeq(), 3); // unchanged
     int repeatingHeight = (int) PA.getValue(testee,
             "wrappedRepeatHeightPx");
-    assertEquals(av.getRanges().getEndSeq(), 3,
-            "endSeq should be 3; av.getRanges=" + ss); // unchanged
     assertEquals(repeatingHeight, charHeight * (2 + al.getHeight()));
   }
 }