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

minor: Make term "canceled" uniformly spelled in identifiers and strings in the daemon

Browse Source
This commit is contained in:
Ilya Chernikov
2016-04-25 21:47:08 +02:00
parent 1614aca48e
commit 22283be1b7
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt
+2 -2
View File
@@ -440,7 +440,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
val jar = tmpdir.absolutePath + File.separator + "largeKotlinFile.jar"
var callbackServices: CompilerCallbackServicesFacadeServer? = null
callbackServices = CompilerCallbackServicesFacadeServer(compilationCancelledStatus = object : CompilationCanceledStatus {
callbackServices = CompilerCallbackServicesFacadeServer(compilationCanceledStatus = object : CompilationCanceledStatus {
override fun checkCanceled() {
thread {
Thread.sleep(10)
@@ -460,7 +460,7 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() {
val compilerOutput = strm.toString()
assertTrue("Expecting cancelation message in:\n$compilerOutput", compilerOutput.contains("Compilation was canceled"))
logFile.assertLogContainsSequence("error communicating with host, assuming compilation cancelled")
logFile.assertLogContainsSequence("error communicating with host, assuming compilation canceled")
logFile.delete()
}