azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unit-tests: Rename some methods in TestListener

Browse Source
This commit is contained in:
Ilya Matveev
2017-09-25 17:28:58 +03:00
committed by ilmat192
parent 9cd5e86dd9
commit 7c906b74fc
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/kotlin/konan/test/GTestLogger.kt
+3 -3
View File
@@ -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 startSuite(suite: TestSuite) = println("[----------] ${suite.size} tests from ${suite.name}")
override fun endSuite(suite: TestSuite, timeMillis: Long) { override fun finishSuite(suite: TestSuite, timeMillis: Long) {
super.endSuite(suite, timeMillis) super.finishSuite(suite, timeMillis)
println("[----------] ${suite.size} tests from ${suite.name} ($timeMillis ms total)\n") println("[----------] ${suite.size} tests from ${suite.name} ($timeMillis ms total)\n")
} }
runtime/src/main/kotlin/konan/test/TeamCityLogger.kt
+1 -1
View File
@@ -31,7 +31,7 @@ class TeamCityLogger : BaseTestLogger() {
override fun start(testCase: TestCase) = report("testStarted name='${testCase.tcName}'") override fun start(testCase: TestCase) = report("testStarted name='${testCase.tcName}'")
override fun startSuite(suite: TestSuite) = report("testSuiteStarted name='${suite.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 pass(testCase: TestCase, timeMillis: Long) = finish(testCase, timeMillis)
override fun fail(testCase: TestCase, e: Throwable, timeMillis: Long) { override fun fail(testCase: TestCase, e: Throwable, timeMillis: Long) {
runtime/src/main/kotlin/konan/test/TestListener.kt
+4 -4
View File
@@ -2,10 +2,10 @@ package konan.test
interface TestListener { interface TestListener {
fun startTesting(runner: TestRunner) fun startTesting(runner: TestRunner)
fun endTesting(runner: TestRunner, timeMillis: Long) fun finishTesting(runner: TestRunner, timeMillis: Long)
fun startSuite(suite: TestSuite) fun startSuite(suite: TestSuite)
fun endSuite(suite: TestSuite, timeMillis: Long) fun finishSuite(suite: TestSuite, timeMillis: Long)
fun ignoreSuite(suite: TestSuite) fun ignoreSuite(suite: TestSuite)
fun start(testCase: TestCase) fun start(testCase: TestCase)
@@ -16,9 +16,9 @@ interface TestListener {
open class BaseTestListener: TestListener { open class BaseTestListener: TestListener {
override fun startTesting(runner: TestRunner) {} 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 startSuite(suite: TestSuite) {}
override fun endSuite(suite: TestSuite, timeMillis: Long) {} override fun finishSuite(suite: TestSuite, timeMillis: Long) {}
override fun ignoreSuite(suite: TestSuite) {} override fun ignoreSuite(suite: TestSuite) {}
override fun start(testCase: TestCase) {} override fun start(testCase: TestCase) {}
override fun pass(testCase: TestCase, timeMillis: Long) {} override fun pass(testCase: TestCase, timeMillis: Long) {}
runtime/src/main/kotlin/konan/test/TestLogger.kt
+3 -3
View File
@@ -29,7 +29,7 @@ open class TestLoggerWithStatistics: BaseTestLogger() {
protected val statistics = MutableTestStatistics() protected val statistics = MutableTestStatistics()
override fun startTesting(runner: TestRunner) = statistics.reset() 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 pass(testCase: TestCase, timeMillis: Long) = statistics.registerPass()
override fun fail(testCase: TestCase, e: Throwable, timeMillis: Long) = statistics.registerFail(testCase) override fun fail(testCase: TestCase, e: Throwable, timeMillis: Long) = statistics.registerFail(testCase)
override fun ignore(testCase: TestCase) = statistics.registerIgnore() override fun ignore(testCase: TestCase) = statistics.registerIgnore()
@@ -42,10 +42,10 @@ class SilentTestLogger: BaseTestLogger() {
class SimpleTestLogger: BaseTestLogger() { class SimpleTestLogger: BaseTestLogger() {
override fun startTesting(runner: TestRunner) = println("Starting testing") 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 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 ignoreSuite(suite: TestSuite) = println("Test suite ignored: $suite")
override fun start(testCase: TestCase) = println("Starting test case: $testCase") override fun start(testCase: TestCase) = println("Starting test case: $testCase")
runtime/src/main/kotlin/konan/test/TestRunner.kt
+2 -2
View File
@@ -213,11 +213,11 @@ object TestRunner {
} else { } else {
sendToListeners { startSuite(it) } sendToListeners { startSuite(it) }
val time = measureTimeMillis { it.run() } 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 return exitCode
} }
} }