Merge branch 'develop' into features/JAL-4219_extended_fasta_rna_ss

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

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index eefe950..caa4e22 100644 (file)
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -44,6 +44,7 @@ import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.SequenceI;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
+import jalview.util.Platform;
 import jalview.viewmodel.ViewportRanges;
 
 public class AlignmentPanelTest
@@ -282,7 +283,8 @@ public class AlignmentPanelTest
     assertEquals(w, af.alignPanel.getIdPanel().getWidth());
 
     // different scaling (1.0, 2.0) gives different results
-    assertEquals(w, scaling == 1.0 ? 112 : 107);
+    int expectedWidth = scaling == 1.0 ? 112 : Platform.isMac() ? 115 : 107;
+    assertEquals(w, expectedWidth);
 
     /*
      * width for offscreen rendering is the same
@@ -306,7 +308,7 @@ public class AlignmentPanelTest
     // allow some leeway for different OS renderings
     assertTrue(w > 105 && w < 120);
     // different scaling (1.0, 2.0) gives different results
-    assertEquals(w, scaling == 1.0 ? 112 : 107);
+    assertEquals(w, expectedWidth);
   }
 
   @Test(groups = { "Functional", "Not-bamboo" })
@@ -322,7 +324,8 @@ public class AlignmentPanelTest
     // allow some leeway for different OS renderings
     assertTrue(w > 105 && w < 120);
     // different scaling (1.0, 2.0) gives different results
-    assertEquals(w, scaling == 1.0 ? 112 : 107);
+    int expectedWidth = scaling == 1.0 ? 112 : Platform.isMac() ? 115 : 107;
+    assertEquals(w, expectedWidth);
 
     // manually adjust
     af.viewport.setIdWidth(200);
@@ -352,7 +355,7 @@ public class AlignmentPanelTest
     // allow some leeway for different OS renderings
     assertTrue(w > 105 && w < 120);
     // different scaling (1.0, 2.0) gives different results
-    assertEquals(w, scaling == 1.0 ? 112 : 107);
+    assertEquals(w, expectedWidth);
   }
 
   @Test(groups = "Functional")