X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FPlatformTest.java;h=617bf42bd08995a027d167424290da2b5bfc79de;hb=b74e75812b411ed8838f2c57d84fa1b328bbefe5;hp=505289492f4c1e08c763ab790d46f44600ee95ef;hpb=eb18fbe86d8a42079f82f96791695e9ca24f3be5;p=jalview.git diff --git a/test/jalview/util/PlatformTest.java b/test/jalview/util/PlatformTest.java index 5052894..617bf42 100644 --- a/test/jalview/util/PlatformTest.java +++ b/test/jalview/util/PlatformTest.java @@ -26,8 +26,8 @@ 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.InputEvent; import java.awt.event.MouseEvent; import org.testng.annotations.BeforeClass; @@ -72,11 +72,11 @@ public class PlatformTest assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.CTRL_MASK; + mods = InputEvent.CTRL_DOWN_MASK | InputEvent.BUTTON1_DOWN_MASK; assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.META_MASK; + mods = InputEvent.META_DOWN_MASK | InputEvent.BUTTON1_DOWN_MASK; assertTrue(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); @@ -108,11 +108,12 @@ public class PlatformTest assertFalse(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.CTRL_MASK; + mods = InputEvent.CTRL_DOWN_MASK; assertTrue(Platform.isControlDown(new MouseEvent(b, 0, 0L, mods, 0, 0, 0, 0, clickCount, isPopupTrigger, buttonNo), mac)); - mods = Event.CTRL_MASK | Event.SHIFT_MASK | Event.ALT_MASK; + mods = InputEvent.CTRL_DOWN_MASK | InputEvent.SHIFT_DOWN_MASK + | InputEvent.ALT_DOWN_MASK; clickCount = 2; buttonNo = 2; isPopupTrigger = true;