diff --git a/java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java b/java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java index 5cf32bef72a9..e10139310ba2 100644 --- a/java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java +++ b/java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java @@ -90,4 +90,8 @@ public final class MockJdkWrapper implements Sdk { public SdkModificator getSdkModificator() { return null; } + + public Sdk getDelegate() { + return myDelegate; + } } \ No newline at end of file diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index 1c957a79cfaf..dcbacb752c4d 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -163,7 +163,7 @@ public class JavaSdkImpl extends JavaSdk { int minorDot = versionString.indexOf('.', dotIdx + 1); if (minorDot > 0) { int minor = Integer.parseInt(versionString.substring(dotIdx + 1, minorDot)); - versionString = String.valueOf(major) + "." + String.valueOf(minor); + versionString = major + "." + minor; } } catch (NumberFormatException e) { @@ -220,13 +220,10 @@ public class JavaSdkImpl extends JavaSdk { private final Map myCachedVersionStrings = new HashMap(); public final String getVersionString(final String sdkHome) { - String versionString; - - if(myCachedVersionStrings.containsKey(sdkHome)) { + if (myCachedVersionStrings.containsKey(sdkHome)) { return myCachedVersionStrings.get(sdkHome); - } else { - versionString = getJdkVersion(sdkHome); } + String versionString = getJdkVersion(sdkHome); if (versionString != null && versionString.length() == 0) { versionString = null; } @@ -268,47 +265,44 @@ public class JavaSdkImpl extends JavaSdk { return jdk; } - public static Sdk getMockJdkCE() { - File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK"); + private static File getPathForJdkNamed(String name) { + File mockJdkCEPath = new File(PathManager.getHomePath(), "java/" + name); if (mockJdkCEPath.exists()) { - return createMockJdk(mockJdkCEPath.getPath(), "java 1.5", getInstance()); + return mockJdkCEPath; } - - mockJdkCEPath = new File(PathManager.getHomePath(), "community/java/mockJDK"); - if (mockJdkCEPath.exists()) { - return createMockJdk(mockJdkCEPath.getPath(), "java 1.5", getInstance()); - } - - return getMockJdk("java 1.5"); - + return new File(PathManager.getHomePath(), "community/java/" + name); } - - public static Sdk getMockJdk(@NonNls String versionName) { - File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK"); - if (mockJdkCEPath.exists()) { - return createMockJdk(mockJdkCEPath.getPath(), versionName, getInstance()); - } - final String forcedPath = System.getProperty("idea.testingFramework.mockJDK"); - String jdkHome = forcedPath != null ? forcedPath : PathManager.getHomePath() + File.separator + "mockJDK"; - return createMockJdk(jdkHome, versionName, getInstance()); - } - - public static Sdk getMockJdk15(@NonNls String versionName) { - File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK"); - if (mockJdkCEPath.exists()) { - return createMockJdk(mockJdkCEPath.getPath(), versionName, getInstance()); - } - String jdkHome = PathManager.getHomePath() + File.separator + "mockJDK-1.5"; - return createMockJdk(jdkHome, versionName, getInstance()); - } - public static Sdk getMockJdk17() { - File mockJdkCEPath = new File(PathManager.getHomePath(), "java/mockJDK-1.7"); - if (mockJdkCEPath.exists()) { - return createMockJdk(mockJdkCEPath.getPath(), "java 1.7", getInstance()); - } - mockJdkCEPath = new File(PathManager.getHomePath(), "community/java/mockJDK-1.7"); - return createMockJdk(mockJdkCEPath.getPath(), "java 1.7", getInstance()); + return getMockJdk17("java 1.7"); + } + public static Sdk getMockJdk17(String name) { + File mockJdkCEPath = getPathForJdkNamed("mockJDK-1.7"); + return createMockJdk(mockJdkCEPath.getPath(), name, getInstance()); + } + public static Sdk getMockJdk14() { + File mockJdkCEPath = getMockJdk14Path(); + return createMockJdk(mockJdkCEPath.getPath(), "java 1.4", getInstance()); + } + + public static File getMockJdk14Path() { + return getPathForJdkNamed("mockJDK-1.4"); + } + + public static Sdk getWebMockJdk17() { + Sdk jdk = getMockJdk17(); + addWebJarsTo(jdk); + return jdk; + } + + public static void addWebJarsTo(Sdk jdk) { + SdkModificator sdkModificator = jdk.getSdkModificator(); + File jar = new File(PathManager.getHomePath(), "lib/jsp-api.jar"); + VirtualFile root = JarFileSystem.getInstance().getJarRootForLocalFile(LocalFileSystem.getInstance().findFileByIoFile(jar)); + sdkModificator.addRoot(root, OrderRootType.CLASSES); + File jar2 = new File(PathManager.getHomePath(), "lib/servlet-api.jar"); + VirtualFile root2 = JarFileSystem.getInstance().getJarRootForLocalFile(LocalFileSystem.getInstance().findFileByIoFile(jar2)); + sdkModificator.addRoot(root2, OrderRootType.CLASSES); + sdkModificator.commitChanges(); } private static Sdk createMockJdk(String jdkHome, final String versionName, JavaSdk javaSdk) { @@ -341,9 +335,7 @@ public class JavaSdkImpl extends JavaSdk { FileFilter jarFileFilter = new FileFilter(){ @SuppressWarnings({"HardCodedStringLiteral"}) public boolean accept(File f){ - if (f.isDirectory()) return false; - if (f.getName().endsWith(".jar")) return true; - return false; + return !f.isDirectory() && f.getName().endsWith(".jar"); } }; diff --git a/java/java-tests/testData/inspection/deadCode/enumInstantiation/ext_src/Test1.java b/java/java-tests/testData/inspection/deadCode/enumInstantiation/ext_src/Test1.java index d0490b228bfe..1d1ee58d6909 100644 --- a/java/java-tests/testData/inspection/deadCode/enumInstantiation/ext_src/Test1.java +++ b/java/java-tests/testData/inspection/deadCode/enumInstantiation/ext_src/Test1.java @@ -1,7 +1,7 @@ -public void Test1 { +public class Test1 { void foo() { if (Test.FIRST.invert() != Test.SECOND) { //assert } } -} \ No newline at end of file +} diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java index 88a10050e402..c70a8f9bd713 100644 --- a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/after/ComponentCaller.java @@ -1,5 +1,6 @@ import javax.swing.*; import java.awt.*; +import javax.swing.*; public class ComponentCaller extends JComponent{ Component1 component1; diff --git a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java index 88a10050e402..c70a8f9bd713 100644 --- a/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java +++ b/java/java-tests/testData/refactoring/turnRefsToSuper/fieldTest/before/ComponentCaller.java @@ -1,5 +1,6 @@ import javax.swing.*; import java.awt.*; +import javax.swing.*; public class ComponentCaller extends JComponent{ Component1 component1; diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java index 89dac789b5e9..585b55849dd3 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/ClassNameCompletionTest.java @@ -33,7 +33,7 @@ public class ClassNameCompletionTest extends CompletionTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected void tearDown() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java index 18fe48c5e674..3240ba305ad4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/CompletionSortingTestCase.java @@ -41,7 +41,7 @@ public abstract class CompletionSortingTestCase extends LightCompletionTestCase @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected abstract String getBasePath(); diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavySmartTypeCompletion15Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavySmartTypeCompletion15Test.java index 95acb8999c9e..e5ad185ef108 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavySmartTypeCompletion15Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/HeavySmartTypeCompletion15Test.java @@ -90,6 +90,6 @@ public class HeavySmartTypeCompletion15Test extends CompletionTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java index 1cd9f5cff3a8..a6778c702fc5 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SecondSmartTypeCompletionTest.java @@ -190,6 +190,6 @@ public class SecondSmartTypeCompletionTest extends LightCompletionTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java index 9932fd937875..b90900f6fd95 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/completion/SmartTypeCompletionTest.java @@ -1077,7 +1077,7 @@ public class SmartTypeCompletionTest extends LightCompletionTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void select() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java index ba39b86c07fb..1f6af1504839 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/AdvHighlightingTest.java @@ -10,19 +10,21 @@ import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.editor.markup.EffectType; import com.intellij.openapi.editor.markup.TextAttributes; -import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.projectRoots.SdkModificator; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; -import com.intellij.openapi.roots.*; +import com.intellij.openapi.roots.LanguageLevelProjectExtension; +import com.intellij.openapi.roots.ModifiableRootModel; +import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.packageDependencies.DependencyValidationManager; import com.intellij.pom.java.LanguageLevel; -import com.intellij.psi.*; -import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiClassType; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiJavaFile; import com.intellij.psi.search.scope.packageSet.NamedScope; import com.intellij.psi.search.scope.packageSet.NamedScopeManager; import com.intellij.psi.search.scope.packageSet.NamedScopesHolder; @@ -64,7 +66,7 @@ public class AdvHighlightingTest extends DaemonAnalyzerTestCase { protected Sdk getTestProjectJdk() { @NonNls boolean is50 = "StaticImportConflict".equals(getTestName(false)); LanguageLevelProjectExtension.getInstance(myProject).setLanguageLevel(is50 ? LanguageLevel.JDK_1_5 : LanguageLevel.JDK_1_4); - return is50 ? JavaSdkImpl.getMockJdk15("java 1.5") : JavaSdkImpl.getMockJdk("java 1.4"); + return is50 ? JavaSdkImpl.getMockJdk17("java 1.5") : JavaSdkImpl.getMockJdk14(); } public void testStaticImportConflict() throws Exception { doTest(BASE_PATH+"/staticImportConflict/Usage.java", BASE_PATH+"/staticImportConflict", false, false); } @@ -147,10 +149,10 @@ public class AdvHighlightingTest extends DaemonAnalyzerTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { final ModifiableRootModel rootModel4 = rootManager4.getModifiableModel(); - rootModel4.setSdk(JavaSdkImpl.getMockJdk("java 1.4")); + rootModel4.setSdk(JavaSdkImpl.getMockJdk17("java 1.4")); rootModel4.commit(); final ModifiableRootModel rootModel5 = rootManager5.getModifiableModel(); - rootModel5.setSdk(JavaSdkImpl.getMockJdk15("java 1.5")); + rootModel5.setSdk(JavaSdkImpl.getMockJdk17("java 1.5")); rootModel5.addModuleOrderEntry(java4); rootModel5.commit(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java index 947fbdf48892..8a1eb48987eb 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/GenericsHighlightingTest.java @@ -38,7 +38,7 @@ public class GenericsHighlightingTest extends LightDaemonAnalyzerTestCase { } @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected void tearDown() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java index 98fd729c0174..adb1fdd49dbf 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/ImportHelperTest.java @@ -135,7 +135,7 @@ public class ImportHelperTest extends DaemonAnalyzerTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("mock 1.5"); + return JavaSdkImpl.getMockJdk17("mock 1.5"); } private void checkAddImport(PsiJavaFile file, String fqn, String... expectedOrder) { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java index 7f9dd579eca2..28023f3788f0 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/JavadocHighlightingTest.java @@ -115,6 +115,6 @@ public class JavadocHighlightingTest extends LightDaemonAnalyzerTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java index 00c036b886db..5f44831ec83d 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/LightAdvHighlightingPerformanceTest.java @@ -8,15 +8,21 @@ import com.intellij.lang.LanguageAnnotators; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.lang.injection.MultiHostInjector; import com.intellij.openapi.Disposable; +import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.extensions.ExtensionPoint; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.impl.source.tree.injected.JavaConcatenationInjectorManager; import com.intellij.testFramework.PlatformTestUtil; +import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; +import com.intellij.util.Function; import org.jetbrains.annotations.NonNls; import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; import java.util.List; public class LightAdvHighlightingPerformanceTest extends LightDaemonAnalyzerTestCase { @@ -31,6 +37,7 @@ public class LightAdvHighlightingPerformanceTest extends LightDaemonAnalyzerTest Disposer.register(my, BlockExtensions.create(Extensions.getArea(getProject()).getExtensionPoint(MultiHostInjector.MULTIHOST_INJECTOR_EP_NAME))); IntentionManager.getInstance().getAvailableIntentionActions(); // hack to avoid slowdowns in PyExtensionFactory + PathManagerEx.getTestDataPath(); // to cache stuff } @Override @@ -73,6 +80,7 @@ public class LightAdvHighlightingPerformanceTest extends LightDaemonAnalyzerTest PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); getFile().getText(); //to load text + CodeInsightTestFixtureImpl.ensureIndexesUpToDate(getProject()); final List infos = new ArrayList(); PlatformTestUtil.assertTiming("Performance failed", maxMillis, new Runnable() { @@ -88,10 +96,32 @@ public class LightAdvHighlightingPerformanceTest extends LightDaemonAnalyzerTest public void testaThinlet() throws Exception { List errors = doTest(24000 - JobSchedulerImpl.CORES_COUNT * 1000); + dump("thinlet", errors); assertEquals(1157, errors.size()); } + + private static void dump(String msg, List errors) { + if (true) return; + Collections.sort(errors, new Comparator() { + @Override + public int compare(HighlightInfo o1, HighlightInfo o2) { + return o1.toString().compareTo(o2.toString()); + } + }); + String s = StringUtil.join(errors, new Function() { + @Override + public String fun(HighlightInfo info) { + return info.toString(); + } + }, "\n"); + System.out.println(msg+":\n-----------------------------------------"); + System.out.println(s); + System.out.println("\n--------------------------------------------"); + } + public void testaClassLoader() throws Exception { List errors = doTest(10000 - JobSchedulerImpl.CORES_COUNT * 1000); + dump("classloader", errors); assertEquals(176, errors.size()); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/SuppressWarningsTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/SuppressWarningsTest.java index 0514199a8923..204066140e46 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/SuppressWarningsTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/SuppressWarningsTest.java @@ -32,7 +32,7 @@ public class SuppressWarningsTest extends LightDaemonAnalyzerTestCase { } @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected LocalInspectionTool[] configureLocalInspectionTools() { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java index 5e05e9e19228..ecc48a5f0196 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ChangeParameterClassTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; -public class ChangeParameterClassTest extends LightQuickFixTestCase { +public class ChangeParameterClassTest extends LightQuickFix15TestCase { public void test() throws Exception {doAllTests();} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromParameterTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromParameterTest.java index c32f690d8e3a..f7da450e71c4 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/CreateFieldFromParameterTest.java @@ -29,6 +29,6 @@ public class CreateFieldFromParameterTest extends LightIntentionActionTestCase { } @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java index 296106eb1593..f3bf91546b20 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/LightQuickFix15TestCase.java @@ -18,7 +18,7 @@ public abstract class LightQuickFix15TestCase extends LightQuickFixTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected void tearDown() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java index ab9a554dde1f..da43ad02b469 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/MethodReturnTest.java @@ -3,7 +3,7 @@ package com.intellij.codeInsight.daemon.quickFix; -public class MethodReturnTest extends LightQuickFixTestCase { +public class MethodReturnTest extends LightQuickFix15TestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java index 2de4a80c9604..a13e77071236 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/ReplaceAddAllArrayToCollectionsFixTest.java @@ -18,6 +18,6 @@ public class ReplaceAddAllArrayToCollectionsFixTest extends LightQuickFixTestCas @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java index 7db939ba7c6f..cb47751c0aab 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithArrayFixTest.java @@ -7,7 +7,7 @@ package com.intellij.codeInsight.daemon.quickFix; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; -public class SurroundWithArrayFixTest extends LightQuickFixTestCase { +public class SurroundWithArrayFixTest extends LightQuickFix15TestCase { public void test() throws Exception { doAllTests(); } @@ -18,6 +18,6 @@ public class SurroundWithArrayFixTest extends LightQuickFixTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } -} \ No newline at end of file +} diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java index 4b4c21cc77f1..15010f1c7aae 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/SurroundWithIfFixTest.java @@ -25,6 +25,6 @@ public class SurroundWithIfFixTest extends LightQuickFixTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java index 2bb0d56a0f09..3b9c7e7fe90c 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/quickFix/VariableTypeFromCallTest.java @@ -16,7 +16,7 @@ package com.intellij.codeInsight.daemon.quickFix; -public class VariableTypeFromCallTest extends LightQuickFixTestCase { +public class VariableTypeFromCallTest extends LightQuickFix15TestCase { public void test() throws Exception { doAllTests(); } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceBackwardTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceBackwardTest.java index d17326380aa8..2b6cabcd6864 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceBackwardTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceBackwardTest.java @@ -34,7 +34,7 @@ public class SliceBackwardTest extends DaemonAnalyzerTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void dotest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceForwardTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceForwardTest.java index f5f42c93f46f..5eeb74e1a597 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceForwardTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceForwardTest.java @@ -26,7 +26,7 @@ public class SliceForwardTest extends DaemonAnalyzerTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void dotest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java index 93574ecb5274..480883a76d1e 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/slice/SliceTreeTest.java @@ -35,7 +35,7 @@ public class SliceTreeTest extends LightDaemonAnalyzerTestCase { } @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected void tearDown() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/UnusedDeclarationTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/UnusedDeclarationTest.java index 2523b8e5fed8..a12c16397f57 100644 --- a/java/java-tests/testSrc/com/intellij/codeInspection/UnusedDeclarationTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInspection/UnusedDeclarationTest.java @@ -21,7 +21,6 @@ public class UnusedDeclarationTest extends InspectionTestCase { protected void setUp() throws Exception { super.setUp(); myTool = new UnusedDeclarationInspection(); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_3); } private void doTest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java b/java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java index 17b27fabe46a..1f25868bdfaa 100644 --- a/java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java +++ b/java/java-tests/testSrc/com/intellij/dependencies/CyclicDependenciesTest.java @@ -25,7 +25,7 @@ public class CyclicDependenciesTest extends PsiTestCase { public void run() { try { String root = JavaTestUtil.getJavaTestDataPath() + "/dependencies/cycle/" + getTestName(true); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch (Exception e) { diff --git a/java/java-tests/testSrc/com/intellij/dependencies/UsagesInAnalyzingDependenciesTest.java b/java/java-tests/testSrc/com/intellij/dependencies/UsagesInAnalyzingDependenciesTest.java index c10a04563731..8c42f1029bd6 100644 --- a/java/java-tests/testSrc/com/intellij/dependencies/UsagesInAnalyzingDependenciesTest.java +++ b/java/java-tests/testSrc/com/intellij/dependencies/UsagesInAnalyzingDependenciesTest.java @@ -37,7 +37,7 @@ public class UsagesInAnalyzingDependenciesTest extends PsiTestCase{ public void run() { try{ String root = JavaTestUtil.getJavaTestDataPath() + "/dependencies/search/" + getTestName(true); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch(Exception e){ diff --git a/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java b/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java index eb79e4972970..892251b1d665 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java +++ b/java/java-tests/testSrc/com/intellij/projectView/BaseProjectViewTestCase.java @@ -84,11 +84,11 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase { return pane; } - protected void assertStructureEqual(PsiDirectory packageDirectory, String expected) { + protected void assertStructureEqual(PsiDirectory packageDirectory, @NonNls String expected) { assertStructureEqual(packageDirectory, expected, 17, myStructure); } - protected void assertStructureEqual(PsiDirectory packageDirectory, String expected, int maxRowCount) { + protected void assertStructureEqual(PsiDirectory packageDirectory, @NonNls String expected, int maxRowCount) { assertStructureEqual(packageDirectory, expected, maxRowCount, myStructure); } @@ -100,7 +100,7 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase { return (AbstractProjectTreeStructure)myStructure; } - protected void assertStructureEqual(String expected) { + protected void assertStructureEqual(@NonNls String expected) { assertStructureEqual(myStructure.getRootElement(), expected); } @@ -289,7 +289,7 @@ public abstract class BaseProjectViewTestCase extends TestSourceBasedTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdkCE(); + return JavaSdkImpl.getMockJdk17(); } protected static void sortClasses(final PsiClass[] classes) { diff --git a/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java index 63e696a320a2..5dc496a27cdb 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/JavaTreeStructureTest.java @@ -212,7 +212,7 @@ public class JavaTreeStructureTest extends TestSourceBasedTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdkCE(); + return JavaSdkImpl.getMockJdk17(); } } diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java index 67f1e0a34eed..af734635fbcf 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectTreeStructureTest.java @@ -35,7 +35,7 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { " Class4.java\n"); assertStructureEqual("Project\n" + " External Libraries\n" + - " Library: < java 1.5 >\n" + + " Library: < java 1.7 >\n" + " annotations.jar\n" + " classpath.index\n" + " META-INF\n" + @@ -65,7 +65,7 @@ public class ProjectTreeStructureTest extends BaseProjectViewTestCase { assertStructureEqual("Project\n" + " External Libraries\n" + - " Library: < java 1.5 >\n" + + " Library: < java 1.7 >\n" + " annotations.jar\n" + " classpath.index\n" + " META-INF\n" + diff --git a/java/java-tests/testSrc/com/intellij/projectView/ProjectViewSwitchingTest.java b/java/java-tests/testSrc/com/intellij/projectView/ProjectViewSwitchingTest.java index 02e14bd7565f..68941178b93c 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/ProjectViewSwitchingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/ProjectViewSwitchingTest.java @@ -64,7 +64,7 @@ public class ProjectViewSwitchingTest extends TestSourceBasedTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdkCE(); + return JavaSdkImpl.getMockJdk17(); } } diff --git a/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java b/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java index 53309e3f43d6..d3373e276197 100644 --- a/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java +++ b/java/java-tests/testSrc/com/intellij/projectView/StructureViewUpdatingTest.java @@ -245,7 +245,7 @@ public class StructureViewUpdatingTest extends TestSourceBasedTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdkCE(); + return JavaSdkImpl.getMockJdk17(); } } diff --git a/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java b/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java index 6129c18e0008..1de2f7a3c630 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ArrayIndexOutOfBoundsTest.java @@ -36,7 +36,7 @@ public class ArrayIndexOutOfBoundsTest extends PsiTestCase { public void run() { try{ String root = JavaTestUtil.getJavaTestDataPath() + "/psi/arrayIndexOutOfBounds/src"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); myProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch(Exception e){ diff --git a/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java index 6856d04ecd3b..63078d13c71b 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ClsBuilderTest.java @@ -24,7 +24,7 @@ import java.io.IOException; public class ClsBuilderTest extends LightIdeaTestCase { protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("1.5"); + return JavaSdkImpl.getMockJdk17(); } public void testUtilList() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java b/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java index 7becce1c59e1..12d7fa72fc05 100644 --- a/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java @@ -24,7 +24,7 @@ public class ModifyAnnotationsTest extends PsiTestCase { public void run() { try { String root = JavaTestUtil.getJavaTestDataPath() + "/psi/repositoryUse/modifyAnnotations"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk15("mock 1.5")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17("mock 1.5")); PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch(Exception e){ @@ -36,7 +36,7 @@ public class ModifyAnnotationsTest extends PsiTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("mock 1.5"); + return JavaSdkImpl.getMockJdk17("mock 1.5"); } public void testReplaceAnnotation() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java index 6782516c8291..609b41c5b308 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/AnonymousToInnerTest.java @@ -19,7 +19,7 @@ public class AnonymousToInnerTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testGenericTypeParameters() throws Exception { // IDEADEV-29446 diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java index e27c45a45726..546d947a8acc 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTargetTest.java @@ -37,7 +37,7 @@ public class ChangeSignatureTargetTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void doTest(String expectedMemberName) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java index 4dd274034fdf..e812fb1e4483 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java @@ -38,7 +38,7 @@ public class CopyClassTest extends CodeInsightTestCase { private void doTest(final String oldName, final String copyName) throws Exception { String root = JavaTestUtil.getJavaTestDataPath() + "/refactoring/copyClass/" + getTestName(true); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk15("java 1.5")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17("java 1.5")); myRootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); performAction(oldName, copyName); @@ -70,7 +70,7 @@ public class CopyClassTest extends CodeInsightTestCase { private void doMultifileTest() throws Exception { String root = JavaTestUtil.getJavaTestDataPath() + "/refactoring/copyClass/multifile/" + getTestName(true); String rootBefore = root + "/before"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, rootBefore, myFilesToDelete); final HashMap map = new HashMap(); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethod15Test.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethod15Test.java index 5a700c773650..31a250a06b54 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethod15Test.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethod15Test.java @@ -27,6 +27,6 @@ public class ExtractMethod15Test extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java index 55813fb2b502..873f5b27ffd3 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodTest.java @@ -31,7 +31,7 @@ public class ExtractMethodTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testExitPoints1() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java index d33ac6575b80..dca6ce459b3b 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java @@ -63,7 +63,7 @@ public class ExtractSuperClassTest extends CodeInsightTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("mock 1.5"); + return JavaSdkImpl.getMockJdk17(); } @Override @@ -80,7 +80,7 @@ public class ExtractSuperClassTest extends CodeInsightTestCase { private void doTest(@NonNls final String className, @NonNls final String newClassName, RefactoringTestUtil.MemberDescriptor... membersToFind) throws Exception { String rootBefore = getRoot() + "/before"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.5")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk14()); final VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, rootBefore, myFilesToDelete); PsiClass psiClass = myJavaFacade.findClass(className, ProjectScope.getAllScope(myProject)); assertNotNull(psiClass); @@ -100,4 +100,4 @@ public class ExtractSuperClassTest extends CodeInsightTestCase { myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); } -} \ No newline at end of file +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesBaseTest.java b/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesBaseTest.java index 0cd1c520e604..bb057fe9817b 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesBaseTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/FindMethodDuplicatesBaseTest.java @@ -21,7 +21,7 @@ public abstract class FindMethodDuplicatesBaseTest extends LightCodeInsightTestC } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected void doTest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java index e3b45d35ca2f..9d93d39a8288 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java @@ -24,7 +24,7 @@ public class InheritanceToDelegationTest extends MultiFileTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected String getTestRoot() { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java index ef07ab92a47d..81df809876c2 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java @@ -23,7 +23,7 @@ public class InlineSuperClassTest extends MultiFileTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void doTest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java index 5f017f4591b7..de321991b063 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceConstantTest.java @@ -88,6 +88,6 @@ public class IntroduceConstantTest extends LightCodeInsightTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java index 56fefe62646f..de6dd6214841 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceFieldInSameClassTest.java @@ -19,7 +19,7 @@ public class IntroduceFieldInSameClassTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testInClassInitializer () throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java index 02ca2417184e..983646c48293 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterTest.java @@ -328,6 +328,6 @@ public class IntroduceParameterTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java index e9cc0d4660ef..abe24cded051 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassTest.java @@ -75,7 +75,7 @@ public class MoveClassTest extends CodeInsightTestCase { String root = JavaTestUtil.getJavaTestDataPath() + "/refactoring/moveClass/" + testName; String rootBefore = root + "/before"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, rootBefore, myFilesToDelete); performAction(classNames, newPackageName); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java index 635ec1e43ab3..a9a38fb0812e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveClassToInnerTest.java @@ -120,7 +120,7 @@ public class MoveClassToInnerTest extends CodeInsightTestCase { private VirtualFile prepareTest() throws Exception { String rootBefore = getRoot() + "/before"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); return PsiTestUtil.createTestProjectStructure(myProject, myModule, rootBefore, myFilesToDelete); } @@ -153,4 +153,4 @@ public class MoveClassToInnerTest extends CodeInsightTestCase { PsiDocumentManager.getInstance(myProject).commitAllDocuments(); FileDocumentManager.getInstance().saveAllDocuments(); } -} \ No newline at end of file +} diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java index d5fe5eedc979..3a53f431baf2 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java @@ -129,7 +129,7 @@ public class PullUpTest extends LightCodeInsightTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("50"); + return JavaSdkImpl.getMockJdk17("50"); } @Override diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java index 50b381ea2885..cd7727bfec76 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java @@ -28,7 +28,7 @@ public class PushDownMultifileTest extends MultiFileTestCase { } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void doTest() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java index c82d15571fae..25ede307809d 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java @@ -105,6 +105,6 @@ public class RenameClassTest extends MultiFileTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java index 720983a9c68c..b3024ee49b8a 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java @@ -180,7 +180,7 @@ public class RenameCollisionsTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testAllUsagesInCode() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/SuggestedParamTypesTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SuggestedParamTypesTest.java index bf0e39c3baab..881ca1b180e3 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/SuggestedParamTypesTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/SuggestedParamTypesTest.java @@ -48,7 +48,7 @@ public class SuggestedParamTypesTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testPostfixExprUsedAsOutput() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java index 5f0b5160e7c1..2bdd98fd9553 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java @@ -160,6 +160,6 @@ public class TurnRefsToSuperTest extends MultiFileTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java index 968375b7afa2..e13859ab45b9 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java @@ -30,7 +30,7 @@ import java.io.PrintWriter; public class TypeCookTest extends MultiFileTestCase { protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } @Override diff --git a/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java b/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java index 6a327a8503dd..4a921b146d09 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java @@ -26,7 +26,7 @@ public class WrapReturnValueTest extends MultiFileTestCase{ } protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void doTest(final boolean existing) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java b/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java index 7e4a8a677e43..a3712f47e33b 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java @@ -22,7 +22,7 @@ public class ChangeClassSignatureTest extends LightCodeInsightTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testNoParams() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java index 1c06fd5184a9..9257fd73d8b4 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java @@ -27,7 +27,7 @@ public class InlineConstantFieldTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void doTest() throws Exception { 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 54e15ee65e52..69adf382f930 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLocalTest.java @@ -23,7 +23,7 @@ public class InlineLocalTest extends LightCodeInsightTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testInference () throws Exception { 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 6712233eab3a..ddbcbc3c359e 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineMethodTest.java @@ -159,7 +159,7 @@ public class InlineMethodTest extends LightCodeInsightTestCase { @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } private void doTest() throws Exception { 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 65a9b5189039..673361a21540 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineParameterTest.java @@ -21,7 +21,7 @@ public class InlineParameterTest extends LightCodeInsightTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testSameValue() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java index 0ac1c8c4bfd9..ddda0445876c 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassMultifileTest.java @@ -38,7 +38,7 @@ public class InlineToAnonymousClassMultifileTest extends CodeInsightTestCase { private void doTest(String className) throws Exception { String rootBefore = getRoot() + "/before"; - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); final VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, rootBefore, myFilesToDelete); PsiClass classToInline = myJavaFacade.findClass(className, ProjectScope.getAllScope(myProject)); assertEquals(null, InlineToAnonymousClassHandler.getCannotInlineMessage(classToInline)); @@ -55,4 +55,4 @@ public class InlineToAnonymousClassMultifileTest extends CodeInsightTestCase { myProject.getComponent(PostprocessReformattingAspect.class).doPostponedFormatting(); IdeaTestUtil.assertDirectoriesEqual(rootDir2, rootDir, IdeaTestUtil.CVS_FILE_FILTER); } -} \ No newline at end of file +} 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 01f0a50c5baf..a6958aa8e7f2 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineToAnonymousClassTest.java @@ -25,7 +25,7 @@ public class InlineToAnonymousClassTest extends LightCodeInsightTestCase { } protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void testSimple() throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java b/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java index e5eeba378dba..71d08e11a0e2 100644 --- a/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java @@ -20,7 +20,7 @@ public class InheritedJdkTest extends ModuleTestCase { } public void test1() throws Exception { - final Sdk jdk = JavaSdkImpl.getMockJdk("java 1.4"); + final Sdk jdk = JavaSdkImpl.getMockJdk17("java 1.4"); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { ProjectJdkTable.getInstance().addJdk(jdk); @@ -39,7 +39,7 @@ public class InheritedJdkTest extends ModuleTestCase { }); assertTrue("JDK is inherited after explicit inheritSdk()", rootManager.isSdkInherited()); - assertTrue("Correct jdk inherited", jdk.equals(rootManager.getSdk())); + assertEquals("Correct jdk inherited", jdk, rootManager.getSdk()); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { @@ -50,9 +50,9 @@ public class InheritedJdkTest extends ModuleTestCase { }); assertFalse("JDK is not inherited after setJdk(null)", rootManager.isSdkInherited()); - assertTrue("No JDK assigned", null == rootManager.getSdk()); + assertNull("No JDK assigned", rootManager.getSdk()); - final Sdk jdk1 = JavaSdkImpl.getMockJdk("jjj"); + final Sdk jdk1 = JavaSdkImpl.getMockJdk17("jjj"); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { ProjectJdkTable.getInstance().addJdk(jdk1); @@ -67,7 +67,7 @@ public class InheritedJdkTest extends ModuleTestCase { }); assertFalse("JDK is not inherited after setJdk(jdk1)", rootManager.isSdkInherited()); - assertTrue("jdk1 is assigned", jdk1.equals(rootManager.getSdk())); + assertEquals("jdk1 is assigned", jdk1, rootManager.getSdk()); } public void test2() throws Exception { @@ -81,9 +81,9 @@ public class InheritedJdkTest extends ModuleTestCase { }); assertTrue("JDK is inherited after inheritSdk()", rootManager.isSdkInherited()); - assertTrue("No JDK assigned", null == rootManager.getSdk()); + assertNull("No JDK assigned", rootManager.getSdk()); - final Sdk mockJdk = JavaSdkImpl.getMockJdk("mock 1.4"); + final Sdk mockJdk = JavaSdkImpl.getMockJdk17("mock 1.4"); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { ProjectJdkTable.getInstance().addJdk(mockJdk); @@ -98,7 +98,7 @@ public class InheritedJdkTest extends ModuleTestCase { }); assertTrue(rootManager.isSdkInherited()); - assertTrue("mockJdk inherited", mockJdk.equals(rootManager.getSdk())); + assertEquals("mockJdk inherited", mockJdk, rootManager.getSdk()); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { @@ -115,7 +115,7 @@ public class InheritedJdkTest extends ModuleTestCase { }, null)); assertNull("Non-existing JDK", rootManager.getSdk()); - final Sdk jdk1 = JavaSdkImpl.getMockJdk("jdk1"); + final Sdk jdk1 = JavaSdkImpl.getMockJdk17("jdk1"); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { ProjectJdkTable.getInstance().addJdk(jdk1); @@ -124,6 +124,6 @@ public class InheritedJdkTest extends ModuleTestCase { assertTrue(rootManager.isSdkInherited()); assertNotNull("JDK appeared", rootManager.getSdk()); - assertTrue("jdk1 found", jdk1.equals(rootManager.getSdk())); + assertEquals("jdk1 found", jdk1, rootManager.getSdk()); } } diff --git a/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java b/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java index e223048db447..b52b91b3b495 100644 --- a/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/ModuleRootsExternalizationTest.java @@ -58,20 +58,20 @@ public class ModuleRootsExternalizationTest extends ModuleTestCase { File classes = new File(content, "classes"); File testClasses = new File(content, "testClasses"); final VirtualFile contentFile = LocalFileSystem.getInstance().findFileByIoFile(content); - assertTrue(contentFile != null); + assertNotNull(contentFile); final VirtualFile sourceFile = LocalFileSystem.getInstance().findFileByIoFile(source); - assertTrue(sourceFile != null); + assertNotNull(sourceFile); final VirtualFile testSourceFile = LocalFileSystem.getInstance().findFileByIoFile(testSource); - assertTrue(testSourceFile != null); + assertNotNull(testSourceFile); final VirtualFile excludeFile = LocalFileSystem.getInstance().findFileByIoFile(exclude); - assertTrue(excludeFile != null); + assertNotNull(excludeFile); final VirtualFile classesFile = LocalFileSystem.getInstance().findFileByIoFile(classes); - assertTrue(classesFile != null); + assertNotNull(classesFile); final VirtualFile testClassesFile = LocalFileSystem.getInstance().findFileByIoFile(testClasses); - assertTrue(testClassesFile != null); + assertNotNull(testClassesFile); final File moduleFile = new File(content, "test.iml"); final Module module = createModule(moduleFile); @@ -85,7 +85,7 @@ public class ModuleRootsExternalizationTest extends ModuleTestCase { compilerModuleExtension.setCompilerOutputPath(classesFile); compilerModuleExtension.setCompilerOutputPathForTests(testClassesFile); compilerModuleExtension.inheritCompilerOutputPath(false); - rootModel.setSdk(JavaSdkImpl.getMockJdk("java 1.4")); + rootModel.setSdk(JavaSdkImpl.getMockJdk17()); contentEntry.addSourceFolder(sourceFile, false); contentEntry.addSourceFolder(testSourceFile, true); contentEntry.addExcludeFolder(excludeFile); @@ -108,7 +108,7 @@ public class ModuleRootsExternalizationTest extends ModuleTestCase { "" + "" + "" + - "" + + "" + "" + "", module); @@ -142,8 +142,8 @@ public class ModuleRootsExternalizationTest extends ModuleTestCase { }); final Iterator libraryIterator = moduleLibraryTable.getLibraryIterator(); - assertTrue(libraryIterator.next().equals(unnamedLibrary)); - assertTrue(libraryIterator.next().equals(namedLibrary)); + assertEquals(libraryIterator.next(), unnamedLibrary); + assertEquals(libraryIterator.next(), namedLibrary); ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { diff --git a/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java b/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java index 74f791a9d5b4..5827c4bbaf76 100644 --- a/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java @@ -24,7 +24,7 @@ import java.io.IOException; */ public class RootsChangedTest extends ModuleTestCase { private MessageBusConnection myConnection; - private RootsChangedTest.MyModuleRootListener myModuleRootListener; + private MyModuleRootListener myModuleRootListener; protected void setUp() throws Exception { super.setUp(); @@ -64,7 +64,7 @@ public class RootsChangedTest extends ModuleTestCase { final Module moduleB = createModule("b.iml"); assertEventsCount(2); - final Sdk jdk = JavaSdkImpl.getMockJdk("AAA"); + final Sdk jdk = JavaSdkImpl.getMockJdk17(); ProjectJdkTable.getInstance().addJdk(jdk); assertEventsCount(0); @@ -89,11 +89,11 @@ public class RootsChangedTest extends ModuleTestCase { final Module moduleB = createModule("b.iml"); assertEventsCount(2); - final Sdk jdk = JavaSdkImpl.getMockJdk("AAA"); + final Sdk jdk = JavaSdkImpl.getMockJdk17("AAA"); ProjectJdkTable.getInstance().addJdk(jdk); assertEventsCount(0); - final Sdk jdkBBB = JavaSdkImpl.getMockJdk("BBB"); + final Sdk jdkBBB = JavaSdkImpl.getMockJdk17("BBB"); ProjectJdkTable.getInstance().addJdk(jdk); assertEventsCount(0); diff --git a/java/mockJDK-1.4/jre/lib/rt.jar b/java/mockJDK-1.4/jre/lib/rt.jar new file mode 100644 index 000000000000..023209857448 Binary files /dev/null and b/java/mockJDK-1.4/jre/lib/rt.jar differ diff --git a/java/mockJDK-1.4/src.zip b/java/mockJDK-1.4/src.zip new file mode 100644 index 000000000000..12c6173f93ba Binary files /dev/null and b/java/mockJDK-1.4/src.zip differ diff --git a/java/mockJDK-1.7/jre/lib/rt.jar b/java/mockJDK-1.7/jre/lib/rt.jar index fdbd1eb22b7a..78062deef86e 100644 Binary files a/java/mockJDK-1.7/jre/lib/rt.jar and b/java/mockJDK-1.7/jre/lib/rt.jar differ diff --git a/java/mockJDK-1.7/lib/jsp-api.jar b/java/mockJDK-1.7/lib/jsp-api.jar deleted file mode 100644 index 95832ba0a217..000000000000 Binary files a/java/mockJDK-1.7/lib/jsp-api.jar and /dev/null differ diff --git a/java/mockJDK-1.7/lib/servlet-api.jar b/java/mockJDK-1.7/lib/servlet-api.jar deleted file mode 100644 index bc0dea064501..000000000000 Binary files a/java/mockJDK-1.7/lib/servlet-api.jar and /dev/null differ diff --git a/java/mockJDK/jre/lib/annotations.jar b/java/mockJDK/jre/lib/annotations.jar deleted file mode 100644 index 5de67805f7b7..000000000000 Binary files a/java/mockJDK/jre/lib/annotations.jar and /dev/null differ diff --git a/java/mockJDK/jre/lib/rt.jar b/java/mockJDK/jre/lib/rt.jar deleted file mode 100644 index ae8e6b0b6381..000000000000 Binary files a/java/mockJDK/jre/lib/rt.jar and /dev/null differ diff --git a/java/mockJDK/src.zip b/java/mockJDK/src.zip deleted file mode 100644 index 4ac79dc0a0bd..000000000000 Binary files a/java/mockJDK/src.zip and /dev/null differ diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java index 16b8655eaf1f..57de90c29be5 100644 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestCase.java @@ -36,7 +36,7 @@ import org.jetbrains.annotations.NonNls; @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk("java 1.4"); + return JavaSdkImpl.getMockJdk17(); } @Override diff --git a/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java b/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java index c8a758ca7d24..a70d766acb1c 100644 --- a/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java @@ -24,15 +24,20 @@ */ package com.intellij.testFramework; +import com.intellij.ExtensionPoints; import com.intellij.analysis.AnalysisScope; import com.intellij.codeInspection.GlobalInspectionTool; import com.intellij.codeInspection.InspectionManager; import com.intellij.codeInspection.LocalInspectionTool; +import com.intellij.codeInspection.deadCode.UnusedCodeExtension; import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection; import com.intellij.codeInspection.ex.*; +import com.intellij.codeInspection.reference.RefElement; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.PathManagerEx; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.extensions.ExtensionPoint; +import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.ContentEntry; @@ -40,16 +45,23 @@ import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.vfs.LocalFileSystem; +import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.java.LanguageLevel; +import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; +import com.intellij.psi.util.PsiUtil; +import org.jdom.Element; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import java.io.File; @SuppressWarnings({"HardCodedStringLiteral"}) public abstract class InspectionTestCase extends PsiTestCase { private static final Logger LOG = Logger.getInstance("#com.intellij.testFramework.InspectionTestCase"); + private UnusedCodeExtension myUnusedCodeExtension; + private VirtualFile ext_src; public InspectionManagerEx getManager() { return (InspectionManagerEx) InspectionManager.getInstance(myProject); @@ -107,7 +119,7 @@ public abstract class InspectionTestCase extends PsiTestCase { } } }); - AnalysisScope scope = createAnalysisScope(sourceDir[0]); + AnalysisScope scope = createAnalysisScope(sourceDir[0].getParent()); InspectionManagerEx inspectionManager = (InspectionManagerEx) InspectionManager.getInstance(myProject); final GlobalInspectionContextImpl globalContext = inspectionManager.createNewGlobalContext(true); @@ -146,13 +158,13 @@ public abstract class InspectionTestCase extends PsiTestCase { if (sourceDir[0] == null) { sourceDir[0] = projectDir; } - VirtualFile ext_src = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(testDir + "/ext_src")); final ModuleRootManager rootManager = ModuleRootManager.getInstance(myModule); final ModifiableRootModel rootModel = rootManager.getModifiableModel(); rootModel.clear(); // configure source and output path final ContentEntry contentEntry = rootModel.addContentEntry(projectDir); contentEntry.addSourceFolder(sourceDir[0], false); + ext_src = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(new File(testDir + "/ext_src")); if (ext_src != null) { contentEntry.addSourceFolder(ext_src, false); } @@ -160,20 +172,67 @@ public abstract class InspectionTestCase extends PsiTestCase { // IMPORTANT! The jdk must be obtained in a way it is obtained in the normal program! //ProjectJdkEx jdk = ProjectJdkTable.getInstance().getInternalJdk(); - rootModel.setSdk(getTestProjectSdk(sdkName)); + rootModel.setSdk(getTestProjectSdk()); rootModel.commit(); } - protected Sdk getTestProjectSdk(String sdkName) { - Sdk sdk; - if ("java 1.5".equals(sdkName)) { - sdk = JavaSdkImpl.getMockJdk15(sdkName); - LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); - } - else { - sdk = JavaSdkImpl.getMockJdk(sdkName); - } + @Override + protected void setUp() throws Exception { + super.setUp(); + ExtensionPoint point = Extensions.getRootArea().getExtensionPoint(ExtensionPoints.DEAD_CODE_TOOL); + myUnusedCodeExtension = new UnusedCodeExtension() { + @NotNull + @Override + public String getDisplayName() { + return "duh"; + } + + @Override + public boolean isEntryPoint(RefElement refElement) { + return isEntryPoint(refElement.getElement()); + } + + @Override + public boolean isEntryPoint(PsiElement psiElement) { + return ext_src != null && VfsUtil.isAncestor(ext_src, PsiUtil.getVirtualFile(psiElement), false); + } + + @Override + public boolean isSelected() { + return false; + } + + @Override + public void setSelected(boolean selected) { + + } + + public void readExternal(Element element) { + + } + + public void writeExternal(Element element) { + + } + }; + + point.registerExtension(myUnusedCodeExtension); + } + + @Override + protected void tearDown() throws Exception { + ExtensionPoint point = Extensions.getRootArea().getExtensionPoint(ExtensionPoints.DEAD_CODE_TOOL); + point.unregisterExtension(myUnusedCodeExtension); + myUnusedCodeExtension = null; + ext_src = null; + super.tearDown(); + } + + protected Sdk getTestProjectSdk() { + Sdk sdk = JavaSdkImpl.getMockJdk17(); + LanguageLevelProjectExtension.getInstance(getProject()).setLanguageLevel(LanguageLevel.JDK_1_5); + //sdk = JavaSdkImpl.getMockJdk(""); return sdk; } diff --git a/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java b/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java index fc8b9c8d99f6..fcbd332cec6d 100644 --- a/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/LightCodeInsightTestCase.java @@ -36,7 +36,7 @@ public abstract class LightCodeInsightTestCase extends LightPlatformCodeInsightT @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk("java 1.4"); + return JavaSdkImpl.getMockJdk17(); } protected ModuleType getModuleType() { diff --git a/java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java b/java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java index 44b290ce142a..216414e4a845 100644 --- a/java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/LightIdeaTestCase.java @@ -44,7 +44,7 @@ import org.jetbrains.annotations.NonNls; @Override protected Sdk getProjectJDK() { - return JavaSdkImpl.getMockJdk("java 1.4"); + return JavaSdkImpl.getMockJdk17(); } protected ModuleType getModuleType() { diff --git a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java index dd799580d467..6cc61e89b41b 100644 --- a/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/PsiTestCase.java @@ -120,7 +120,7 @@ public abstract class PsiTestCase extends ModuleTestCase { myTestDataBefore = loadData(dataName); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); VirtualFile vDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, myDataRoot, myFilesToDelete); final VirtualFile vFile = vDir.findChild(myTestDataBefore.getTextFile()); diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java b/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java index 03670d6658ea..d927fb9bc6b3 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/DefaultLightProjectDescriptor.java @@ -33,7 +33,7 @@ public class DefaultLightProjectDescriptor implements LightProjectDescriptor { } public Sdk getSdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java index 981caa91c1fc..9970ad55f61a 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java @@ -48,7 +48,7 @@ public abstract class LightCodeInsightFixtureTestCase extends UsefulTestCase{ } public Sdk getSdk() { - return JavaSdkImpl.getMockJdk("java 1.4"); + return JavaSdkImpl.getMockJdk17(); } public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { @@ -140,4 +140,4 @@ public abstract class LightCodeInsightFixtureTestCase extends UsefulTestCase{ return PsiFileFactory.getInstance(getProject()).createFileFromText(fileName, language, text, false, true); } -} \ No newline at end of file +} diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java index 763072b93c0c..d5dc44d49f8d 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/impl/JavaModuleFixtureBuilderImpl.java @@ -23,6 +23,7 @@ import com.intellij.openapi.module.StdModuleTypes; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.projectRoots.impl.MockJdkWrapper; +import com.intellij.openapi.projectRoots.impl.ProjectJdkImpl; import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTable; @@ -127,15 +128,10 @@ abstract class JavaModuleFixtureBuilderImpl extends Mod final Sdk jdk; if (myJdk != null) { jdk = JavaSdkImpl.getInstance().createJdk(module.getName() + "_jdk", myJdk, false); - } else { - switch (myMockJdkLevel) { - default: - jdk = JavaSdkImpl.getMockJdk("java 1.4"); - break; - case jdk15: - jdk = JavaSdkImpl.getMockJdk15("java 1.5"); - break; - } + ((ProjectJdkImpl)jdk).setVersionString("java 1.5"); + } + else { + jdk = JavaSdkImpl.getMockJdk17(); } if (jdk != null) { model.setSdk(new MockJdkWrapper(CompilerConfigurationImpl.getTestsExternalCompilerHome(), jdk)); diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java index 53896f74b717..752f7280b92d 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/LightGroovyTestCase.java @@ -43,7 +43,7 @@ public abstract class LightGroovyTestCase extends LightCodeInsightFixtureTestCas } public Sdk getSdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } public void configureModule(Module module, ModifiableRootModel model, ContentEntry contentEntry) { diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java index 83eb7bbe6af1..1ed0cf0d6444 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java @@ -26,6 +26,7 @@ import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.StdModuleTypes; +import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.*; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.JDOMExternalizable; @@ -56,6 +57,7 @@ import java.util.List; public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestCase { private TempDirTestFixture myMainOutput; + @Override protected void setUp() throws Exception { myMainOutput = new TempDirTestFixtureImpl(); @@ -71,12 +73,12 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC }.execute(); addGroovyLibrary(myModule, getName().contains("1_7")); - } @Override protected void tuneFixture(JavaModuleFixtureBuilder moduleBuilder) throws Exception { moduleBuilder.setMockJdkLevel(JavaModuleFixtureBuilder.MockJdkLevel.jdk15); + moduleBuilder.addJdk(JavaSdkImpl.getMockJdk14Path().getPath()); super.tuneFixture(moduleBuilder); } diff --git a/plugins/groovy/testdata/groovy/oldCompletion/keyword/imp4.test b/plugins/groovy/testdata/groovy/oldCompletion/keyword/imp4.test index 7f2476687da7..35f7f2ff4ddb 100644 --- a/plugins/groovy/testdata/groovy/oldCompletion/keyword/imp4.test +++ b/plugins/groovy/testdata/groovy/oldCompletion/keyword/imp4.test @@ -1,6 +1,6 @@ import static a.b ----- META-INF -com java -javax \ No newline at end of file +javax +org \ No newline at end of file diff --git a/plugins/groovy/testdata/groovy/oldCompletion/keyword/var3.test b/plugins/groovy/testdata/groovy/oldCompletion/keyword/var3.test index 24fcb08c1220..d77d173b6cc5 100644 --- a/plugins/groovy/testdata/groovy/oldCompletion/keyword/var3.test +++ b/plugins/groovy/testdata/groovy/oldCompletion/keyword/var3.test @@ -11,7 +11,7 @@ class A { } ----- META-INF -com java javax +org static \ No newline at end of file diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java index b08d7ad00ba2..6c47a8dd88c3 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java @@ -465,7 +465,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase { } protected Sdk createJdk(String versionName) { - return JavaSdkImpl.getMockJdk15(versionName); + return JavaSdkImpl.getMockJdk17(versionName); } protected void compileModules(String... moduleNames) { diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java index 51efe3403f97..34a684ff497c 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormEnumUsageTest.java @@ -49,7 +49,7 @@ public class FormEnumUsageTest extends PsiTestCase { public void run() { try{ String root = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/binding/" + getTestName(true); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.5")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); myTestProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch(Exception e){ @@ -92,4 +92,4 @@ public class FormEnumUsageTest extends PsiTestCase { assertEquals(1, ReferencesSearch.search(valueBField).findAll().size()); } -} \ No newline at end of file +} diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java index c62608b95b7f..9fe4c30c492a 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/FormPropertyUsageTest.java @@ -48,7 +48,7 @@ public class FormPropertyUsageTest extends PsiTestCase { public void run() { try{ String root = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/binding/" + getTestName(true); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.4")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); myTestProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch(Exception e){ diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java index 79ca07d2bc3a..c6830069c4c2 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/binding/RenameUIRelatedTest.java @@ -42,7 +42,7 @@ public class RenameUIRelatedTest extends MultiFileTestCase { @Override protected Sdk getTestProjectJdk() { - return JavaSdkImpl.getMockJdk15("java 1.5"); + return JavaSdkImpl.getMockJdk17("java 1.5"); } protected void setupProject(VirtualFile rootDir) { diff --git a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java index d89398ebdb69..3b77645f6828 100644 --- a/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java +++ b/plugins/ui-designer/testSrc/com/intellij/uiDesigner/make/FormSourceCodeGeneratorTest.java @@ -46,7 +46,7 @@ public class FormSourceCodeGeneratorTest extends PsiTestCase { public void run() { try{ String root = PluginPathManager.getPluginHomePath("ui-designer") + "/testData/sourceCodeGenerator/" + getTestName(true); - PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk("java 1.5")); + PsiTestUtil.removeAllRoots(myModule, JavaSdkImpl.getMockJdk17()); myTestProjectRoot = PsiTestUtil.createTestProjectStructure(myProject, myModule, root, myFilesToDelete); } catch(Exception e){ @@ -120,4 +120,4 @@ public class FormSourceCodeGeneratorTest extends PsiTestCase { final String text = StringUtil.convertLineSeparators(psiFile.getText()); assertEquals(expectedText, text); } -} \ No newline at end of file +}