git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
383fd91
)
JAL-1889 patch for failing isControDown test on build server
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 28 Mar 2019 15:52:23 +0000
(15:52 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 28 Mar 2019 15:52:23 +0000
(15:52 +0000)
test/jalview/util/PlatformTest.java
patch
|
blob
|
history
diff --git
a/test/jalview/util/PlatformTest.java
b/test/jalview/util/PlatformTest.java
index
307f450
..
5052894
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.Button;
import java.awt.Event;
+import java.awt.Toolkit;
import java.awt.event.MouseEvent;
import org.testng.annotations.BeforeClass;
import java.awt.event.MouseEvent;
import org.testng.annotations.BeforeClass;
@@
-51,6
+52,16
@@
public class PlatformTest
@Test(groups = "Functional")
public void testIsControlDown_mac()
{
@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;
int clickCount = 1;
boolean isPopupTrigger = false;
int buttonNo = MouseEvent.BUTTON1;