Fix generateTests task
adding TestMessageCollector that was moved with daemon tests back
This commit is contained in:
+24
-2
@@ -5,7 +5,9 @@
|
|||||||
package org.jetbrains.kotlin.kapt.cli.test
|
package org.jetbrains.kotlin.kapt.cli.test
|
||||||
|
|
||||||
import junit.framework.TestCase
|
import junit.framework.TestCase
|
||||||
import org.jetbrains.kotlin.daemon.TestMessageCollector
|
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
|
||||||
|
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
|
||||||
|
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
|
||||||
import org.jetbrains.kotlin.kapt.cli.transformArgs
|
import org.jetbrains.kotlin.kapt.cli.transformArgs
|
||||||
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners
|
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
@@ -29,4 +31,24 @@ abstract class AbstractArgumentParsingTest : TestCase() {
|
|||||||
|
|
||||||
KotlinTestUtils.assertEqualsToFile(testFile, actual)
|
KotlinTestUtils.assertEqualsToFile(testFile, actual)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class TestMessageCollector : MessageCollector {
|
||||||
|
data class Message(val severity: CompilerMessageSeverity, val message: String, val location: CompilerMessageLocation?)
|
||||||
|
|
||||||
|
val messages = arrayListOf<Message>()
|
||||||
|
|
||||||
|
override fun clear() {
|
||||||
|
messages.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
|
||||||
|
messages.add(Message(severity, message, location))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hasErrors(): Boolean = messages.any { it.severity == CompilerMessageSeverity.EXCEPTION || it.severity == CompilerMessageSeverity.ERROR }
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return messages.joinToString("\n") { "${it.severity}: ${it.message}${it.location?.let{" at $it"} ?: ""}" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user