From 5bfac5f685a6b1c613872e9e70ab536b03df6d1c Mon Sep 17 00:00:00 2001 From: Yaroslav Pankratyev Date: Sat, 19 Aug 2017 17:16:35 +0700 Subject: [PATCH] Fix extension/EP declaration markers tests --- ...nsionDeclarationRelatedItemLineMarkerProviderTest.java | 8 ++++++-- ...PointDeclarationRelatedItemLineMarkerProviderTest.java | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java b/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java index dea2020fbb63..98564cd6e746 100644 --- a/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java +++ b/plugins/devkit/testSources/navigation/ExtensionDeclarationRelatedItemLineMarkerProviderTest.java @@ -19,6 +19,8 @@ import com.intellij.codeInsight.daemon.GutterMark; import com.intellij.icons.AllIcons; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.psi.PsiFile; import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; @@ -51,10 +53,12 @@ public class ExtensionDeclarationRelatedItemLineMarkerProviderTest extends JavaC public void testMyProjectService() { PsiFile file = myFixture.configureByFile("plugin.xml"); String path = file.getVirtualFile().getPath(); + Module module = ModuleUtilCore.findModuleForPsiElement(file); + assertNotNull(module); int expectedTagPosition = file.getText().indexOf(""); String expectedTooltip = "    myEp extension declaration in plugin.xml
"; + + ":" + expectedTagPosition + "\">myEp declaration in plugin.xml " + + "[" + module.getName() + "]
"; GutterMark gutter = myFixture.findGutter("MyExtension.java"); DevKitGutterTargetsChecker.checkGutterTargets(gutter, expectedTooltip, AllIcons.Nodes.Plugin, "myEp"); diff --git a/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java b/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java index 2dc42176b262..79f758369c2a 100644 --- a/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java +++ b/plugins/devkit/testSources/navigation/ExtensionPointDeclarationRelatedItemLineMarkerProviderTest.java @@ -19,6 +19,8 @@ import com.intellij.codeInsight.daemon.GutterMark; import com.intellij.icons.AllIcons; import com.intellij.openapi.application.PluginPathManager; import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.psi.PsiFile; import com.intellij.testFramework.TestDataPath; import com.intellij.testFramework.builders.JavaModuleFixtureBuilder; @@ -57,10 +59,12 @@ public class ExtensionPointDeclarationRelatedItemLineMarkerProviderTest extends private void assertSingleEPDeclaration(String filePath) { PsiFile file = myFixture.configureByFile("plugin.xml"); String path = file.getVirtualFile().getPath(); + Module module = ModuleUtilCore.findModuleForPsiElement(file); + assertNotNull(module); int expectedTagPosition = file.getText().indexOf(""); String expectedTooltip = "    myStringEP extension point declaration in plugin.xml
"; + + ":" + expectedTagPosition + "\">myStringEP EP declaration in plugin.xml " + + "[" + module.getName() + "]
"; final GutterMark gutter = myFixture.findGutter(filePath); DevKitGutterTargetsChecker.checkGutterTargets(gutter, expectedTooltip, AllIcons.Nodes.Plugin, "extensionPoint");