From 3cd90bf4f7e042b6f26dd7fa3800b8eef8e20dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Tue, 31 Mar 2020 11:38:22 +0200 Subject: [PATCH] [devkit] PluginXmlFunctionalTest: simplify testLanguageAttribute* tests GitOrigin-RevId: 00d43b24e837645ce5ada8382f1030601a5b85c6 --- .../codeInsight/PluginXmlFunctionalTest.groovy | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy index ef0626f39e40..048193ef5e6b 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy +++ b/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/codeInsight/PluginXmlFunctionalTest.groovy @@ -385,12 +385,12 @@ class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase { } void testLanguageAttributeHighlighting() { - configureLanguageAttributeTest() + myFixture.allowTreeAccessForFile(myFixture.copyFileToProject("MyLanguage.java")) doHighlightingTest("languageAttribute.xml", "MyLanguageAttributeEPBean.java") } void testLanguageAttributeCompletion() { - configureLanguageAttributeTest() + myFixture.allowTreeAccessForFile(myFixture.copyFileToProject("MyLanguage.java")) myFixture.allowTreeAccessForFile(myFixture.copyFileToProject("MyLanguageAttributeEPBean.java")) myFixture.configureByFile("languageAttribute.xml") @@ -407,14 +407,6 @@ class PluginXmlFunctionalTest extends JavaCodeInsightFixtureTestCase { assertEquals(typeText, presentation.typeText) } - private void configureLanguageAttributeTest() { - myFixture.addClass("package com.intellij.lang; " + - "public class Language { " + - " protected Language(String id) {}" + - "}") - myFixture.allowTreeAccessForFile(myFixture.copyFileToProject("MyLanguage.java")) - } - @SuppressWarnings("ComponentNotRegistered") void testIconAttribute() { myFixture.addClass("package foo; public class FooAction extends com.intellij.openapi.actionSystem.AnAction { }") @@ -631,7 +623,7 @@ public class MyErrorHandler extends ErrorReportSubmitter {} } void testRegistrationCheck() { - configureLanguageAttributeTest() + myFixture.allowTreeAccessForFile(myFixture.copyFileToProject("MyLanguage.java")) Module anotherModule = PsiTestUtil.addModule(getProject(), StdModuleTypes.JAVA, "anotherModule", myTempDirFixture.findOrCreateDir("../anotherModuleDir")) ModuleRootModificationUtil.addModuleLibrary(anotherModule, VfsUtil.getUrlForLibraryRoot(new File(PathUtil.getJarPathForClass(AnAction.class))))