From eb93ea47aa00afd10e04902a27a283f326029878 Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Tue, 31 May 2016 16:55:34 +0300 Subject: [PATCH] removed assertion, test prettified --- .../testIntegration/RecentTestsData.kt | 1 - .../testIntergration/RecentTestsTest.kt | 45 ++++++++++--------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/java/execution/impl/src/com/intellij/testIntegration/RecentTestsData.kt b/java/execution/impl/src/com/intellij/testIntegration/RecentTestsData.kt index 2f4206580fed..baf149ac450c 100644 --- a/java/execution/impl/src/com/intellij/testIntegration/RecentTestsData.kt +++ b/java/execution/impl/src/com/intellij/testIntegration/RecentTestsData.kt @@ -101,7 +101,6 @@ class RecentTestsData { } fun getTestsToShow(): List { - assert(unmatchedRunConfigurationTests.isEmpty()) val allEntries: List = runConfigurationSuites.values + urlSuites return allEntries .sortedByDescending { it.runDate } diff --git a/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt b/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt index d221e8b6769b..6424974bad14 100644 --- a/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt +++ b/java/java-tests/testSrc/com/intellij/testIntergration/RecentTestsTest.kt @@ -16,7 +16,8 @@ package com.intellij.testIntergration import com.intellij.execution.RunnerAndConfigurationSettings -import com.intellij.execution.testframework.sm.runner.states.TestStateInfo +import com.intellij.execution.testframework.sm.runner.states.TestStateInfo.Magnitude.FAILED_INDEX +import com.intellij.execution.testframework.sm.runner.states.TestStateInfo.Magnitude.PASSED_INDEX import com.intellij.testFramework.LightIdeaTestCase import com.intellij.testIntegration.RecentTestsData import org.assertj.core.api.Assertions.assertThat @@ -43,22 +44,22 @@ class RecentTestsStepTest: LightIdeaTestCase() { } fun `test show suites without run configuration`() { - data.addTest("Test.x".test(), TestStateInfo.Magnitude.PASSED_INDEX, now, null) - data.addSuite("Test".suite(), TestStateInfo.Magnitude.PASSED_INDEX, now, null) + data.addTest("Test.x".test(), PASSED_INDEX, now, null) + data.addSuite("Test".suite(), PASSED_INDEX, now, null) val tests = data.getTestsToShow() assertThat(tests).hasSize(1) } fun `test all tests passed`() { - data.addTest("java:test://Test.textXXX", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addSuite("java:suite://Test", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addSuite("java:suite://JavaFormatterSuperDuperTest", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addTest("java:test://Test.textYYY", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addTest("java:test://JavaFormatterSuperDuperTest.testItMakesMeSadToFixIt", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addTest("java:test://Test.textZZZ", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addTest("java:test://Test.textQQQ", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) - data.addTest("java:test://JavaFormatterSuperDuperTest.testUnconditionalAlignmentErrorneous", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) + data.addTest("Test.textXXX".test(), PASSED_INDEX, now, allTests) + data.addSuite("Test".suite(), PASSED_INDEX, now, allTests) + data.addSuite("JFSDTest".suite(), PASSED_INDEX, now, allTests) + data.addTest("Test.textYYY".test(), PASSED_INDEX, now, allTests) + data.addTest("JFSDTest.testItMakesMeSadToFixIt".test(), PASSED_INDEX, now, allTests) + data.addTest("Test.textZZZ".test(), PASSED_INDEX, now, allTests) + data.addTest("Test.textQQQ".test(), PASSED_INDEX, now, allTests) + data.addTest("JFSDTest.testUnconditionalAlignmentErrorneous".test(), PASSED_INDEX, now, allTests) val tests = data.getTestsToShow() assertThat(tests).hasSize(1) @@ -67,31 +68,31 @@ class RecentTestsStepTest: LightIdeaTestCase() { fun `test if one failed in run configuration show failed suite`() { - data.addSuite("java:suite://JavaFormatterSuperDuperTest", TestStateInfo.Magnitude.FAILED_INDEX, now, allTests) - data.addSuite("java:suite://Test", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) + data.addSuite("JFSDTest".suite(), FAILED_INDEX, now, allTests) + data.addSuite("Test".test(), PASSED_INDEX, now, allTests) - data.addTest("java:test://JavaFormatterSuperDuperTest.testItMakesMeSadToFixIt", TestStateInfo.Magnitude.FAILED_INDEX, now, allTests) - data.addTest("java:test://JavaFormatterSuperDuperTest.testUnconditionalAlignmentErrorneous", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) + data.addTest("JFSDTest.testItMakesMeSadToFixIt".test(), FAILED_INDEX, now, allTests) + data.addTest("JFSDTest.testUnconditionalAlignmentErrorneous".test(), PASSED_INDEX, now, allTests) - data.addTest("java:test://Test.textXXX", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) + data.addTest("Test.textXXX".test(), PASSED_INDEX, now, allTests) val tests = data.getTestsToShow() assertThat(tests).hasSize(2) - assertThat(tests[0].presentation).isEqualTo("JavaFormatterSuperDuperTest") + assertThat(tests[0].presentation).isEqualTo("JFSDTest") assertThat(tests[1].presentation).isEqualTo("all tests") } fun `test if configuration with single test show failed test`() { - data.addSuite("java:suite://JavaFormatterSuperDuperTest", TestStateInfo.Magnitude.FAILED_INDEX, now, allTests) - data.addTest("java:test://JavaFormatterSuperDuperTest.testItMakesMeSadToFixIt", TestStateInfo.Magnitude.FAILED_INDEX, now, allTests) - data.addTest("java:test://JavaFormatterSuperDuperTest.testUnconditionalAlignmentErrorneous", TestStateInfo.Magnitude.PASSED_INDEX, now, allTests) + data.addSuite("JFSDTest".suite(), FAILED_INDEX, now, allTests) + data.addTest("JFSDTest.testItMakesMeSadToFixIt".test(), FAILED_INDEX, now, allTests) + data.addTest("JFSDTest.testUnconditionalAlignmentErrorneous".test(), PASSED_INDEX, now, allTests) val tests = data.getTestsToShow() assertThat(tests).hasSize(2) - assertThat(tests[0].presentation).isEqualTo("JavaFormatterSuperDuperTest.testItMakesMeSadToFixIt") - assertThat(tests[1].presentation).isEqualTo("JavaFormatterSuperDuperTest") + assertThat(tests[0].presentation).isEqualTo("JFSDTest.testItMakesMeSadToFixIt") + assertThat(tests[1].presentation).isEqualTo("JFSDTest") }