From 8df209b436a5bbd27eec994142e40b1c3f70eb4b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 11 Feb 2016 15:46:26 +0300 Subject: [PATCH] Move incremental test modification utils to build-common KT-8487 --- .../testingUtils}/incrementalModificationUtils.kt | 11 +++++------ .../AbstractIncrementalCacheVersionChangedTest.kt | 4 ++-- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 8 ++++---- .../jps/build/AbstractIncrementalLazyCachesTest.kt | 4 ++-- .../build/IncrementalProjectPathCaseChangedTest.kt | 2 +- .../kotlin/jps/build/incrementalCustomTests.kt | 2 ++ 6 files changed, 16 insertions(+), 15 deletions(-) rename {jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils => build-common/src/org/jetbrains/kotlin/incremental/testingUtils}/incrementalModificationUtils.kt (91%) diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt similarity index 91% rename from jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt rename to build-common/src/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt index 438d0dee717..9ce77a6df21 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt +++ b/build-common/src/org/jetbrains/kotlin/incremental/testingUtils/incrementalModificationUtils.kt @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.build.incrementalModificationUtils +package org.jetbrains.kotlin.incremental.testingUtils import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jps.builders.JpsBuildTestCase import java.io.File import java.util.* @@ -82,18 +81,18 @@ fun getModificationsToPerform( return modifications } - val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.(${COMMANDS_AS_REGEX_PART})$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.(${COMMANDS_AS_REGEX_PART})\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false if (haveFilesWithoutNumbers && haveFilesWithNumbers) { - JpsBuildTestCase.fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") + throw IllegalStateException("Bad test data format: files ending with both unnumbered and numbered ${COMMANDS_AS_MESSAGE_PART} were found") } if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { if (allowNoFilesWithSuffixInTestData) { return listOf(listOf()) } else { - JpsBuildTestCase.fail("Bad test data format: no files ending with $COMMANDS_AS_MESSAGE_PART found") + throw IllegalStateException("Bad test data format: no files ending with ${COMMANDS_AS_MESSAGE_PART} found") } } diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index e348885d2e4..f8d2a49a50c 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.ModifyContent +import org.jetbrains.kotlin.incremental.testingUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.ModifyContent import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 673cfb30222..d285c1c5626 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,11 +46,11 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.testingUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.TouchPolicy +import org.jetbrains.kotlin.incremental.testingUtils.copyTestSources +import org.jetbrains.kotlin.incremental.testingUtils.getModificationsToPerform import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.TouchPolicy -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.copyTestSources -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.getModificationsToPerform import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.getKotlinCache diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 6be9be31d5b..02b7270f0ab 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.ModifyContent +import org.jetbrains.kotlin.incremental.testingUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.ModifyContent import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.utils.Printer diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 0e6d3f1ebf4..e2b3e54d6b1 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.SystemInfoRt import org.jetbrains.jps.model.java.JavaSourceRootType -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.Modification class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) { fun testProjectPathCaseChanged() { diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt index d5c0af29a9e..42a8c9a497c 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt @@ -16,6 +16,8 @@ package org.jetbrains.kotlin.jps.build +import org.jetbrains.kotlin.incremental.testingUtils.Modification + open class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() { fun testRenameModule() { doTest("jps-plugin/testData/incremental/custom/renameModule/")