From 18e87ce6b68e078026ede9a013ebeafafde695f0 Mon Sep 17 00:00:00 2001
From: Dmitry Kichinsky <dmitry.kichinsky@jetbrains.com>
Date: Sat, 22 Mar 2025 13:07:22 +0100
Subject: [PATCH] [maven] IDEA-368906 fix
 MavenPropertyCompletionAndResolutionTest

(cherry picked from commit 288e1ef2349fb3207e0d7409a3209d0b7698ba6d)

IJ-CR-158528

GitOrigin-RevId: a530bb97a68ef8133bb6fa55c7ded7ae0e93c809
---
 .../dom/MavenPropertyCompletionAndResolutionTest.kt  | 12 ++++++++++--
 .../intellij/maven/testFramework/MavenDomTestCase.kt |  2 --
 2 files changed, 10 insertions(+), 4 deletions(-)

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() {
                            </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"))
   }
 
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
   }