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

Cleanup in Python Console tests

Browse Source
This commit is contained in:
Elizaveta Shashkova
2017-03-20 16:04:21 +03:00
parent d4e89d2bbc
commit 0a0abae955
1 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/testSrc/com/jetbrains/env/python/console/PyConsoleTask.java
Vendored
+20 -34
View File
@@ -84,36 +84,30 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
@Override
public void tearDown() throws Exception {
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
try {
if (myConsoleView != null) {
disposeConsole();
myCommunication.waitForTerminate();
}
PyConsoleTask.super.tearDown();
}
catch (Exception e) {
throw new RuntimeException(e);
UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
try {
if (myConsoleView != null) {
disposeConsole();
myCommunication.waitForTerminate();
}
super.tearDown();
}
catch (Exception e) {
throw new RuntimeException(e);
}
});
}
private void disposeConsole() throws InterruptedException {
if (myCommunication != null) {
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
try {
myCommunication.close();
}
catch (Exception e) {
e.printStackTrace();
}
myCommunication = null;
UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
try {
myCommunication.close();
}
catch (Exception e) {
e.printStackTrace();
}
myCommunication = null;
});
}
@@ -324,12 +318,7 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
protected void exec(final String command) throws InterruptedException {
waitForReady();
myCommandSemaphore.acquire(1);
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
myConsoleView.executeInConsole(command);
}
});
UIUtil.invokeAndWaitIfNeeded((Runnable)() -> myConsoleView.executeInConsole(command));
Assert.assertTrue(String.format("Command execution wasn't finished: `%s` \n" +
"Output: %s", command, output()), waitFor(myCommandSemaphore));
myCommandSemaphore.release();
@@ -388,12 +377,9 @@ public class PyConsoleTask extends PyExecutionFixtureTestTask {
public void addTextToEditor(final String text) {
UIUtil.invokeAndWaitIfNeeded(new Runnable() {
@Override
public void run() {
getConsoleView().setInputText(text);
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
}
UIUtil.invokeAndWaitIfNeeded((Runnable)() -> {
getConsoleView().setInputText(text);
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
}
);
}