From: BobHanson <hansonr@stolaf.edu>
Date: Sun, 22 Mar 2020 23:05:55 +0000 (-0500)
Subject: JAL-3563 fix for SeqCanvasText
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=16510dd62787169c346dee30f0c3ad1ea40c1b6d

JAL-3563 fix for SeqCanvasText

not recognizing test server's UI nuance
---

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index 801c778..f9a80a1 100644
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -31,6 +31,7 @@ import jalview.util.Platform;
 import java.awt.Font;
 import java.awt.FontMetrics;
 
+import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
@@ -65,8 +66,12 @@ 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);
+    Assert.assertTrue(charHeight == 17 && charWidth == 12
+            || charHeight == 19 && charWidth == 11,
+            "char height/width " + charHeight + "/" + charWidth);
+    //
+    // assertEquals(charHeight, Platform.isMac() ? 17 : 19);
+    // assertEquals(charWidth, Platform.isMac() ? 12 : 11);
 
     /*
      * first with scales above, left, right
@@ -235,8 +240,12 @@ public class SeqCanvasTest
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
 
-    assertEquals(charHeight, Platform.isMac() ? 17 : 19);
-    assertEquals(charWidth, Platform.isMac() ? 12 : 11);
+    Assert.assertTrue(
+            charHeight == 17 && charWidth == 12
+                    || charHeight == 19 && charWidth == 11,
+            "char height/width " + charHeight + "/" + charWidth);
+    // assertEquals(charHeight, Platform.isMac() ? 17 : 19);
+    // assertEquals(charWidth, Platform.isMac() ? 12 : 11);
 
     SeqCanvas testee = af.alignPanel.getSeqPanel().seqCanvas;
   
@@ -339,10 +348,10 @@ public class SeqCanvasTest
     av.setFont(new Font("SansSerif", Font.PLAIN, 14), true);
     int charHeight = av.getCharHeight();
     int charWidth = av.getCharWidth();
-    // Windows h=19, w=11.
-    assertEquals(charHeight, Platform.isMac() ? 17 : 19);
-    assertEquals(charWidth, Platform.isMac() ? 12 : 11);
-
+    // Windows h=19, w=11; Mac (and Linux?) 17,11
+    Assert.assertTrue(charHeight == 17 && charWidth == 12
+            || charHeight == 19 && charWidth == 11,
+            "char height/width " + charHeight + "/" + charWidth);
     int canvasWidth = 400;
     int canvasHeight = 300;
     testee.calculateWrappedGeometry(canvasWidth, canvasHeight);