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

Checking Java mappings after rebuild (failing now for partially compiled package facades)

Browse Source 
Original commit: 02faa02a35
This commit is contained in:
Evgeny Gerashchenko
2014-11-19 13:38:15 +03:00
parent 06875cc4b6
commit a0ea638bc8
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt
+12 -1
View File
@@ -42,6 +42,8 @@ import org.jetbrains.kotlin.utils.Printer
import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.cmdline.ProjectDescriptor
import junit.framework.TestCase import junit.framework.TestCase
import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.jps.incremental.getKotlinCache
import java.io.ByteArrayOutputStream
import java.io.PrintStream
public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
class object { class object {
@@ -223,7 +225,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
private fun createMappingsDump(project: ProjectDescriptor) = private fun createMappingsDump(project: ProjectDescriptor) =
createKotlinIncrementalCacheDump(project) + "\n\n\n" + createKotlinIncrementalCacheDump(project) + "\n\n\n" +
createCommonMappingsDump(project) createCommonMappingsDump(project) + "\n\n\n" +
createJavaMappingsDump(project)
private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String {
return StringBuilder { return StringBuilder {
@@ -263,6 +266,14 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() {
return resultBuf.toString() return resultBuf.toString()
} }
private fun createJavaMappingsDump(project: ProjectDescriptor): String {
val byteArrayOutputStream = ByteArrayOutputStream()
PrintStream(byteArrayOutputStream).use {
project.dataManager.getMappings().toStream(it)
}
return byteArrayOutputStream.toString()
}
private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?)
private fun performModificationsAndMake(moduleNames: Set<String>?): MakeResult { private fun performModificationsAndMake(moduleNames: Set<String>?): MakeResult {