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

init field in setup: use setup method template(IDEA-86135)

Browse Source
This commit is contained in:
Anna Kozlova
2012-05-18 10:17:08 +04:00
parent eaf77e0975
commit fb7ddf8340
5 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/testIntegration/JavaTestFramework.java
+8
View File
@@ -15,11 +15,14 @@
*/
package com.intellij.testIntegration;
import com.intellij.ide.fileTemplates.FileTemplate;
import com.intellij.ide.fileTemplates.FileTemplateDescriptor;
import com.intellij.ide.fileTemplates.FileTemplateManager;
import com.intellij.lang.Language;
import com.intellij.lang.java.JavaLanguage;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.search.GlobalSearchScope;
@@ -104,4 +107,9 @@ public abstract class JavaTestFramework implements TestFramework {
public FileTemplateDescriptor getParametersMethodFileTemplateDescriptor() {
return null;
}
protected PsiMethod createSetUpPatternMethod(JVMElementFactory factory) {
final FileTemplate template = FileTemplateManager.getInstance().getCodeTemplate(getSetUpMethodFileTemplateDescriptor().getFileName());
return factory.createMethodFromText(StringUtil.replace(template.getText(), "${BODY}", ""), null);
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/testIntegration/GroovyTestFramework.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class GroovyTestFramework extends JavaTestFramework {
LOG.assertTrue(clazz.getLanguage() == GroovyFileType.GROOVY_LANGUAGE);
final GroovyPsiElementFactory factory = GroovyPsiElementFactory.getInstance(clazz.getProject());
final PsiMethod patternMethod = factory.createMethodFromText("protected void setUp() {\nsuper.setUp()\n}", null);
final PsiMethod patternMethod = createSetUpPatternMethod(factory);
final PsiClass baseClass = clazz.getSuperClass();
if (baseClass != null) {
plugins/junit/src/com/intellij/execution/junit/JUnit3Framework.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class JUnit3Framework extends JavaTestFramework {
final PsiManager manager = clazz.getManager();
final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
final PsiMethod patternMethod = factory.createMethodFromText("protected void setUp() throws Exception {\nsuper.setUp();\n}", null);
final PsiMethod patternMethod = createSetUpPatternMethod(factory);
final PsiClass baseClass = clazz.getSuperClass();
if (baseClass != null) {
plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java
+1 -1
View File
@@ -92,7 +92,7 @@ public class JUnit4Framework extends JavaTestFramework {
PsiManager manager = clazz.getManager();
PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
method = factory.createMethodFromText("@org.junit.Before public void setUp() throws Exception {\n}", null);
method = createSetUpPatternMethod(factory);
PsiMethod existingMethod = clazz.findMethodBySignature(method, false);
if (existingMethod != null) {
int exit = ApplicationManager.getApplication().isUnitTestMode() ?
plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class TestNGFramework extends JavaTestFramework {
final PsiManager manager = clazz.getManager();
final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory();
String setUpName = "setUp";
PsiMethod patternMethod = factory.createMethodFromText("@" + BeforeMethod.class.getName() + "\n protected void " + setUpName + "() throws Exception {}", null);
PsiMethod patternMethod = createSetUpPatternMethod(factory);
PsiMethod inClass = clazz.findMethodBySignature(patternMethod, false);
if (inClass != null) {
int exit = ApplicationManager.getApplication().isUnitTestMode() ?