From 7c906b74fc0ebf138efba9657ac27a1daf109238 Mon Sep 17 00:00:00 2001 From: Ilya Matveev Date: Mon, 25 Sep 2017 17:28:58 +0300 Subject: [PATCH] unit-tests: Rename some methods in TestListener --- runtime/src/main/kotlin/konan/test/GTestLogger.kt | 6 +++--- runtime/src/main/kotlin/konan/test/TeamCityLogger.kt | 2 +- runtime/src/main/kotlin/konan/test/TestListener.kt | 8 ++++---- runtime/src/main/kotlin/konan/test/TestLogger.kt | 6 +++--- runtime/src/main/kotlin/konan/test/TestRunner.kt | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/runtime/src/main/kotlin/konan/test/GTestLogger.kt b/runtime/src/main/kotlin/konan/test/GTestLogger.kt index 04b542fdc8e..8a9d5becc07 100644 --- a/runtime/src/main/kotlin/konan/test/GTestLogger.kt +++ b/runtime/src/main/kotlin/konan/test/GTestLogger.kt @@ -25,12 +25,12 @@ class GTestLogger : TestLoggerWithStatistics() { } } - override fun endTesting(runner: TestRunner, timeMillis: Long) = printResults(timeMillis) + override fun finishTesting(runner: TestRunner, timeMillis: Long) = printResults(timeMillis) override fun startSuite(suite: TestSuite) = println("[----------] ${suite.size} tests from ${suite.name}") - override fun endSuite(suite: TestSuite, timeMillis: Long) { - super.endSuite(suite, timeMillis) + override fun finishSuite(suite: TestSuite, timeMillis: Long) { + super.finishSuite(suite, timeMillis) println("[----------] ${suite.size} tests from ${suite.name} ($timeMillis ms total)\n") } diff --git a/runtime/src/main/kotlin/konan/test/TeamCityLogger.kt b/runtime/src/main/kotlin/konan/test/TeamCityLogger.kt index 5b5f74f6445..b260345638e 100644 --- a/runtime/src/main/kotlin/konan/test/TeamCityLogger.kt +++ b/runtime/src/main/kotlin/konan/test/TeamCityLogger.kt @@ -31,7 +31,7 @@ class TeamCityLogger : BaseTestLogger() { override fun start(testCase: TestCase) = report("testStarted name='${testCase.tcName}'") override fun startSuite(suite: TestSuite) = report("testSuiteStarted name='${suite.tcName}'") - override fun endSuite(suite: TestSuite, timeMillis: Long) = report("testSuiteFinished name='${suite.tcName}'") + override fun finishSuite(suite: TestSuite, timeMillis: Long) = report("testSuiteFinished name='${suite.tcName}'") override fun pass(testCase: TestCase, timeMillis: Long) = finish(testCase, timeMillis) override fun fail(testCase: TestCase, e: Throwable, timeMillis: Long) { diff --git a/runtime/src/main/kotlin/konan/test/TestListener.kt b/runtime/src/main/kotlin/konan/test/TestListener.kt index 307fdecb2ea..b62065737a2 100644 --- a/runtime/src/main/kotlin/konan/test/TestListener.kt +++ b/runtime/src/main/kotlin/konan/test/TestListener.kt @@ -2,10 +2,10 @@ package konan.test interface TestListener { fun startTesting(runner: TestRunner) - fun endTesting(runner: TestRunner, timeMillis: Long) + fun finishTesting(runner: TestRunner, timeMillis: Long) fun startSuite(suite: TestSuite) - fun endSuite(suite: TestSuite, timeMillis: Long) + fun finishSuite(suite: TestSuite, timeMillis: Long) fun ignoreSuite(suite: TestSuite) fun start(testCase: TestCase) @@ -16,9 +16,9 @@ interface TestListener { open class BaseTestListener: TestListener { override fun startTesting(runner: TestRunner) {} - override fun endTesting(runner: TestRunner, timeMillis: Long) {} + override fun finishTesting(runner: TestRunner, timeMillis: Long) {} override fun startSuite(suite: TestSuite) {} - override fun endSuite(suite: TestSuite, timeMillis: Long) {} + override fun finishSuite(suite: TestSuite, timeMillis: Long) {} override fun ignoreSuite(suite: TestSuite) {} override fun start(testCase: TestCase) {} override fun pass(testCase: TestCase, timeMillis: Long) {} diff --git a/runtime/src/main/kotlin/konan/test/TestLogger.kt b/runtime/src/main/kotlin/konan/test/TestLogger.kt index b557b28610e..f25739e01a2 100644 --- a/runtime/src/main/kotlin/konan/test/TestLogger.kt +++ b/runtime/src/main/kotlin/konan/test/TestLogger.kt @@ -29,7 +29,7 @@ open class TestLoggerWithStatistics: BaseTestLogger() { protected val statistics = MutableTestStatistics() override fun startTesting(runner: TestRunner) = statistics.reset() - override fun endSuite(suite: TestSuite, timeMillis: Long) = statistics.registerSuite() + override fun finishSuite(suite: TestSuite, timeMillis: Long) = statistics.registerSuite() override fun pass(testCase: TestCase, timeMillis: Long) = statistics.registerPass() override fun fail(testCase: TestCase, e: Throwable, timeMillis: Long) = statistics.registerFail(testCase) override fun ignore(testCase: TestCase) = statistics.registerIgnore() @@ -42,10 +42,10 @@ class SilentTestLogger: BaseTestLogger() { class SimpleTestLogger: BaseTestLogger() { override fun startTesting(runner: TestRunner) = println("Starting testing") - override fun endTesting(runner: TestRunner, timeMillis: Long) = println("Testing finished") + override fun finishTesting(runner: TestRunner, timeMillis: Long) = println("Testing finished") override fun startSuite(suite: TestSuite) = println("Starting test suite: $suite") - override fun endSuite(suite: TestSuite, timeMillis: Long) = println("Test suite finished: $suite") + override fun finishSuite(suite: TestSuite, timeMillis: Long) = println("Test suite finished: $suite") override fun ignoreSuite(suite: TestSuite) = println("Test suite ignored: $suite") override fun start(testCase: TestCase) = println("Starting test case: $testCase") diff --git a/runtime/src/main/kotlin/konan/test/TestRunner.kt b/runtime/src/main/kotlin/konan/test/TestRunner.kt index 29372f01665..6df6c97d1b3 100644 --- a/runtime/src/main/kotlin/konan/test/TestRunner.kt +++ b/runtime/src/main/kotlin/konan/test/TestRunner.kt @@ -213,11 +213,11 @@ object TestRunner { } else { sendToListeners { startSuite(it) } val time = measureTimeMillis { it.run() } - sendToListeners { endSuite(it, time) } + sendToListeners { finishSuite(it, time) } } } } - sendToListeners { endTesting(this@TestRunner, totalTime) } + sendToListeners { finishTesting(this@TestRunner, totalTime) } return exitCode } }