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

disallow calling ModalityState.current() from non-EDT

Browse Source
This commit is contained in:
peter
2016-09-28 18:45:03 +02:00
parent 27543fe191
commit abbffc933f
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/impl/LaterInvocator.java
+1
View File
@@ -319,6 +319,7 @@ public class LaterInvocator {
@NotNull
public static ModalityState getCurrentModalityState() {
ApplicationManager.getApplication().assertIsDispatchThread();
return ourModalityStack.peek();
}
platform/platform-tests/testSrc/com/intellij/openapi/application/impl/LaterInvocatorTest.java
+16
View File
@@ -19,6 +19,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Conditions;
import com.intellij.testFramework.LoggedErrorProcessor;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.SkipInHeadlessEnvironment;
import com.intellij.testFramework.UsefulTestCase;
@@ -30,6 +31,9 @@ import javax.swing.*;
import java.awt.*;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
@SuppressWarnings({"SSBasedInspection", "SynchronizeOnThis"})
@SkipInHeadlessEnvironment
@@ -561,4 +565,16 @@ public class LaterInvocatorTest extends PlatformTestCase {
assertOrderedEquals(myOrder, "m12", "m2", "m1", "m1x");
});
}
public void testModalityStateCurrentAllowedOnlyFromEDT() throws Exception {
LoggedErrorProcessor.getInstance().disableStderrDumping(getTestRootDisposable());
Future<ModalityState> future = ApplicationManager.getApplication().executeOnPooledThread(() -> ModalityState.current());
try {
future.get(1000, TimeUnit.MILLISECONDS);
fail("should fail");
}
catch (ExecutionException e) {
assertTrue(e.getMessage(), e.getMessage().contains("Access is allowed from event dispatch thread only"));
}
}
}