X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FPlatformTest.java;h=505289492f4c1e08c763ab790d46f44600ee95ef;hb=83a7efc57926ebf046f95de5291eb439563eb953;hp=e9e4628804be365bb8b4ed693b05ed17a0ce6893;hpb=5776cb3b3d74f3c3d3d791d56287d8d78e46b01b;p=jalview.git

diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java
index e9e4628..5052894 100644
--- a/test/jalview/util/PlatformTest.java
+++ b/test/jalview/util/PlatformTest.java
@@ -23,14 +23,26 @@ package jalview.util;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+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;
 import org.testng.annotations.Test;
 
 public class PlatformTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   Button b = new Button();
 
   /**
@@ -40,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;