From de33eef5e2c063ad8f26d32bd4cbd7c0bd62ba18 Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Sat, 13 Jul 2024 14:24:27 +0200 Subject: [PATCH] [maven] IDEA-349970 fix MavenConfigImportingTest.testMavenConfigCompletion GitOrigin-RevId: 3e07b2709059340369d5ebfba00f4272db8988c8 --- .../idea/maven/importing/MavenConfigImportingTest.kt | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenConfigImportingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenConfigImportingTest.kt index 9efe4405db0a..044e7b064448 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenConfigImportingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenConfigImportingTest.kt @@ -3,7 +3,7 @@ package org.jetbrains.idea.maven.importing import com.intellij.maven.testFramework.MavenDomTestCase import com.intellij.openapi.application.EDT -import com.intellij.openapi.application.WriteAction +import com.intellij.openapi.application.writeAction import com.intellij.testFramework.UsefulTestCase import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.runBlocking @@ -11,7 +11,6 @@ import kotlinx.coroutines.withContext import org.jetbrains.idea.maven.dom.references.MavenPsiElementWrapper import org.jetbrains.idea.maven.model.MavenConstants import org.junit.Test -import java.io.IOException import java.nio.charset.StandardCharsets class MavenConfigImportingTest : MavenDomTestCase() { @@ -101,7 +100,7 @@ class MavenConfigImportingTest : MavenDomTestCase() { 1 """.trimIndent()) - createProjectPom(""" + updateProjectPom(""" test project ${'$'}{config. @@ -138,12 +137,11 @@ class MavenConfigImportingTest : MavenDomTestCase() { var mavenProject = projectsManager.findProject(getModule("project")) assertEquals("1", mavenProject!!.mavenId.version) - WriteAction.runAndWait { + writeAction { val content = "-Dver=2".toByteArray(StandardCharsets.UTF_8) configFile.setBinaryContent(content, -1, configFile.getTimeStamp() + 1) } - configConfirmationForYesAnswer() - importProjectAsync() + updateAllProjects() mavenProject = projectsManager.findProject(getModule("project")) assertEquals("2", mavenProject!!.mavenId.version)