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

don't let light tests spoil language level for their comrades

Browse Source
This commit is contained in:
peter
2010-07-08 15:20:48 +01:00
parent 7e0cba4e45
commit a83f7ad0b0
22 changed files with 33 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/CompleteStatementTest.java
-2
View File
@@ -145,9 +145,7 @@ public class CompleteStatementTest extends EditorActionTestCase {
public void testSCR36110() throws Exception {
JavaPsiFacade facade = JavaPsiFacade.getInstance(getProject());
LanguageLevel old = LanguageLevelProjectExtension.getInstance(facade.getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(facade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
doTest();
LanguageLevelProjectExtension.getInstance(facade.getProject()).setLanguageLevel(old);
}
public void testSCR37331() throws Exception { doTest(); }
java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavySmartTypeCompletion15Test.java
-7
View File
@@ -4,8 +4,6 @@ import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.lookup.LookupManager;
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;
@SuppressWarnings({"ALL"})
public class HeavySmartTypeCompletion15Test extends CompletionTestCase {
@@ -79,11 +77,6 @@ public class HeavySmartTypeCompletion15Test extends CompletionTestCase {
complete();
}
protected void setUp() throws Exception {
super.setUp();
LanguageLevelProjectExtension.getInstance(myJavaFacade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LookupManager.getInstance(myProject).hideActiveLookup();
super.tearDown();
java/java-tests/testSrc/com/intellij/codeInsight/completion/KeywordCompletionTest.java
+2 -11
View File
@@ -1,8 +1,6 @@
package com.intellij.codeInsight.completion;
import com.intellij.JavaTestUtil;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
/**
@@ -109,15 +107,8 @@ public class KeywordCompletionTest extends LightCompletionTestCase {
}
public void testExtends_12() throws Exception {
final LanguageLevel level = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
try {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile(BASE_PATH + "/extends-12.java");
checkResultByFile(BASE_PATH + "/extends-12-result.java");
}
finally {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(level);
}
configureByFile(BASE_PATH + "/extends-12.java");
checkResultByFile(BASE_PATH + "/extends-12-result.java");
}
public void testSynchronized_1() throws Exception {
java/java-tests/testSrc/com/intellij/codeInsight/completion/NormalCompletionTest.java
-15
View File
@@ -6,10 +6,8 @@ import com.intellij.codeInsight.lookup.Lookup;
import com.intellij.codeInsight.lookup.LookupElement;
import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.CommonClassNames;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiMethod;
@@ -241,39 +239,33 @@ public class NormalCompletionTest extends LightCompletionTestCase {
}
public void testSwitchEnumLabel() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/SwitchEnumLabel.java");
assertEquals(3, myItems.length);
}
public void testMethodInAnnotation() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation.java");
checkResultByFile("/codeInsight/completion/normal/Annotation_after.java");
}
public void testMethodInAnnotation2() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation2.java");
checkResultByFile("/codeInsight/completion/normal/Annotation2_after.java");
}
public void testMethodInAnnotation3() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation3.java");
checkResultByFile("/codeInsight/completion/normal/Annotation3_after.java");
}
public void testMethodInAnnotation5() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation5.java");
checkResultByFile("/codeInsight/completion/normal/Annotation5_after.java");
}
public void testMethodInAnnotation7() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation7.java");
selectItem(myItems[0]);
@@ -281,19 +273,16 @@ public class NormalCompletionTest extends LightCompletionTestCase {
}
public void testEnumInAnnotation() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation4.java");
checkResultByFile("/codeInsight/completion/normal/Annotation4_after.java");
}
public void testSecondAttribute() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/Annotation6.java");
checkResultByFile("/codeInsight/completion/normal/Annotation6_after.java");
}
public void testIDEADEV6408() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
configureByFile("/codeInsight/completion/normal/IDEADEV6408.java");
assertEquals(2, myItems.length);
}
@@ -334,22 +323,18 @@ public class NormalCompletionTest extends LightCompletionTestCase {
}
public void testPackageInAnnoParam() throws Throwable {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
doTest();
}
public void testClassLiteralInAnnoParam() throws Throwable {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
doTest();
}
public void testAtUnderClass() throws Throwable {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
doTest();
}
public void testAtUnderClassNoModifiers() throws Throwable {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
doTest();
}
java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java
+1 -10
View File
@@ -9,13 +9,9 @@ import com.intellij.codeInsight.lookup.LookupManager;
import com.intellij.codeInsight.lookup.impl.LookupImpl;
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.testFramework.IdeaTestUtil;
import org.jetbrains.annotations.NonNls;
import java.util.Arrays;
@SuppressWarnings({"ALL"})
public class SecondSmartTypeCompletionTest extends LightCompletionTestCase {
private static final String BASE_PATH = "/codeInsight/completion/smartType/second";
@@ -160,7 +156,7 @@ public class SecondSmartTypeCompletionTest extends LightCompletionTestCase {
protected void checkResultByFile(@NonNls final String filePath) throws Exception {
if (myItems != null) {
System.out.println("items = " + Arrays.asList(myItems));
//System.out.println("items = " + Arrays.asList(myItems));
}
super.checkResultByFile(filePath);
}
@@ -178,11 +174,6 @@ public class SecondSmartTypeCompletionTest extends LightCompletionTestCase {
myItems = lookup == null ? null : lookup.getItems().toArray(LookupElement.EMPTY_ARRAY);
}
protected void setUp() throws Exception {
super.setUp();
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LookupManager.getInstance(getProject()).hideActiveLookup();
super.tearDown();
java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java
+1 -11
View File
@@ -15,7 +15,6 @@ import com.intellij.codeInsight.template.impl.TemplateImpl;
import com.intellij.codeInsight.template.impl.TemplateSettings;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.openapi.util.Condition;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.codeStyle.CodeStyleSettings;
@@ -25,7 +24,6 @@ import org.jetbrains.annotations.NonNls;
public class SmartTypeCompletionTest extends LightCompletionTestCase {
private static final String BASE_PATH = "/codeInsight/completion/smartType";
private LanguageLevel myPrevLanguageLevel;
@Override
protected String getTestDataPath() {
@@ -764,13 +762,13 @@ public class SmartTypeCompletionTest extends LightCompletionTestCase {
}
public void testAfterNew15() throws Exception {
setLanguageLevel(LanguageLevel.JDK_1_5);
doActionItemTest();
}
public void testInsertOverride() throws Exception {
CodeStyleSettings styleSettings = CodeStyleSettingsManager.getSettings(getProject());
styleSettings.INSERT_OVERRIDE_ANNOTATION = true;
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_6);
doActionItemTest();
}
@@ -1064,17 +1062,9 @@ public class SmartTypeCompletionTest extends LightCompletionTestCase {
protected void setUp() throws Exception {
super.setUp();
myPrevLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
setType(CompletionType.SMART);
}
protected void tearDown() throws Exception {
LookupManager.getInstance(getProject()).hideActiveLookup();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPrevLanguageLevel);
super.tearDown();
}
@Override
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17("java 1.5");
java/java-tests/testSrc/com/intellij/codeInsight/daemon/AnnotationsHighlightingTest.java
-14
View File
@@ -2,26 +2,12 @@ package com.intellij.codeInsight.daemon;
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 org.jetbrains.annotations.NonNls;
/**
* @author ven
*/
public class AnnotationsHighlightingTest extends LightDaemonAnalyzerTestCase {
private LanguageLevel myPrevLanguageLevel;
protected void setUp() throws Exception {
super.setUp();
myPrevLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPrevLanguageLevel);
super.tearDown();
}
@NonNls private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/annotations";
java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java
-7
View File
@@ -15,8 +15,6 @@ import org.jetbrains.annotations.NonNls;
public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
@NonNls private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/genericsHighlighting";
private LanguageLevel myOldLanguageLevel;
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[]{new UncheckedWarningLocalInspection(), new UnusedSymbolLocalInspection(), new UnusedImportLocalInspection()};
@@ -32,7 +30,6 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
protected void setUp() throws Exception {
super.setUp();
myOldLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevel level = getTestName(false).contains("Level6") ? LanguageLevel.JDK_1_6 : LanguageLevel.JDK_1_5;
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(level);
}
@@ -41,10 +38,6 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase {
return JavaSdkImpl.getMockJdk17("java 1.5");
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myOldLanguageLevel);
super.tearDown();
}
public void testReferenceTypeParams() throws Exception { doTest(false); }
public void testOverridingMethods() throws Exception { doTest(false); }
java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java
+2 -10
View File
@@ -8,7 +8,6 @@ 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.JavaPsiFacade;
public class JavadocHighlightingTest extends LightDaemonAnalyzerTestCase {
@@ -99,15 +98,8 @@ public class JavadocHighlightingTest extends LightDaemonAnalyzerTestCase {
public void testMissingReturnDescription() throws Exception {doTest();}
private void doTestWithLangLevel(final LanguageLevel langLevel) throws Exception {
JavaPsiFacade manager = getJavaFacade();
final LanguageLevel effectiveLanguageLevel = LanguageLevelProjectExtension.getInstance(manager.getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(manager.getProject()).setLanguageLevel(langLevel);
try {
doTest();
}
finally {
LanguageLevelProjectExtension.getInstance(manager.getProject()).setLanguageLevel(effectiveLanguageLevel);
}
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(langLevel);
doTest();
}
protected void doTest() throws Exception {
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingJdk7Test.java
-14
View File
@@ -1,7 +1,5 @@
package com.intellij.codeInsight.daemon;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import org.jetbrains.annotations.NonNls;
/**
@@ -10,23 +8,11 @@ import org.jetbrains.annotations.NonNls;
*/
public class LightAdvHighlightingJdk7Test extends LightDaemonAnalyzerTestCase {
@NonNls static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/advHighlighting7";
private LanguageLevel myOldLanguageLevel;
private void doTest(boolean checkWarnings, boolean checkInfos) throws Exception {
doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, checkInfos);
}
protected void setUp() throws Exception {
super.setUp();
myOldLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myOldLanguageLevel);
super.tearDown();
}
public void testSwitchByString() throws Exception {
doTest(true, false);
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingTest.java
+1 -10
View File
@@ -13,7 +13,6 @@ import com.intellij.codeInspection.uncheckedWarnings.UncheckedWarningLocalInspec
import com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclaration;
import com.intellij.codeInspection.unusedImport.UnusedImportLocalInspection;
import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection;
import com.intellij.idea.Bombed;
import com.intellij.lang.Language;
import com.intellij.lang.LanguageAnnotators;
import com.intellij.lang.annotation.AnnotationHolder;
@@ -35,7 +34,6 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
import java.util.Calendar;
import java.util.List;
import static com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase.filter;
@@ -46,7 +44,6 @@ import static com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase.filter;
*/
public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
@NonNls static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/advHighlighting";
private LanguageLevel myOldLanguageLevel;
private UnusedSymbolLocalInspection myUnusedSymbolLocalInspection;
private void doTest(boolean checkWarnings, boolean checkInfos) throws Exception {
@@ -55,14 +52,9 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
protected void setUp() throws Exception {
super.setUp();
myOldLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_4);
setLanguageLevel(LanguageLevel.JDK_1_4);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myOldLanguageLevel);
super.tearDown();
}
protected LocalInspectionTool[] configureLocalInspectionTools() {
myUnusedSymbolLocalInspection = new UnusedSymbolLocalInspection();
@@ -283,7 +275,6 @@ public class LightAdvHighlightingTest extends LightDaemonAnalyzerTestCase {
assertFalse(list.toString(), list.contains(annotator));
}
@Bombed(month = Calendar.DECEMBER, day=31, user="cdr")
public void testSOEForTypeOfHugeBinaryExpression() throws IOException {
configureFromFileText("a.java", "class A { String s = \"\"; }");
assertEmpty(filter(doHighlighting(), HighlightSeverity.ERROR));
java/java-tests/testSrc/com/intellij/codeInsight/daemon/SuppressWarningsTest.java
-14
View File
@@ -8,25 +8,11 @@ import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection;
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 org.jetbrains.annotations.NonNls;
public class SuppressWarningsTest extends LightDaemonAnalyzerTestCase {
private LanguageLevel myPrevLanguageLevel;
@NonNls private static final String BASE_PATH = "/codeInsight/daemonCodeAnalyzer/advHighlighting";
protected void setUp() throws Exception {
super.setUp();
myPrevLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPrevLanguageLevel);
super.tearDown();
}
private void doTest(boolean checkWarnings) throws Exception {
doTest(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false);
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/UnusedImportsTest.java
-5
View File
@@ -12,11 +12,6 @@ public class UnusedImportsTest extends DaemonAnalyzerTestCase {
return new LocalInspectionTool[]{new UnusedImportLocalInspection()};
}
protected void setUp() throws Exception {
super.setUp();
LanguageLevelProjectExtension.getInstance(myJavaFacade.getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
public void test1() throws Exception { doTest(); }
public void test2() throws Exception { doTest(); }
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java
+6 -1
View File
@@ -1,11 +1,16 @@
package com.intellij.codeInsight.daemon.quickFix;
import com.intellij.pom.java.LanguageLevel;
public class ChangeParameterClassTest extends LightQuickFix15TestCase {
public void test() throws Exception {doAllTests();}
public void test() throws Exception {
setLanguageLevel(LanguageLevel.JDK_1_5);
doAllTests();
}
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/changeParameterClass";
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/GenerifyFileTest.java
-15
View File
@@ -2,13 +2,9 @@ package com.intellij.codeInsight.daemon.quickFix;
import com.intellij.codeInspection.LocalInspectionTool;
import com.intellij.codeInspection.uncheckedWarnings.UncheckedWarningLocalInspection;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
public class GenerifyFileTest extends LightQuickFixAvailabilityTestCase {
private LanguageLevel oldLanguageLevel;
protected LocalInspectionTool[] configureLocalInspectionTools() {
return new LocalInspectionTool[] {new UncheckedWarningLocalInspection()};
@@ -16,17 +12,6 @@ public class GenerifyFileTest extends LightQuickFixAvailabilityTestCase {
public void test() throws Exception { doAllTests(); }
protected void setUp() throws Exception {
super.setUp();
oldLanguageLevel = LanguageLevelProjectExtension.getInstance(getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(oldLanguageLevel);
super.tearDown();
}
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/generifyFile";
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java
-13
View File
@@ -2,27 +2,14 @@ package com.intellij.codeInsight.daemon.quickFix;
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;
/**
* @author ven
*/
public abstract class LightQuickFix15TestCase extends LightQuickFixTestCase {
private LanguageLevel myPrevLanguageLevel;
protected void setUp() throws Exception {
super.setUp();
myPrevLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17("java 1.5");
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPrevLanguageLevel);
super.tearDown();
}
}
java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/Suppress15InspectionsTest.java
-7
View File
@@ -11,17 +11,10 @@ import com.intellij.codeInspection.unneededThrows.RedundantThrowsDeclaration;
import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection;
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;
public class Suppress15InspectionsTest extends LightQuickFixTestCase {
protected void setUp() throws Exception {
super.setUp();
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
}
@Override
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17();
java/java-tests/testSrc/com/intellij/codeInsight/intention/AddOnDemandStaticImportActionTest.java
-14
View File
@@ -3,25 +3,11 @@ package com.intellij.codeInsight.intention;
import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
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;
public class AddOnDemandStaticImportActionTest extends LightIntentionActionTestCase {
private LanguageLevel myLanguageLevel;
public void test() throws Exception { doAllTests(); }
protected void setUp() throws Exception {
super.setUp();
myLanguageLevel = LanguageLevelProjectExtension.getInstance(getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(myLanguageLevel);
super.tearDown();
}
protected String getBasePath() {
return "/codeInsight/daemonCodeAnalyzer/quickFix/addOnDemandStaticImport";
}
java/java-tests/testSrc/com/intellij/codeInsight/intention/InvertIfConditionTest.java
-15
View File
@@ -9,13 +9,10 @@
package com.intellij.codeInsight.intention;
import com.intellij.codeInsight.daemon.LightIntentionActionTestCase;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
public class InvertIfConditionTest extends LightIntentionActionTestCase {
private LanguageLevel myPrevLanguageLevel;
protected String getBasePath() {
return BASE_PATH;
@@ -24,18 +21,6 @@ public class InvertIfConditionTest extends LightIntentionActionTestCase {
private static final String BASE_PATH = "/codeInsight/invertIfCondition/";
private boolean myElseOnNewLine;
protected void setUp() throws Exception {
super.setUp();
myPrevLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myPrevLanguageLevel);
super.tearDown();
}
protected boolean shouldBeAvailableAfterExecution() {
return true;
}
java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java
-15
View File
@@ -8,11 +8,9 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.projectRoots.impl.JavaSdkImpl;
import com.intellij.openapi.roots.LanguageLevelProjectExtension;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.wm.impl.ToolWindowHeadlessManagerImpl;
import com.intellij.pom.java.LanguageLevel;
import com.intellij.psi.*;
import com.intellij.slicer.*;
import com.intellij.util.ArrayUtil;
@@ -26,23 +24,10 @@ import java.util.*;
* @author cdr
*/
public class SliceTreeTest extends LightDaemonAnalyzerTestCase {
private LanguageLevel myOldLanguageLevel;
protected void setUp() throws Exception {
super.setUp();
myOldLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_5);
}
@Override protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17("java 1.5");
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myOldLanguageLevel);
super.tearDown();
}
private SliceTreeStructure configureTree(@NonNls final String name) throws Exception {
configureByFile("/codeInsight/slice/backward/"+ name +".java");
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableTest.java
-13
View File
@@ -5,8 +5,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.refactoring.introduceVariable.IntroduceVariableBase;
import com.intellij.refactoring.introduceVariable.IntroduceVariableSettings;
@@ -221,17 +219,6 @@ public class IntroduceVariableTest extends LightCodeInsightTestCase {
checkResultByFile(baseName + ".after.java");
}
private LanguageLevel myOldLanguageLevel;
protected void setUp() throws Exception {
super.setUp();
myOldLanguageLevel = LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).getLanguageLevel();
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(LanguageLevel.JDK_1_7);
}
protected void tearDown() throws Exception {
LanguageLevelProjectExtension.getInstance(getJavaFacade().getProject()).setLanguageLevel(myOldLanguageLevel);
super.tearDown();
}
@Override
protected Sdk getProjectJDK() {
return JavaSdkImpl.getMockJdk17();