JAL-3253-applet JAL-3423 Windows TestNG

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

diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java
index 307f450..c8616ad 100644 (file)
--- 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,21 @@ public class PlatformTest
   @Test(groups = "Functional")
   public void testIsControlDown_mac()
   {
+    String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
+    if (toolkit.endsWith("XToolkit") || toolkit.endsWith("WToolkit"))
+    {
+      /*
+       * this toolkit on the build server fails these tests,
+       * because it returns 2, not 4, for getMenuShortcutKeyMask
+       * 
+       * Same for windows, because the Platform test "mac" must match the 
+       * actual platform that is running the test. 
+       * 
+       * 
+       */
+      return;
+    }
+
     int clickCount = 1;
     boolean isPopupTrigger = false;
     int buttonNo = MouseEvent.BUTTON1;