Merge branch 'releases/Release_2_11_4_Branch'

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

diff --git a/test/jalview/gui/SeqPanelTest.java b/test/jalview/gui/SeqPanelTest.java
index d47df46..4f07314 100644 (file)
--- a/test/jalview/gui/SeqPanelTest.java
+++ b/test/jalview/gui/SeqPanelTest.java
@@ -845,14 +845,12 @@ public class SeqPanelTest
     assertEquals(testee.findColumn(evt), -1);
     assertEquals(testee.findAlignmentColumn(evt), 0);
 
-
     x = labelWidth;
     evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
             0, false, 0);
     assertEquals(testee.findColumn(evt), 0);
     assertEquals(testee.findAlignmentColumn(evt), 0);
 
-
     /*
      * x over right edge of last residue (including scale left)
      */
@@ -862,8 +860,7 @@ public class SeqPanelTest
     evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
             0, false, 0);
     assertEquals(testee.findColumn(evt), residuesWide - 1);
-    assertEquals(testee.findAlignmentColumn(evt), residuesWide-1);
-
+    assertEquals(testee.findAlignmentColumn(evt), residuesWide - 1);
 
     /*
      * x over scale right (beyond drawn columns) results in -1
@@ -881,8 +878,7 @@ public class SeqPanelTest
     // on scale
     assertEquals(testee.findColumn(evt), -1);
     // return right-most column visible
-    assertEquals(testee.findAlignmentColumn(evt), residuesWide2-1);
-
+    assertEquals(testee.findAlignmentColumn(evt), residuesWide2 - 1);
 
     // todo add startRes offset, hidden columns
 
@@ -954,9 +950,12 @@ public class SeqPanelTest
     assertEquals(charHeight, 17);
     assertEquals(charWidth, 12);
 
+    double scaling = JvSwingUtilsTest.getScaling(alignFrame.alignPanel);
+
     FontMetrics fm = testee.getFontMetrics(av.getFont());
     int labelWidth = fm.stringWidth("00000") + charWidth;
-    assertEquals(labelWidth, 57); // 5 x 9 + charWidth
+    // some leeway for different OS rendering of text
+    assertTrue(labelWidth >= 52 && labelWidth <= 57);
     assertEquals(testee.seqCanvas.getLabelWidthWest(), labelWidth);
 
     int x = 0;