From 16b8c8e2d3163f257e5e31e4b748efc8a9dfc81f Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 10 Dec 2019 21:50:13 +0100 Subject: [PATCH] junit integration tests: use java 8+ to ensure junit 5 compatibility GitOrigin-RevId: 6cdb2ed47e9adb32625601ec362befaca258ba9a --- ...ractTestFrameworkCompilingIntegrationTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/java/java-tests/testSrc/com/intellij/java/execution/AbstractTestFrameworkCompilingIntegrationTest.java b/java/java-tests/testSrc/com/intellij/java/execution/AbstractTestFrameworkCompilingIntegrationTest.java index 88c99caf499e..947670ff075b 100644 --- a/java/java-tests/testSrc/com/intellij/java/execution/AbstractTestFrameworkCompilingIntegrationTest.java +++ b/java/java-tests/testSrc/com/intellij/java/execution/AbstractTestFrameworkCompilingIntegrationTest.java @@ -5,8 +5,12 @@ import com.intellij.application.options.PathMacrosImpl; import com.intellij.openapi.application.PathMacros; import com.intellij.openapi.compiler.CompilerMessage; import com.intellij.openapi.compiler.CompilerMessageCategory; +import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModuleRootModificationUtil; +import com.intellij.pom.java.LanguageLevel; import com.intellij.testFramework.CompilerTester; +import com.intellij.testFramework.IdeaTestUtil; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.List; @@ -37,6 +41,17 @@ public abstract class AbstractTestFrameworkCompilingIntegrationTest extends Abst } } + @NotNull + @Override + protected LanguageLevel getProjectLanguageLevel() { + return LanguageLevel.JDK_1_8; + } + + @Override + protected Sdk getTestProjectJdk() { + return IdeaTestUtil.getMockJdk18(); + } + protected String getDefaultMavenRepositoryPath() { final String root = System.getProperty("user.home", null); return (root != null ? new File(root, ".m2/repository") : new File(".m2/repository")).getAbsolutePath();