X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FAlignmentPanelTest.java;h=caa4e2294c433ed8979c5213548bc70c28332af1;hb=e83ce5d8ef826fc0b509a51f154abdf734501077;hp=eefe95079df8c47a01d044b31f4a0717c0a7f571;hpb=5db005745240445acdd3b140372aa74adbc3bc46;p=jalview.git diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java index eefe950..caa4e22 100644 --- 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")