git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
5052894
..
c8616ad
100644
(file)
--- a/
test/jalview/util/PlatformTest.java
+++ b/
test/jalview/util/PlatformTest.java
@@
-53,11
+53,16
@@
public class PlatformTest
public void testIsControlDown_mac()
{
String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
public void testIsControlDown_mac()
{
String toolkit = Toolkit.getDefaultToolkit().getClass().getName();
- if ("sun.awt.X11.XToolkit".equals(toolkit))
+ if (toolkit.endsWith("XToolkit") || toolkit.endsWith("WToolkit"))
{
/*
* this toolkit on the build server fails these tests,
* because it returns 2, not 4, for getMenuShortcutKeyMask
{
/*
* 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;
}
*/
return;
}