From a0ea638bc8cc62bc999779769451c088e83dbda4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 19 Nov 2014 13:38:15 +0300 Subject: [PATCH] Checking Java mappings after rebuild (failing now for partially compiled package facades) Original commit: 02faa02a358304660b1a7706c091541d91d952d8 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 02eb45b76b8..d147c27c157 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -42,6 +42,8 @@ import org.jetbrains.kotlin.utils.Printer import org.jetbrains.jps.cmdline.ProjectDescriptor import junit.framework.TestCase import org.jetbrains.kotlin.jps.incremental.getKotlinCache +import java.io.ByteArrayOutputStream +import java.io.PrintStream public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { class object { @@ -223,7 +225,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private fun createMappingsDump(project: ProjectDescriptor) = createKotlinIncrementalCacheDump(project) + "\n\n\n" + - createCommonMappingsDump(project) + createCommonMappingsDump(project) + "\n\n\n" + + createJavaMappingsDump(project) private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { return StringBuilder { @@ -263,6 +266,14 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { 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 fun performModificationsAndMake(moduleNames: Set?): MakeResult {