diff --git a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 2b6d388d740..d684b348ca3 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -962,4 +962,9 @@ public class KotlinTestUtils { } return string; } + + public static boolean isAllFilesPresentTest(String testName) { + //noinspection SpellCheckingInspection + return testName.toLowerCase().startsWith("allfilespresentin"); + } } diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index 2ae89e6f0c1..df9c4446488 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -124,8 +124,7 @@ public abstract class KotlinLightCodeInsightFixtureTestCase : LightCodeInsightFi return KotlinLightProjectDescriptor.INSTANCE } - protected fun isAllFilesPresentInTest(): Boolean - = getTestName(false).startsWith("AllFilesPresentIn") + protected fun isAllFilesPresentInTest(): Boolean = KotlinTestUtils.isAllFilesPresentTest(getTestName(false)) protected open fun fileName(): String = getTestName(false) + ".kt" diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt index 4e6a7628adb..b5684bb5c31 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinBinariesCheckerTest.kt @@ -19,13 +19,14 @@ package org.jetbrains.kotlin.checkers import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtilRt import org.jetbrains.kotlin.idea.test.PluginTestCaseBase +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil abstract class AbstractJavaAgainstKotlinBinariesCheckerTest : AbstractJavaAgainstKotlinCheckerTest() { override fun setUp() { super.setUp() val testName = getTestName(false) - if (testName.startsWith("AllFilesPresentIn")) { + if (KotlinTestUtils.isAllFilesPresentTest(testName)) { return } val libraryName = "libFor" + testName diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt index 08d53f23f94..6529a4ac337 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt @@ -45,7 +45,7 @@ public abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTe super.setUp() val testName = getTestName(false) - if (testName.startsWith("AllFilesPresentIn")) return + if (KotlinTestUtils.isAllFilesPresentTest(testName)) return val filePath = "${KotlinTestUtils.getTestsRoot(this)}/${getTestName(false)}.kt"