MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-368906 fix MavenPropertyCompletionAndResolutionTest

Browse Source 
(cherry picked from commit 288e1ef2349fb3207e0d7409a3209d0b7698ba6d)

IJ-CR-158528

GitOrigin-RevId: a530bb97a68ef8133bb6fa55c7ded7ae0e93c809
This commit is contained in:
Dmitry Kichinsky
2025-03-22 13:07:22 +01:00
committed by intellij-monorepo-bot
parent 5dfb5ec0e0
commit 18e87ce6b6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenPropertyCompletionAndResolutionTest.kt
View File

@@ -473,11 +473,15 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() {
</properties>
</profile>
</profiles>
<name>${'$'}{<caret>foo}</name>
<name>${'$'}{foo}</name>
""".trimIndent())
readWithProfiles("two")
moveCaretTo(projectPom, """
</profiles>
<name>${'$'}{<caret>foo}</name>""".trimIndent())
assertResolved(projectPom, findTag(projectPom, "project.profiles[1].properties.foo"))
}
@@ -559,11 +563,15 @@ class MavenPropertyCompletionAndResolutionTest : MavenDomTestCase() {
</properties>
</profile>
</profiles>
<name>${'$'}{<caret>foo}</name>
<name>${'$'}{foo}</name>
""".trimIndent())
updateAllProjects()
moveCaretTo(projectPom, """
</profiles>
<name>${'$'}{<caret>foo}</name>""".trimIndent())
assertResolved(projectPom, findTag(projectPom, "project.profiles[1].properties.foo"))
}

2
plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenDomTestCase.kt
View File

@@ -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
}