Merge branch 'develop' into task/JAL-3130_Java_11_investigations-getdown_src

[jalview.git] / test / jalview / util / PlatformTest.java

diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java
index 2e5a786..617bf42 100644 (file)
--- a/test/jalview/util/PlatformTest.java
+++ b/test/jalview/util/PlatformTest.java
@@ -26,6 +26,7 @@ import static org.testng.Assert.assertTrue;
 import jalview.gui.JvOptionPane;
 
 import java.awt.Button;
+import java.awt.Toolkit;
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
 
@@ -51,6 +52,16 @@ public class PlatformTest
   @Test(groups = "Functional")
   public void testIsControlDown_mac()
   {
+    String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
+    if ("sun.awt.X11.XToolkit".equals(toolkit))
+    {
+      /*
+       * this toolkit on the build server fails these tests,
+       * because it returns 2, not 4, for getMenuShortcutKeyMask
+       */
+      return;
+    }
+
     int clickCount = 1;
     boolean isPopupTrigger = false;
     int buttonNo = MouseEvent.BUTTON1;