From b85d54a64e6674d315d23a575b6c85a417e1b637 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Fri, 7 Jun 2019 22:26:57 +0200 Subject: [PATCH] [test framework] moves preview/experimental language level acceptance code into a base class GitOrigin-RevId: 862e656ca92992c1263c3c0e3116826f055d4d93 --- .../LightCodeInsightFixtureTestCase.java | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java index cff1f8b7d0a9..a82a4f6696ce 100644 --- a/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java +++ b/java/testFramework/src/com/intellij/testFramework/fixtures/LightCodeInsightFixtureTestCase.java @@ -37,6 +37,14 @@ public abstract class LightCodeInsightFixtureTestCase extends UsefulTestCase { myWithAnnotations = withAnnotations; } + @Override + public void setUpProject(@NotNull Project project, @NotNull SetupHandler handler) throws Exception { + if (myLanguageLevel.isPreview() || myLanguageLevel == LanguageLevel.JDK_X) { + AcceptedLanguageLevelsSettings.allowLevel(project, myLanguageLevel); + } + super.setUpProject(project, handler); + } + @Override public Sdk getSdk() { Sdk jdk = IdeaTestUtil.getMockJdk(myLanguageLevel.toJavaVersion()); @@ -62,21 +70,8 @@ public abstract class LightCodeInsightFixtureTestCase extends UsefulTestCase { public static final LightProjectDescriptor JAVA_10 = new ProjectDescriptor(LanguageLevel.JDK_10); public static final LightProjectDescriptor JAVA_10_ANNOTATED = new ProjectDescriptor(LanguageLevel.JDK_10, true); public static final LightProjectDescriptor JAVA_11 = new ProjectDescriptor(LanguageLevel.JDK_11); - public static final LightProjectDescriptor JAVA_12 = new ProjectDescriptor(LanguageLevel.JDK_12_PREVIEW) { - @Override - public void setUpProject(@NotNull Project project, @NotNull SetupHandler handler) throws Exception { - AcceptedLanguageLevelsSettings.allowLevel(project, myLanguageLevel); - super.setUpProject(project, handler); - } - - }; - public static final LightProjectDescriptor JAVA_X = new ProjectDescriptor(LanguageLevel.JDK_X) { - @Override - public void setUpProject(@NotNull Project project, @NotNull SetupHandler handler) throws Exception { - AcceptedLanguageLevelsSettings.allowLevel(project, myLanguageLevel); - super.setUpProject(project, handler); - } - }; + public static final LightProjectDescriptor JAVA_12 = new ProjectDescriptor(LanguageLevel.JDK_12_PREVIEW); + public static final LightProjectDescriptor JAVA_X = new ProjectDescriptor(LanguageLevel.JDK_X); public static final LightProjectDescriptor JAVA_LATEST = new ProjectDescriptor(LanguageLevel.HIGHEST) { @Override