X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FSeqCanvasTest.java;h=abcdc35f29bc9c09bfd369bad2dc4dad93e1f987;hb=5964aad7916e77491036986f90bba00d95b69d69;hp=ce4ff59cfc0e61638249f166f3995df403feff59;hpb=6c03e40dd457a521bc73c6d5d6bd45688f7db3c7;p=jalview.git

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index ce4ff59..abcdc35 100644
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -27,7 +27,6 @@ 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;
@@ -223,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);
@@ -376,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();
@@ -392,10 +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,
-            "endSeq should be 3; av.getRanges=" + av.getRanges()); // unchanged
+            "endSeq should be 3; av.getRanges=" + ss); // unchanged
     assertEquals(repeatingHeight, charHeight * (2 + al.getHeight()));
   }
 }