MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 23:39:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

run refactoring tests outside the write action and get rid of testRun()

Browse Source
This commit is contained in:
Alexey Kudravtsev
2011-12-14 12:24:10 +04:00
parent 5be8bfddf9
commit 9a6cf70a00
57 changed files with 480 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java
View File

@@ -6,15 +6,13 @@ package com.intellij.refactoring;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.command.WriteCommandAction;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.refactoring.extractMethodObject.ExtractMethodObjectHandler;
import com.intellij.refactoring.extractMethodObject.ExtractMethodObjectProcessor;
import com.intellij.refactoring.util.duplicates.DuplicatesImpl;
import com.intellij.testFramework.LightCodeInsightTestCase;
public class ExtractMethodObjectTest extends LightCodeInsightTestCase {
public class ExtractMethodObjectTest extends LightRefactoringTestCase {
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
@@ -31,26 +29,20 @@ public class ExtractMethodObjectTest extends LightCodeInsightTestCase {
assertTrue(element instanceof PsiMethod);
final PsiMethod method = (PsiMethod) element;
new WriteCommandAction.Simple(getProject()) {
@Override
protected void run() throws Throwable {
final ExtractMethodObjectProcessor processor =
new ExtractMethodObjectProcessor(getProject(), getEditor(), method.getBody().getStatements(), "InnerClass");
final ExtractMethodObjectProcessor.MyExtractMethodProcessor extractProcessor = processor.getExtractProcessor();
extractProcessor.setShowErrorDialogs(false);
extractProcessor.prepare();
extractProcessor.testRun();
processor.setCreateInnerClass(createInnerClass);
processor.run();
processor.runChangeSignature();
if (createInnerClass) {
processor.moveUsedMethodsToInner();
}
DuplicatesImpl.processDuplicates(extractProcessor, getProject(), getEditor());
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
processor.getMethod().delete();
final ExtractMethodObjectProcessor processor =
new ExtractMethodObjectProcessor(getProject(), getEditor(), method.getBody().getStatements(), "InnerClass");
final ExtractMethodObjectProcessor.MyExtractMethodProcessor extractProcessor = processor.getExtractProcessor();
processor.setCreateInnerClass(createInnerClass);
extractProcessor.setShowErrorDialogs(false);
extractProcessor.prepare();
extractProcessor.testPrepare();
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor);
}
}.execute().throwException();
});
checkResultByFile("/refactoring/extractMethodObject/" + testName + ".java" + ".after");
}