From 52fb79b0be8fd12aac68a108167b77fcc22d319c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 4 Feb 2015 15:37:03 +0300 Subject: [PATCH] Minor, move replaceHashWithStar to JetTestUtils Original commit: 45fec9257a2441704f2ee9ed04207332938e6360 --- .../jps/build/AbstractIncrementalJpsTest.kt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) 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 d147c27c157..9ca202a651b 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 @@ -20,6 +20,7 @@ import org.jetbrains.jps.builders.JpsBuildTestCase import kotlin.properties.Delegates import com.intellij.openapi.util.io.FileUtil import java.io.File +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase import org.jetbrains.jps.builders.logging.BuildLoggingManager @@ -34,7 +35,6 @@ import java.util.HashMap import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse -import java.util.regex.Pattern import kotlin.test.assertEquals import org.jetbrains.jps.model.JpsModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtilRt @@ -347,20 +347,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun isEnabled(): Boolean = true override fun logLine(message: String?) { - fun String.replaceHashWithStar(): String { - val matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(this) - if (matcher.find()) { - return matcher.replaceAll("\\$*") - } - return this - } - - logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n') - } - - class object { - // We suspect sequences of eight consecutive hexadecimal digits to be a package part hash code - val STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{8})") + logBuf.append(JetTestUtils.replaceHashWithStar(message!!.trimLeading(rootPath + "/"))).append('\n') } }