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

Mock constant search in JPS tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2017-08-24 19:45:09 +03:00
parent 2312013c41
commit b73d5cbe1f
26 changed files with 132 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJsCompilerRunnerTestGenerated.java
+6
View File
@@ -176,6 +176,12 @@ public class IncrementalJsCompilerRunnerTestGenerated extends AbstractIncrementa
doTest(fileName);
}
@TestMetadata("constantValueChanged")
public void testConstantValueChanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantValueChanged/");
doTest(fileName);
}
@TestMetadata("constantsUnchanged")
public void testConstantsUnchanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/IncrementalJvmCompilerRunnerTestGenerated.java
+6
View File
@@ -176,6 +176,12 @@ public class IncrementalJvmCompilerRunnerTestGenerated extends AbstractIncrement
doTest(fileName);
}
@TestMetadata("constantValueChanged")
public void testConstantValueChanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantValueChanged/");
doTest(fileName);
}
@TestMetadata("constantsUnchanged")
public void testConstantsUnchanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+23 -2
View File
@@ -22,6 +22,7 @@ import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.io.FileUtilRt
import com.intellij.testFramework.TestLoggerFactory
import com.intellij.testFramework.UsefulTestCase
import com.intellij.util.concurrency.FixedFuture
import junit.framework.TestCase
import org.apache.log4j.ConsoleAppender
import org.apache.log4j.Level
@@ -45,7 +46,6 @@ import org.jetbrains.jps.util.JpsPathUtil
import org.jetbrains.kotlin.config.IncrementalCompilation
import org.jetbrains.kotlin.incremental.CacheVersion
import org.jetbrains.kotlin.incremental.LookupSymbol
import org.jetbrains.kotlin.incremental.components.LookupTracker
import org.jetbrains.kotlin.incremental.testingUtils.*
import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider
import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget
@@ -55,6 +55,7 @@ import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.kotlin.utils.keysToMap
import java.io.*
import java.util.*
import java.util.concurrent.Future
import kotlin.reflect.jvm.javaField
abstract class AbstractIncrementalJpsTest(
@@ -130,11 +131,14 @@ abstract class AbstractIncrementalJpsTest(
super.tearDown()
}
// JPS forces rebuild of all files when JVM constant has been changed and Callbacks.ConstantAffectionResolver
// is not provided, so ConstantAffectionResolver is mocked with empty implementation
protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver?
get() = null
get() = MockConstantSearch(workDir)
private fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().allModules()): MakeResult {
val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath)
val logger = MyLogger(workDirPath)
projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger))
@@ -476,6 +480,23 @@ abstract class AbstractIncrementalJpsTest(
}
}
private class MockConstantSearch(private val workDir: File) : Callbacks.ConstantAffectionResolver {
override fun request(
ownerClassName: String,
fieldName: String,
accessFlags: Int,
fieldRemoved: Boolean,
accessChanged: Boolean
): Future<Callbacks.ConstantAffection> {
val affectedFiles = workDir.walk().filter { it.isFile && it.isNameUsage() }
return FixedFuture(Callbacks.ConstantAffection(affectedFiles.toList()))
}
private fun File.isNameUsage(): Boolean =
name.equals("usage.kt", ignoreCase = true)
|| name.equals("usage.java", ignoreCase = true)
}
internal val ProjectDescriptor.allModuleTargets: Collection<ModuleBuildTarget>
get() = buildTargetIndex.allTargets.filterIsInstance<ModuleBuildTarget>()
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java
+6
View File
@@ -347,6 +347,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
doTest(fileName);
}
@TestMetadata("constantValueChanged")
public void testConstantValueChanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantValueChanged/");
doTest(fileName);
}
@TestMetadata("constantsUnchanged")
public void testConstantsUnchanged() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/");
jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
Vendored
+1 -3
View File
@@ -13,12 +13,10 @@ Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/constant/ConstantKt.class
out/production/module/usage/UsageKt.class
End of files
Compiling files:
src/constant.kt
src/usage.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log
Vendored
+2 -9
View File
@@ -12,14 +12,7 @@ Marked as dirty by Kotlin:
module2/src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module1/META-INF/module1.kotlin_module
out/production/module1/test/ConstKt.class
End of files
Compiling files:
module1/src/const.kt
End of files
Exit code: OK
Exit code: NOTHING_DONE
------------------------------------------
Building module2
Cleaning output files:
@@ -29,4 +22,4 @@ Compiling files:
module2/src/usage.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/allConstants/build.log
Vendored
+1 -4
View File
@@ -24,13 +24,10 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/ConstKt.class
out/production/module/test/Usage.class
End of files
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log
Vendored
-3
View File
@@ -12,12 +12,9 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
out/production/module/test/Usage.class
End of files
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK
jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log
Vendored
+26 -1
View File
@@ -7,5 +7,30 @@ End of files
Compiling files:
src/const.kt
End of files
Exit code: OK
Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/UsageKt.class
End of files
Compiling files:
src/usage.kt
End of files
Exit code: ABORT
------------------------------------------
COMPILATION FAILED
Unresolved reference: FOO
================ Step #2 =================
Cleaning output files:
out/production/module/test/ConstKt.class
End of files
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt
Vendored
+2 -1
View File
@@ -1,3 +1,4 @@
package test
val CONST = "foo"
const val FOO = "foo"
const val BAR = "bar"
jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new
Vendored
-3
View File
@@ -1,3 +0,0 @@
package test
val CONST = "I'm not a constant anymore:" + System.currentTimeMillis()
jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new.1
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
const val BAR = "bar"
jps-plugin/testData/incremental/pureKotlin/constantRemoved/dummy.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
fun dummy() {}
jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
fun usage() {
println(FOO)
}
jps-plugin/testData/incremental/pureKotlin/constantRemoved/usage.kt.new.2
Vendored
+4
View File
@@ -0,0 +1,4 @@
package test
fun usage() {
}
jps-plugin/testData/incremental/pureKotlin/constantValueChanged/build.log
Vendored
+22
View File
@@ -0,0 +1,22 @@
================ Step #1 =================
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/ConstKt.class
End of files
Compiling files:
src/const.kt
End of files
Marked as dirty by Kotlin:
src/usage.kt
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/UsageKt.class
End of files
Compiling files:
src/usage.kt
End of files
Exit code: OK
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
const val CONST = "foo"
jps-plugin/testData/incremental/pureKotlin/constantValueChanged/const.kt.new
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
const val CONST = "bar"
jps-plugin/testData/incremental/pureKotlin/constantValueChanged/dummy.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
fun dummy() {}
jps-plugin/testData/incremental/pureKotlin/constantValueChanged/usage.kt
Vendored
+5
View File
@@ -0,0 +1,5 @@
package test
fun usage() {
println(CONST)
}
jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log
Vendored
+1 -3
View File
@@ -11,12 +11,10 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/test/Object.class
out/production/module/test/Usage.class
End of files
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log
Vendored
+1 -4
View File
@@ -12,13 +12,10 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/test/ConstKt.class
out/production/module/test/Usage.class
End of files
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log
Vendored
+1 -4
View File
@@ -12,13 +12,10 @@ Marked as dirty by Kotlin:
Exit code: ADDITIONAL_PASS_REQUIRED
------------------------------------------
Cleaning output files:
out/production/module/test/Trait$Companion.class
out/production/module/test/Trait.class
out/production/module/test/Usage.class
End of files
Compiling files:
src/const.kt
src/usage.kt
End of files
Exit code: OK
------------------------------------------
------------------------------------------
jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log
Vendored
+1 -5
View File
@@ -9,14 +9,10 @@ Compiling files:
src/JavaClass.java
End of files
Cleaning output files:
out/production/module/JavaClass.class
out/production/module/Usage.class
End of files
Compiling files:
src/usage.kt
End of files
Exit code: OK
------------------------------------------
Compiling files:
src/JavaClass.java
End of files
------------------------------------------
jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log
Vendored
+2 -7
View File
@@ -11,14 +11,9 @@ Exit code: OK
------------------------------------------
Cleaning output files:
out/production/module/Usage.class
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files
Compiling files:
src/const.kt
End of files
Exit code: OK
Exit code: NOTHING_DONE
------------------------------------------
Compiling files:
src/Usage.java
End of files
End of files
jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log
Vendored
+2 -7
View File
@@ -11,14 +11,9 @@ Exit code: OK
------------------------------------------
Cleaning output files:
out/production/module/Usage.class
out/production/module/test/Klass$Companion.class
out/production/module/test/Klass.class
End of files
Compiling files:
src/const.kt
End of files
Exit code: OK
Exit code: NOTHING_DONE
------------------------------------------
Compiling files:
src/Usage.java
End of files
End of files