MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[Recent Tests] Corrected magnitude calculation

Browse Source
This commit is contained in:
Yaroslav Lepenkin
2016-06-15 15:41:36 +03:00
parent fe7fb4b4da
commit d0a2212aac
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/testIntegration/RunConfigurationEntry.kt
+4 -8
View File
@@ -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
java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsOrderTest.kt
+9
View File
@@ -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)
}
java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt
+5
View File
@@ -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)
}