X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FPlatformTest.java;fp=test%2Fjalview%2Futil%2FPlatformTest.java;h=c8616adf1e6261f351f5e7e24aa355116f1a7b10;hb=89783fd8b12b50270d561017d5481de089d86d70;hp=505289492f4c1e08c763ab790d46f44600ee95ef;hpb=a29326254cf21aa7633d1485c1621ffd0fee1097;p=jalview.git diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java index 5052894..c8616ad 100644 --- 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(); - 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 + * + * Same for windows, because the Platform test "mac" must match the + * actual platform that is running the test. + * + * */ return; }