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

Gradle: compile tests incrementally when main is changed

Browse Source 
#KT-17674 fixed
This commit is contained in:
Alexey Tsvetkov
2017-09-15 16:35:30 +03:00
parent 779b9c6fcc
commit 62f293280c
12 changed files with 371 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt
+22 -4
View File
@@ -20,10 +20,7 @@ import org.gradle.api.logging.LogLevel
import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.gradle.plugin.CopyClassesToJavaOutputStatus
import org.jetbrains.kotlin.gradle.tasks.USING_INCREMENTAL_COMPILATION_MESSAGE
import org.jetbrains.kotlin.gradle.util.checkBytecodeContains
import org.jetbrains.kotlin.gradle.util.getFileByName
import org.jetbrains.kotlin.gradle.util.getFilesByNames
import org.jetbrains.kotlin.gradle.util.modify
import org.jetbrains.kotlin.gradle.util.*
import org.junit.Test
import java.io.File
import java.util.zip.ZipFile
@@ -490,6 +487,27 @@ class KotlinGradleIT: BaseGradleIT() {
}
}
@Test
fun testIncrementalTestCompile() {
val project = Project("kotlinProject", GRADLE_VERSION)
val options = defaultBuildOptions().copy(incremental = true)
project.build("build", options = options) {
assertSuccessful()
}
val joinerKt = project.projectDir.getFileByName("KotlinGreetingJoiner.kt")
joinerKt.modify {
it.replace("class KotlinGreetingJoiner", "internal class KotlinGreetingJoiner")
}
project.build("build", options = options) {
assertSuccessful()
val testJoinerKt = project.projectDir.getFileByName("TestKotlinGreetingJoiner.kt")
assertCompiledKotlinSources(project.relativize(joinerKt, testJoinerKt))
}
}
@Test
fun testLanguageVersionApiVersionExplicit() {
val project = Project("kotlinProject", "3.3")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/TestRootAffectedIT.kt
+6 -21
View File
@@ -1,15 +1,13 @@
package org.jetbrains.kotlin.gradle
import org.jetbrains.kotlin.gradle.util.allKotlinFiles
import org.jetbrains.kotlin.gradle.util.getFileByName
import org.jetbrains.kotlin.gradle.util.modify
import org.junit.Test
import java.io.File
class TestRootAffectedIT : BaseGradleIT() {
@Test
fun testSourceRootClassIsModifiedIC() {
val project = Project("kotlinProject", "2.10")
val project = Project("kotlinProject", "4.1")
val buildOptions = defaultBuildOptions().copy(incremental = true)
project.build("build", options = buildOptions) {
@@ -26,8 +24,8 @@ class TestRootAffectedIT : BaseGradleIT() {
project.build("build", options = buildOptions) {
assertSuccessful()
val expectedToCompile = project.relativize(listOf(kotlinGreetingJoinerFile) + project.allTestKotlinFiles())
assertCompiledKotlinSources(expectedToCompile)
val testKotlinGreetingJoinerFile = project.projectDir.getFileByName("TestKotlinGreetingJoiner.kt")
assertCompiledKotlinSources(project.relativize(kotlinGreetingJoinerFile, testKotlinGreetingJoinerFile))
}
project.build("build", options = buildOptions) {
@@ -38,7 +36,8 @@ class TestRootAffectedIT : BaseGradleIT() {
@Test
fun testSourceRootClassIsRemovedIC() {
val project = Project("kotlinProject", "2.10")
// todo: update Gradle after https://github.com/gradle/gradle/issues/3051 is resolved
val project = Project("kotlinProject", "3.0")
val buildOptions = defaultBuildOptions().copy(incremental = true)
project.build("build", options = buildOptions) {
@@ -48,12 +47,6 @@ class TestRootAffectedIT : BaseGradleIT() {
val dummyFile = project.projectDir.getFileByName("Dummy.kt")
dummyFile.delete()
project.build("build", options = buildOptions) {
assertSuccessful()
val expectedToCompile = project.relativize(project.allTestKotlinFiles())
assertCompiledKotlinSources(expectedToCompile)
}
project.build("build", options = buildOptions) {
assertSuccessful()
assertCompiledKotlinSources(emptyList())
@@ -62,7 +55,7 @@ class TestRootAffectedIT : BaseGradleIT() {
@Test
fun testTestRootClassIsRemovedIC() {
val project = Project("kotlinProject", "2.10")
val project = Project("kotlinProject", "4.1")
val buildOptions = defaultBuildOptions().copy(incremental = true)
project.build("build", options = buildOptions) {
@@ -76,13 +69,5 @@ class TestRootAffectedIT : BaseGradleIT() {
assertSuccessful()
assertCompiledKotlinSources(emptyList())
}
project.build("build", options = buildOptions) {
assertSuccessful()
assertCompiledKotlinSources(emptyList())
}
}
private fun Project.allTestKotlinFiles(): Iterable<File> =
File(projectDir, "src/test").allKotlinFiles()
}