MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-05-06 05:10:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

move initializer to setup: should work when setup method is there (IDEA-171236)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-04-11 11:30:10 +02:00
parent 8ea1d42ecf
commit c9554bd544
3 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
java/java-impl/src/com/intellij/testIntegration/intention/MoveInitializerToSetUpMethodAction.java
View File

@@ -20,13 +20,11 @@ import com.intellij.codeInsight.TestFrameworks;
import com.intellij.codeInsight.intention.impl.BaseMoveInitializerToMethodAction;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.testIntegration.JavaTestFramework;
import com.intellij.testIntegration.TestFramework;
import com.intellij.testIntegration.TestIntegrationUtils;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
@@ -53,25 +51,23 @@ public class MoveInitializerToSetUpMethodAction extends BaseMoveInitializerToMet
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
final boolean isAvailable = super.isAvailable(project, editor, element) && TestIntegrationUtils.isTest(element);
final boolean isAvailable = super.isAvailable(project, editor, element);
if (isAvailable) {
final PsiField field = PsiTreeUtil.getParentOfType(element, PsiField.class);
LOG.assertTrue(field != null);
final PsiClass aClass = field.getContainingClass();
LOG.assertTrue(aClass != null);
TestFramework testFramework = TestFrameworks.detectFramework(aClass);
final PsiElementFactory elementFactory = JavaPsiFacade.getElementFactory(project);
for (TestFramework framework : Extensions.getExtensions(TestFramework.EXTENSION_NAME)) {
if (framework instanceof JavaTestFramework && framework.isTestClass(aClass)) {
try {
((JavaTestFramework)framework).createSetUpPatternMethod(elementFactory);
return true;
}
catch (Exception e) {
return false;
}
if (testFramework instanceof JavaTestFramework) {
try {
((JavaTestFramework)testFramework).createSetUpPatternMethod(elementFactory);
return testFramework.isTestClass(aClass) || testFramework.findSetUpMethod(aClass) instanceof PsiMethod;
}
catch (Exception e) {
return false;
}
}
return true;
}
return false;
}
@@ -85,7 +81,14 @@ public class MoveInitializerToSetUpMethodAction extends BaseMoveInitializerToMet
@NotNull
@Override
protected Collection<PsiMethod> getOrCreateMethods(@NotNull Project project, @NotNull Editor editor, PsiFile file, @NotNull PsiClass aClass) {
final PsiMethod setUpMethod = TestFrameworks.getInstance().findOrCreateSetUpMethod(aClass);
return setUpMethod == null ? Collections.<PsiMethod>emptyList() : Arrays.asList(setUpMethod);
TestFramework testFramework = TestFrameworks.detectFramework(aClass);
PsiElement setUpMethod = null;
if (testFramework != null) {
setUpMethod = testFramework.findSetUpMethod(aClass);
if (setUpMethod == null) {
setUpMethod = testFramework.findOrCreateSetUpMethod(aClass);
}
}
return setUpMethod instanceof PsiMethod ? Collections.singletonList((PsiMethod)setUpMethod) : Collections.emptyList();
}
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveInitializerToSetUp/afterJUnit4WithBeforeOnly.java Normal file
View File

@@ -0,0 +1,10 @@
// "Move initializer to setUp method" "true"
public class X {
int i;
@org.junit.Before
public void setUp() throws Exception {
i = 7;
}
}

9
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/moveInitializerToSetUp/beforeJUnit4WithBeforeOnly.java Normal file
View File

@@ -0,0 +1,9 @@
// "Move initializer to setUp method" "true"
public class X {
<caret>int i = 7;
@org.junit.Before
public void setUp() throws Exception {
}
}