make fixtures more indifferent to the thread they're called from

This commit is contained in:
peter
2012-09-05 16:02:44 +02:00
parent c0b8183243
commit 21157a8d34
2 changed files with 61 additions and 43 deletions
@@ -16,8 +16,6 @@
package com.intellij.testFramework.fixtures.impl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.Result;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -61,12 +59,7 @@ public class JavaCodeInsightTestFixtureImpl extends CodeInsightTestFixtureImpl i
}
});
assert qName != null;
final PsiFile psiFile = new WriteCommandAction<PsiFile>(getProject()) {
@Override
protected void run(Result<PsiFile> result) throws Throwable {
result.setResult(addFileToProject(rootPath, qName.replace('.', '/') + ".java", classText));
}
}.execute().getResultObject();
final PsiFile psiFile = addFileToProject(rootPath, qName.replace('.', '/') + ".java", classText);
return ApplicationManager.getApplication().runReadAction(new Computable<PsiClass>() {
public PsiClass compute() {
return ((PsiJavaFile)psiFile).getClasses()[0];