MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

test fixed: everybody posts to event queue like crazy, so ignore InvocationEvents

Browse Source
This commit is contained in:
Alexey Kudravtsev
2016-06-01 13:55:05 +03:00
parent 12d808d98f
commit 125752add7
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java
+7 -15
View File
@@ -55,44 +55,36 @@ public class IdeEventQueueTest extends PlatformTestCase {
eventQueue.postEvent(pressX);
assertEquals(posted+1, ideEventQueue.myKeyboardEventsPosted.get());
assertEquals(dispatched, ideEventQueue.myKeyboardEventsDispatched.get());
assertEquals(pressX, PlatformTestUtil.dispatchNextEventIfAny(ideEventQueue));
assertEquals(pressX, dispatchAllInvocationEventsUntilOtherEvent(ideEventQueue));
assertEquals(posted+1, ideEventQueue.myKeyboardEventsPosted.get());
assertEquals(dispatched+1, ideEventQueue.myKeyboardEventsDispatched.get());
dispatchAllInvocationEventsOnly(ideEventQueue);
// do not react to other events
MouseEvent mouseClick = new MouseEvent(new JLabel(), MouseEvent.BUTTON1, 1, InputEvent.BUTTON1_DOWN_MASK, 12, 14, 1, true);
eventQueue.postEvent(mouseClick);
assertEquals(posted+1, ideEventQueue.myKeyboardEventsPosted.get());
assertEquals(dispatched+1, ideEventQueue.myKeyboardEventsDispatched.get());
assertEquals(mouseClick, PlatformTestUtil.dispatchNextEventIfAny(ideEventQueue));
assertEquals(mouseClick, dispatchAllInvocationEventsUntilOtherEvent(ideEventQueue));
assertEquals(posted+1, ideEventQueue.myKeyboardEventsPosted.get());
assertEquals(dispatched+1, ideEventQueue.myKeyboardEventsDispatched.get());
dispatchAllInvocationEventsOnly(ideEventQueue);
KeyEvent keyRelease = new KeyEvent(new JLabel(), KeyEvent.KEY_RELEASED, 1, InputEvent.ALT_DOWN_MASK, 11, 'x');
eventQueue.postEvent(keyRelease);
assertEquals(posted+2, ideEventQueue.myKeyboardEventsPosted.get());
assertEquals(dispatched+1, ideEventQueue.myKeyboardEventsDispatched.get());
assertEquals(keyRelease, PlatformTestUtil.dispatchNextEventIfAny(ideEventQueue));
assertEquals(keyRelease, dispatchAllInvocationEventsUntilOtherEvent(ideEventQueue));
assertEquals(posted+2, ideEventQueue.myKeyboardEventsPosted.get());
assertEquals(dispatched+2, ideEventQueue.myKeyboardEventsDispatched.get());
dispatchAllInvocationEventsOnly(ideEventQueue);
}
// need this because IdeEventQueue.dispatchEvent() calls invokeLater() and everybody else does too
private static void dispatchAllInvocationEventsOnly(IdeEventQueue ideEventQueue) throws InterruptedException {
// need this because everybody can post some crazy stuff to IdeEventQueue, so we have to filter InvocationEvents out
private static AWTEvent dispatchAllInvocationEventsUntilOtherEvent(IdeEventQueue ideEventQueue) throws InterruptedException {
while (true) {
AWTEvent event = ideEventQueue.peekEvent();
if (!(event instanceof InvocationEvent)) break;
AWTEvent event1 = ideEventQueue.getNextEvent();
ideEventQueue.dispatchEvent(event1);
AWTEvent event = PlatformTestUtil.dispatchNextEventIfAny(ideEventQueue);
if (!(event instanceof InvocationEvent)) return event;
}
}
}
platform/testFramework/src/com/intellij/testFramework/PlatformTestUtil.java
+1
View File
@@ -312,6 +312,7 @@ public class PlatformTestUtil {
while (dispatchNextEventIfAny(eventQueue) != null);
}
@TestOnly
public static AWTEvent dispatchNextEventIfAny(@NotNull IdeEventQueue eventQueue) throws InterruptedException {
AWTEvent event = eventQueue.peekEvent();
if (event == null) return null;