diff --git a/java/execution/impl/src/com/intellij/testIntegration/RunConfigurationEntry.kt b/java/execution/impl/src/com/intellij/testIntegration/RunConfigurationEntry.kt index 9b7f2237dea8..26a13c1ba808 100644 --- a/java/execution/impl/src/com/intellij/testIntegration/RunConfigurationEntry.kt +++ b/java/execution/impl/src/com/intellij/testIntegration/RunConfigurationEntry.kt @@ -80,13 +80,7 @@ class SuiteEntry(url: String, magnitude: TestStateInfo.Magnitude, runDate: Date) } override val magnitude: TestStateInfo.Magnitude by lazy { - tests.forEach { - if (it.magnitude != super.magnitude) { - return@lazy it.magnitude - } - } - - super.magnitude + tests.find { it.magnitude != PASSED_INDEX && it.magnitude != COMPLETE_INDEX }?.magnitude ?: PASSED_INDEX } } @@ -104,7 +98,9 @@ class RunConfigurationEntry(val runSettings: RunnerAndConfigurationSettings, ini override val runDate = suites.map { it.runDate }.min()!! - override val magnitude = COMPLETE_INDEX + override val magnitude: TestStateInfo.Magnitude by lazy { + suites.find { it.magnitude != PASSED_INDEX && it.magnitude != COMPLETE_INDEX }?.magnitude ?: PASSED_INDEX + } override val presentation = runSettings.name diff --git a/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsOrderTest.kt b/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsOrderTest.kt index 5e0e0f85bc96..5488e62eed1f 100644 --- a/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsOrderTest.kt +++ b/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsOrderTest.kt @@ -116,6 +116,15 @@ class RecentTestsOrderTest: LightIdeaTestCase() { val tests = data.getTestsToShow() assertThat(tests).hasSize(3) + + assertThat(tests[0].presentation).isEqualTo("SingleTest.test") + assertThat(tests[0].magnitude).isEqualTo(FAILED_INDEX) + + assertThat(tests[1].presentation).isEqualTo("SingleTest") + assertThat(tests[1].magnitude).isEqualTo(FAILED_INDEX) + + assertThat(tests[2].presentation).isEqualTo("all tests") + assertThat(tests[2].magnitude).isEqualTo(FAILED_INDEX) } diff --git a/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt b/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt index 27492a4dda1f..de15e9cbde98 100644 --- a/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt +++ b/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt @@ -81,8 +81,13 @@ class RecentTestsStepTest: LightIdeaTestCase() { assertThat(tests).hasSize(3) assertThat(tests[0].presentation).isEqualTo("JFSDTest.testItMakesMeSadToFixIt") + assertThat(tests[0].magnitude).isEqualTo(FAILED_INDEX) + assertThat(tests[1].presentation).isEqualTo("JFSDTest") + assertThat(tests[1].magnitude).isEqualTo(FAILED_INDEX) + assertThat(tests[2].presentation).isEqualTo("all tests") + assertThat(tests[2].magnitude).isEqualTo(FAILED_INDEX) }