From b7059665c4ebc4fc7698a3a8ead88b90e4259863 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 10 Sep 2009 21:39:30 +0400 Subject: [PATCH] lighten up, remove redundant language level setting --- .../refactoring/inline/InlineLocalTest.java | 15 ------------ .../refactoring/inline/InlineMethodTest.java | 23 ++++--------------- .../inline/InlineParameterTest.java | 19 ++------------- .../inline/InlineToAnonymousClassTest.java | 17 +------------- 4 files changed, 7 insertions(+), 67 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java index 0cc9c4cc6843..d80764539c2b 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java @@ -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); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java index 5b9b7fd69a8c..0fdf112d4479 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java @@ -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(); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java index 771bc8e839eb..1008d2c97412 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java @@ -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); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java index 3ff49bff8006..12c89c7ffc34 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java @@ -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"); }