From 48c22bd2287fee455b7bbfd640d794de11554fb2 Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 21 Jan 2010 17:49:55 +0300 Subject: [PATCH] fix tests for api usage inspection --- .../java15api/Java15APIUsageInspection.java | 12 ++++++------ .../JavaAPIUsagesInspectionTest.java | 19 ++++++++++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java index 029e2197cc42..6d0e3397f0c4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspection.java @@ -50,16 +50,16 @@ public class Java15APIUsageInspection extends BaseJavaLocalInspectionTool { static { final THashSet ourForbidden14API = new THashSet(1000); initForbiddenApi("api14List.txt", ourForbidden14API); - ourForbiddenAPI.put(LanguageLevel.JDK_1_4, ourForbidden14API); - ourAPIPresentationMap.put(LanguageLevel.JDK_1_4, "1.4"); + ourForbiddenAPI.put(LanguageLevel.JDK_1_3, ourForbidden14API); + ourAPIPresentationMap.put(LanguageLevel.JDK_1_3, "1.4"); final THashSet ourForbidden15API = new THashSet(1000); initForbiddenApi("apiList.txt", ourForbidden15API); - ourForbiddenAPI.put(LanguageLevel.JDK_1_5, ourForbidden15API); - ourAPIPresentationMap.put(LanguageLevel.JDK_1_5, "1.5"); + ourForbiddenAPI.put(LanguageLevel.JDK_1_4, ourForbidden15API); + ourAPIPresentationMap.put(LanguageLevel.JDK_1_4, "1.5"); final THashSet ourForbidden16API = new THashSet(1000); initForbiddenApi("api16List.txt", ourForbidden16API); - ourForbiddenAPI.put(LanguageLevel.JDK_1_6, ourForbidden16API); - ourAPIPresentationMap.put(LanguageLevel.JDK_1_6, "1.6"); + ourForbiddenAPI.put(LanguageLevel.JDK_1_5, ourForbidden16API); + ourAPIPresentationMap.put(LanguageLevel.JDK_1_5, "1.6"); initForbiddenApi("ignore16List.txt", ourIgnored16ClassesAPI); } diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java index 55bcfa7b5ac2..c9b922138c0d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/JavaAPIUsagesInspectionTest.java @@ -8,11 +8,15 @@ import com.intellij.JavaTestUtil; import com.intellij.codeInspection.ex.LocalInspectionToolWrapper; import com.intellij.codeInspection.java15api.Java15APIUsageInspection; import com.intellij.openapi.roots.ContentIterator; +import com.intellij.openapi.roots.LanguageLevelModuleExtension; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.roots.impl.FileIndexImplUtil; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileFilter; +import com.intellij.pom.java.LanguageLevel; import com.intellij.psi.*; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.javadoc.PsiDocTag; @@ -31,7 +35,20 @@ public class JavaAPIUsagesInspectionTest extends InspectionTestCase { } public void testConstructor() throws Exception { - doTest(); + ModifiableRootModel model = ModuleRootManager.getInstance(getModule()).getModifiableModel(); + LanguageLevelModuleExtension extension = model.getModuleExtension(LanguageLevelModuleExtension.class); + final LanguageLevel languageLevel = extension.getLanguageLevel(); + try { + extension.setLanguageLevel(LanguageLevel.JDK_1_4); + model.commit(); + doTest(); + } + finally { + model = ModuleRootManager.getInstance(getModule()).getModifiableModel(); + extension = model.getModuleExtension(LanguageLevelModuleExtension.class); + extension.setLanguageLevel(languageLevel); + model.commit(); + } } public void testIgnored() throws Exception {