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

Clean up KAPT incremental tests

Browse Source 
Remove redundant class to invalidate sources, because it is already
handled in the KaptContext constructor.
This commit is contained in:
Ivan Gavrilovic
2019-10-16 18:08:37 +01:00
committed by Yan Zhulanow
parent 7fc25a9c04
commit 68723125f2
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-base/test/org/jetbrains/kotlin/kapt3/base/incremental/IncrementalKaptTest.kt
+5 -13
View File
@@ -76,12 +76,10 @@ class IncrementalKaptTest {
}.build() }.build()
KaptContext(optionsForSecondRun, true, logger).use { KaptContext(optionsForSecondRun, true, logger).use {
val sourcesToReprocess =
it.cacheManager!!.invalidateAndGetDirtyFiles(optionsForSecondRun.changedFiles, emptyList())
assertFalse(outputDir.resolve("test/UserGenerated.java").exists()) assertFalse(outputDir.resolve("test/UserGenerated.java").exists())
it.doAnnotationProcessing( it.doAnnotationProcessing(
optionsForSecondRun.collectJavaSourceFiles(sourcesToReprocess), listOf(SimpleProcessor().toIsolating()) optionsForSecondRun.collectJavaSourceFiles(it.sourcesToReprocess), listOf(SimpleProcessor().toIsolating())
) )
} }
@@ -90,10 +88,8 @@ class IncrementalKaptTest {
sourcesDir.resolve("User.java").delete() sourcesDir.resolve("User.java").delete()
KaptContext(optionsForSecondRun, true, logger).use { KaptContext(optionsForSecondRun, true, logger).use {
val sourcesToReprocess = it.cacheManager!!.invalidateAndGetDirtyFiles(optionsForSecondRun.changedFiles, emptyList())
it.doAnnotationProcessing( it.doAnnotationProcessing(
optionsForSecondRun.collectJavaSourceFiles(sourcesToReprocess), listOf(SimpleProcessor().toIsolating()) optionsForSecondRun.collectJavaSourceFiles(it.sourcesToReprocess), listOf(SimpleProcessor().toIsolating())
) )
} }
@@ -150,12 +146,10 @@ class IncrementalKaptTest {
}.build() }.build()
KaptContext(optionsForSecondRun, true, logger).use { KaptContext(optionsForSecondRun, true, logger).use {
val sourcesToReprocess =
it.cacheManager!!.invalidateAndGetDirtyFiles(optionsForSecondRun.changedFiles, emptyList())
assertFalse(outputDir.resolve("test/UserGenerated.java").exists()) assertFalse(outputDir.resolve("test/UserGenerated.java").exists())
it.doAnnotationProcessing( it.doAnnotationProcessing(
optionsForSecondRun.collectJavaSourceFiles(sourcesToReprocess), listOf(SimpleGeneratingIfTypeDoesNotExist().toIsolating()) optionsForSecondRun.collectJavaSourceFiles(it.sourcesToReprocess), listOf(SimpleGeneratingIfTypeDoesNotExist().toIsolating())
) )
} }
@@ -209,15 +203,13 @@ class IncrementalKaptTest {
}.build() }.build()
KaptContext(optionsForSecondRun, true, logger).use { KaptContext(optionsForSecondRun, true, logger).use {
val sourcesToReprocess = assertEquals(SourcesToReprocess.FullRebuild, it.sourcesToReprocess)
it.cacheManager!!.invalidateAndGetDirtyFiles(optionsForSecondRun.changedFiles, emptyList())
assertEquals(SourcesToReprocess.FullRebuild, sourcesToReprocess)
// check output dir is empty // check output dir is empty
assertEquals(listOf(outputDir), outputDir.walkTopDown().toList()) assertEquals(listOf(outputDir), outputDir.walkTopDown().toList())
it.doAnnotationProcessing( it.doAnnotationProcessing(
optionsForSecondRun.collectJavaSourceFiles(sourcesToReprocess), optionsForSecondRun.collectJavaSourceFiles(it.sourcesToReprocess),
listOf(DynamicProcessor(RuntimeProcType.NON_INCREMENTAL).toDynamic()) listOf(DynamicProcessor(RuntimeProcType.NON_INCREMENTAL).toDynamic())
) )
} }