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 492df42..c8616ad 100644 (file)
--- a/test/jalview/util/PlatformTest.java
+++ b/test/jalview/util/PlatformTest.java
@@ -1,16 +1,48 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 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();
 
   /**
@@ -20,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;
@@ -41,6 +88,12 @@ public class PlatformTest
     isPopupTrigger = true;
     assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0,
             0, 0, clickCount, isPopupTrigger, buttonNo), mac));
+
+    isPopupTrigger = false;
+    buttonNo = MouseEvent.BUTTON2;
+    mods = 0;
+    assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0,
+            0, 0, clickCount, isPopupTrigger, buttonNo), mac));
   }
 
   /**