From cad495c02559e23c97ccd7ffd1d0a3f1dce43c81 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 22 Mar 2017 14:07:43 +0300 Subject: [PATCH] test fixed --- .../testSrc/com/intellij/ide/IdeEventQueueTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java b/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java index 9c518825d20c..b71a024a05fa 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java +++ b/platform/platform-tests/testSrc/com/intellij/ide/IdeEventQueueTest.java @@ -83,7 +83,9 @@ public class IdeEventQueueTest extends PlatformTestCase { assertEquals(posted+1, ideEventQueue.myKeyboardEventsPosted.get()); assertEquals(dispatched+1, ideEventQueue.myKeyboardEventsDispatched.get()); - assertEquals(ev2, dispatchAllInvocationEventsUntilOtherEvent(ideEventQueue)); + dispatchAllInvocationEventsUntilOtherEvent(ideEventQueue); + // either it's dispatched by this method or the f*@$ing VCSRefresh activity stomped in, started modal progress and dispatched all events via IdeEventQueue.pumpEventsForHierarchy by itself + assertTrue(isDispatched.contains(ev2)); assertEquals(posted+1, ideEventQueue.myKeyboardEventsPosted.get()); assertEquals(dispatched+1, ideEventQueue.myKeyboardEventsDispatched.get());