diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt index 22eaa9c982d6..c7f9199abd95 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt @@ -473,11 +473,15 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() { - ${'$'}{foo} + ${'$'}{foo} """.trimIndent()) readWithProfiles("two") + moveCaretTo(projectPom, """ + + ${'$'}{foo}""".trimIndent()) + assertResolved(projectPom, findTag(projectPom, "project.profiles[1].properties.foo")) } @@ -559,11 +563,15 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() { - ${'$'}{foo} + ${'$'}{foo} """.trimIndent()) updateAllProjects() + moveCaretTo(projectPom, """ + + ${'$'}{foo}""".trimIndent()) + assertResolved(projectPom, findTag(projectPom, "project.profiles[1].properties.foo")) } diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt index 7f470b3c178b..d6fb20602764 100644 --- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt +++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt @@ -13,7 +13,6 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementPresentation import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter import com.intellij.lang.annotation.HighlightSeverity -import com.intellij.maven.testFramework.MavenMultiVersionImportingTestCaseLegacy.* import com.intellij.maven.testFramework.utils.RealMavenPreventionFixture import com.intellij.openapi.actionSystem.CommonDataKeys import com.intellij.openapi.actionSystem.CustomizedDataContext @@ -307,7 +306,6 @@ abstract class MavenDomTestCase : MavenMultiVersionImportingTestCase() { val expectedText = readAction { expected.text } val resolvedText = readAction { resolved?.text } assertEquals(expectedText, resolvedText) - assertEquals(expected, resolved) return ref }