From 02baea5b5cebddafa6e112f2bf7bda638886cfd9 Mon Sep 17 00:00:00 2001 From: Dmitry Kichinsky Date: Tue, 11 Nov 2025 23:14:50 +0100 Subject: [PATCH] [maven] IDEA-381950 improve output in MavenRepositoriesDownloadingTest GitOrigin-RevId: 255a94eaae9fe8352aa79b8e7477919a80ffe13c --- .../importing/MavenRepositoriesDownloadingTest.kt | 2 +- .../maven/testFramework/MavenImportingTestCase.kt | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenRepositoriesDownloadingTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenRepositoriesDownloadingTest.kt index 8802ea778e06..e0e2ec03b22e 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenRepositoriesDownloadingTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/importing/MavenRepositoriesDownloadingTest.kt @@ -43,7 +43,7 @@ class MavenRepositoriesDownloadingTest : MavenMultiVersionImportingTestCase() { connection.setRequestMethod("GET") connection.connect() val response = getResponse(connection) - MavenLog.LOG.warn("Response $response") + MavenLog.LOG.warn("Response ${response.take(50)}") val responseCode = connection.responseCode connection.disconnect() diff --git a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenImportingTestCase.kt b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenImportingTestCase.kt index 4c18b8465220..8866bba62f81 100644 --- a/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenImportingTestCase.kt +++ b/plugins/maven/testFramework/src/com/intellij/maven/testFramework/MavenImportingTestCase.kt @@ -15,7 +15,6 @@ import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.module.ModuleWithNameAlreadyExists import com.intellij.openapi.progress.EmptyProgressIndicator import com.intellij.openapi.progress.ProgressManager -import com.intellij.openapi.progress.runBlockingCancellable import com.intellij.openapi.progress.runBlockingMaybeCancellable import com.intellij.openapi.project.DumbService import com.intellij.openapi.project.ModuleListener @@ -457,16 +456,16 @@ abstract class MavenImportingTestCase : MavenTestCase() { assertTrue("Auto-reload is disabled in this test", isAutoReloadEnabled) } - protected fun assertHasPendingProjectForReload() { + protected suspend fun assertHasPendingProjectForReload() { assertAutoReloadIsEnabled() - blockTillCinfigurationReady() + awaitConfiguration() assertTrue("Expected notification about pending projects for auto-reload", myNotificationAware!!.isNotificationVisible()) assertNotEmpty(myNotificationAware!!.getProjectsWithNotification()) } - protected fun assertNoPendingProjectForReload() { + protected suspend fun assertNoPendingProjectForReload() { assertAutoReloadIsEnabled() - blockTillCinfigurationReady() + awaitConfiguration() assertFalse(myNotificationAware!!.isNotificationVisible()) assertEmpty(myNotificationAware!!.getProjectsWithNotification()) } @@ -499,12 +498,6 @@ abstract class MavenImportingTestCase : MavenTestCase() { } } - protected fun blockTillCinfigurationReady() { - runBlockingCancellable { - awaitConfiguration() - } - } - private fun logConfigurationMessage(message: String) { if (message.contains("scanning")) return MavenLog.LOG.warn(message)