From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 28 Mar 2019 15:52:23 +0000 (+0000)
Subject: JAL-1889 patch for failing isControDown test on build server
X-Git-Tag: Release_2_11_0~17^2~27
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1ba7e2e956b0db4ca52baca4cd2fc3a4384cc826;p=jalview.git

JAL-1889 patch for failing isControDown test on build server
---

diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java
index 307f450..5052894 100644
--- a/test/jalview/util/PlatformTest.java
+++ b/test/jalview/util/PlatformTest.java
@@ -27,6 +27,7 @@ import jalview.gui.JvOptionPane;
 
 import java.awt.Button;
 import java.awt.Event;
+import java.awt.Toolkit;
 import java.awt.event.MouseEvent;
 
 import org.testng.annotations.BeforeClass;
@@ -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;