[maven] IDEA-357057 use awaitConfiguration() to wait for sync

GitOrigin-RevId: 3c75f0897092d67877d3a9a6be32344dc45be521
This commit is contained in:
Dmitry Kichinsky
2024-08-02 20:58:31 +00:00
committed by intellij-monorepo-bot
parent f7ec3c1ca7
commit 78bb4fa1e8
2 changed files with 12 additions and 4 deletions
@@ -33,5 +33,6 @@
<orderEntry type="module" module-name="intellij.java.testFramework" />
<orderEntry type="module" module-name="intellij.platform.projectModel" />
<orderEntry type="module" module-name="intellij.platform.core" />
<orderEntry type="module" module-name="intellij.platform.backend.observation" />
</component>
</module>
@@ -29,6 +29,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.openapi.vfs.VirtualFileManager
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import com.intellij.platform.backend.observation.Observation
import com.intellij.psi.codeStyle.CodeStyleSchemes
import com.intellij.psi.codeStyle.CodeStyleSettings
import com.intellij.testFramework.*
@@ -445,16 +446,22 @@ abstract class MavenImportingTestCase : MavenTestCase() {
// otherwise all imports will be skipped
assertHasPendingProjectForReload()
waitForImportWithinTimeout {
withContext(Dispatchers.EDT) {
myProjectTracker!!.scheduleProjectRefresh()
}
withContext(Dispatchers.EDT) {
myProjectTracker!!.scheduleProjectRefresh()
}
awaitConfiguration()
// otherwise project settings was modified while importing
assertNoPendingProjectForReload()
}
protected suspend fun awaitConfiguration() {
Observation.awaitConfiguration(project) { message ->
MavenLog.LOG.warn(message)
}
}
protected suspend fun scheduleProjectImportAndWaitAsync() {
assertAutoReloadIsEnabled()