diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java index 964dca8b8e04..34ae397e1464 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GenericsHighlighting8Test.java @@ -44,7 +44,7 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase { @Override protected Sdk getProjectJDK() { - return getTestName(false).contains("Jdk14") ? IdeaTestUtil.getMockJdk14() : super.getProjectJDK(); + return IdeaTestUtil.getMockJdk18(); } public void testReferenceTypeParams() { @@ -762,19 +762,4 @@ public class GenericsHighlighting8Test extends LightDaemonAnalyzerTestCase { doTest(); } - public void testJavaUtilCollections_NoVerify() throws Exception { - PsiClass collectionsClass = getJavaFacade().findClass("java.util.Collections", GlobalSearchScope.moduleWithLibrariesScope(getModule())); - assertNotNull(collectionsClass); - collectionsClass = (PsiClass)collectionsClass.getNavigationElement(); - final String text = collectionsClass.getContainingFile().getText(); - configureFromFileText("Collections.java", text.replaceAll("\r", "\n")); - final PsiResolveHelperImpl helper = (PsiResolveHelperImpl)JavaPsiFacade.getInstance(getProject()).getResolveHelper(); - helper.setTestHelper(new PsiGraphInferenceHelper(getPsiManager())); - try { - doTestConfiguredFile(false, false, null); - } - finally { - helper.setTestHelper(null); - } - } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java index dee913755ead..d0048b7f962f 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/GraphInferenceHighlightingTest.java @@ -17,6 +17,7 @@ package com.intellij.codeInsight.daemon.lambda; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.projectRoots.JavaSdkVersion; +import com.intellij.openapi.projectRoots.Sdk; import com.intellij.testFramework.IdeaTestUtil; import org.jetbrains.annotations.NonNls; @@ -115,4 +116,9 @@ public class GraphInferenceHighlightingTest extends LightDaemonAnalyzerTestCase IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } + + @Override + protected Sdk getProjectJDK() { + return IdeaTestUtil.getMockJdk18(); + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java index 4a0851a3bbe9..8e43934432aa 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/LambdaHighlightingTest.java @@ -18,6 +18,8 @@ package com.intellij.codeInsight.daemon.lambda; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; +import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.testFramework.IdeaTestUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -103,4 +105,9 @@ public class LambdaHighlightingTest extends LightDaemonAnalyzerTestCase { private void doTest(final boolean checkWarnings) { doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", checkWarnings, false); } + + @Override + protected Sdk getProjectJDK() { + return IdeaTestUtil.getMockJdk18(); + } } diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java index c0fed3d47911..7c25d3b43c05 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/MethodRefHighlightingTest.java @@ -19,6 +19,7 @@ import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.unusedSymbol.UnusedSymbolLocalInspection; import com.intellij.openapi.projectRoots.JavaSdkVersion; +import com.intellij.openapi.projectRoots.Sdk; import com.intellij.testFramework.IdeaTestUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -101,4 +102,9 @@ public class MethodRefHighlightingTest extends LightDaemonAnalyzerTestCase { IdeaTestUtil.setTestVersion(JavaSdkVersion.JDK_1_8, getModule(), getTestRootDisposable()); doTestNewInference(BASE_PATH + "/" + getTestName(false) + ".java", warnings, false); } + + @Override + protected Sdk getProjectJDK() { + return IdeaTestUtil.getMockJdk18(); + } } diff --git a/java/mockJDK-1.8/jre/lib/rt.jar b/java/mockJDK-1.8/jre/lib/rt.jar new file mode 100644 index 000000000000..db566fc40076 Binary files /dev/null and b/java/mockJDK-1.8/jre/lib/rt.jar differ diff --git a/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java index eb378f128a78..e0a2806d4668 100644 --- a/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java +++ b/java/testFramework/src/com/intellij/testFramework/IdeaTestUtil.java @@ -77,6 +77,10 @@ public class IdeaTestUtil extends PlatformTestUtil { return JavaSdk.getInstance().createJdk(name, getMockJdk17Path().getPath(), false); } + public static Sdk getMockJdk18() { + return JavaSdk.getInstance().createJdk("java 1.8", getMockJdk18Path().getPath(), false); + } + public static Sdk getMockJdk14() { return JavaSdk.getInstance().createJdk("java 1.4", getMockJdk14Path().getPath(), false); } @@ -89,6 +93,10 @@ public class IdeaTestUtil extends PlatformTestUtil { return getPathForJdkNamed("mockJDK-1.7"); } + public static File getMockJdk18Path() { + return getPathForJdkNamed("mockJDK-1.8"); + } + private static File getPathForJdkNamed(String name) { File mockJdkCEPath = new File(PathManager.getHomePath(), "java/" + name); return mockJdkCEPath.exists() ? mockJdkCEPath : new File(PathManager.getHomePath(), "community/java/" + name); @@ -130,4 +138,6 @@ public class IdeaTestUtil extends PlatformTestUtil { } }); } + + }