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

[KAPT] Fix broken incremental test

Browse Source
This commit is contained in:
Andrey Zinovyev
2021-03-10 14:11:15 +03:00
committed by TeamCityServer
parent a3a745e7a5
commit d941d41776
1 changed files with 9 additions and 3 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/KaptIncrementalWithIsolatingApt.kt
+9 -3
View File
@@ -231,14 +231,20 @@ class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() {
""".trimIndent()
)
val allKotlinStubs = setOf(
val annotatedKotlinStubs = setOf(
project.projectDir.resolve("build/tmp/kapt3/stubs/main/foo/A.java").canonicalPath,
project.projectDir.resolve("build/tmp/kapt3/stubs/main/bar/B.java").canonicalPath,
project.projectDir.resolve("build/tmp/kapt3/stubs/main/bar/UseBKt.java").canonicalPath,
project.projectDir.resolve("build/tmp/kapt3/stubs/main/baz/UtilKt.java").canonicalPath,
project.projectDir.resolve("build/tmp/kapt3/stubs/main/baz/UtilKt.java").canonicalPath,
project.projectDir.resolve("build/tmp/kapt3/stubs/main/error/NonExistentClass.java").canonicalPath
)
val allKotlinStubs = annotatedKotlinStubs + setOf(
project.projectDir.resolve("build/tmp/kapt3/stubs/main/delegate/Delegate.java").canonicalPath,
project.projectDir.resolve("build/tmp/kapt3/stubs/main/delegate/Usage.java").canonicalPath
)
project.build("clean", "build") {
assertSuccessful()
assertEquals(allKotlinStubs + fileInWorkingDir("src/main/java/foo/JavaClass.java").canonicalPath, getProcessedSources(output))
@@ -248,7 +254,7 @@ class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() {
classpathTypeSource.writeText(classpathTypeSource.readText().replace("}", "int i = 10;\n}"))
project.build("build") {
assertSuccessful()
assertEquals(allKotlinStubs, getProcessedSources(output))
assertEquals(annotatedKotlinStubs, getProcessedSources(output))
}
}
@@ -432,4 +438,4 @@ fun BaseGradleIT.Project.generateProcessor(vararg processors: Pair<String, Class
it.closeEntry()
}
return processorPath
}
}