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
Merge branch 'develop' into task/JAL-3130_Java_11_investigations-getdown_src
[jalview.git]
/
test
/
jalview
/
util
/
PlatformTest.java
diff --git
a/test/jalview/util/PlatformTest.java
b/test/jalview/util/PlatformTest.java
index
5052894
..
617bf42
100644
(file)
--- 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 jalview.gui.JvOptionPane;
import java.awt.Button;
-import java.awt.Event;
import java.awt.Toolkit;
import java.awt.Toolkit;
+import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import org.testng.annotations.BeforeClass;
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));
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));
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));
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));
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));
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;
clickCount = 2;
buttonNo = 2;
isPopupTrigger = true;