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

lighten up, remove redundant language level setting

Browse Source
This commit is contained in:
Dmitry Jemerov
2009-09-10 21:39:30 +04:00
parent aac1e94991
commit b7059665c4
4 changed files with 7 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java
-15
View File
@@ -6,8 +6,6 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiLocalVariable;
import com.intellij.psi.PsiReference;
@@ -19,28 +17,15 @@ import com.intellij.testFramework.LightCodeInsightTestCase;
* @author ven
*/
public class InlineLocalTest extends LightCodeInsightTestCase {
private LanguageLevel myPreviousLanguageLevel;
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
}
protected void setUp() throws Exception {
super.setUp();
myPreviousLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk15("java 1.5");
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPreviousLanguageLevel);
super.tearDown();
}
public void testInference () throws Exception {
doTest(false);
}
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java
+4 -19
View File
@@ -1,36 +1,21 @@
package com.intellij.refactoring.inline;
import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiReference;
import com.intellij.psi.PsiReferenceExpression;
import com.intellij.refactoring.MockInlineMethodOptions;
import com.intellij.JavaTestUtil;
import com.intellij.testFramework.LightCodeInsightTestCase;
import org.jetbrains.annotations.NonNls;
public class InlineMethodTest extends CodeInsightTestCase {
private LanguageLevel myPreviousLanguageLevel;
public class InlineMethodTest extends LightCodeInsightTestCase {
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
}
protected void setUp() throws Exception {
super.setUp();
myPreviousLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPreviousLanguageLevel);
super.tearDown();
}
public void testInlineParms() throws Exception {
doTest();
}
@@ -158,7 +143,7 @@ public class InlineMethodTest extends CodeInsightTestCase {
final boolean condition = InlineMethodProcessor.checkBadReturns(method) && !InlineMethodHandler.allUsagesAreTailCalls(method);
assertFalse("Bad returns found", condition);
InlineOptions options = new MockInlineMethodOptions();
final InlineMethodProcessor processor = new InlineMethodProcessor(myProject, method, refExpr, myEditor, options.isInlineThisOnly());
final InlineMethodProcessor processor = new InlineMethodProcessor(getProject(), method, refExpr, myEditor, options.isInlineThisOnly());
processor.run();
}
}
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java
+2 -17
View File
@@ -1,37 +1,22 @@
package com.intellij.refactoring.inline;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.JavaTestUtil;
import org.jetbrains.annotations.NonNls;
/**
* @author yole
*/
public class InlineParameterTest extends LightCodeInsightTestCase {
private LanguageLevel myPreviousLanguageLevel;
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
}
protected void setUp() throws Exception {
super.setUp();
myPreviousLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPreviousLanguageLevel);
super.tearDown();
}
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk15("java 1.5");
}
@@ -103,7 +88,7 @@ public class InlineParameterTest extends LightCodeInsightTestCase {
checkResultByFile(null, fileName + ".after", true);
}
private void performAction() {
private static void performAction() {
final PsiElement element = TargetElementUtilBase.findTargetElement(myEditor, TargetElementUtilBase
.REFERENCED_ELEMENT_ACCEPTED | TargetElementUtilBase.ELEMENT_NAME_ACCEPTED);
new InlineParameterHandler().inlineElement(getProject(), myEditor, element);
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java
+1 -16
View File
@@ -1,16 +1,14 @@
package com.intellij.refactoring.inline;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.PsiCall;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.usageView.UsageInfo;
import com.intellij.JavaTestUtil;
import org.jetbrains.annotations.NonNls;
import java.util.ArrayList;
@@ -19,24 +17,11 @@ import java.util.ArrayList;
* @author yole
*/
public class InlineToAnonymousClassTest extends LightCodeInsightTestCase {
private LanguageLevel myPreviousLanguageLevel;
@Override
protected String getTestDataPath() {
return JavaTestUtil.getJavaTestDataPath();
}
protected void setUp() throws Exception {
super.setUp();
myPreviousLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPreviousLanguageLevel);
super.tearDown();
}
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk15("java 1.5");
}