[TEST] Move utils for checking all files presented to KtTestUtil
This is needed to remove dependency on :tests-common from module with abstract test generators
This commit is contained in:
+3
-3
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.completion.test
|
||||
import com.intellij.codeInsight.completion.CompletionType
|
||||
import org.jetbrains.kotlin.idea.test.AstAccessControl
|
||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||
|
||||
abstract class AbstractMultiFileJvmBasicCompletionTest : KotlinCompletionTestCase() {
|
||||
protected fun doTest(testPath: String) {
|
||||
@@ -24,6 +24,6 @@ abstract class AbstractMultiFileJvmBasicCompletionTest : KotlinCompletionTestCas
|
||||
}
|
||||
|
||||
override fun getTestDataPath(): String {
|
||||
return KotlinTestUtils.getTestsRoot(this::class.java) + "/" + getTestName(false) + "/"
|
||||
return KtTestUtil.getTestsRoot(this::class.java) + "/" + getTestName(false) + "/"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+2
-1
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils.isAllFilesPresentTest
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
|
||||
import java.io.File
|
||||
|
||||
@@ -34,7 +35,7 @@ abstract class AbstractGradleConfigureProjectByChangingFileTest :
|
||||
}
|
||||
|
||||
private fun beforeAfterFiles(): Pair<String, String> {
|
||||
val root = KotlinTestUtils.getTestsRoot(this::class.java)
|
||||
val root = KtTestUtil.getTestsRoot(this::class.java)
|
||||
val test = KotlinTestUtils.getTestDataFileName(this::class.java, name)
|
||||
val path = "$root/$test"
|
||||
val testFile = File(path)
|
||||
|
||||
+2
-1
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.configuration.NotificationMessageCollector
|
||||
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils.isAllFilesPresentTest
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||
import java.io.File
|
||||
|
||||
abstract class AbstractMavenConfigureProjectByChangingFileTest : AbstractConfigureProjectByChangingFileTest<KotlinMavenConfigurator>() {
|
||||
@@ -53,7 +54,7 @@ abstract class AbstractMavenConfigureProjectByChangingFileTest : AbstractConfigu
|
||||
|
||||
override fun getProjectJDK(): Sdk {
|
||||
if (!isAllFilesPresentTest(getTestName(false))) {
|
||||
val root = KotlinTestUtils.getTestsRoot(this::class.java)
|
||||
val root = KtTestUtil.getTestsRoot(this::class.java)
|
||||
val dir = KotlinTestUtils.getTestDataFileName(this::class.java, name)
|
||||
|
||||
val pomFile = File("$root/$dir", MavenConstants.POM_XML)
|
||||
|
||||
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.psi.KtDeclaration;
|
||||
import org.jetbrains.kotlin.psi.KtFile;
|
||||
import org.jetbrains.kotlin.psi.KtTreeVisitorVoid;
|
||||
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
@@ -92,7 +92,7 @@ public abstract class AbstractPsiCheckerTest extends KotlinLightCodeInsightFixtu
|
||||
|
||||
@Override
|
||||
protected String getTestDataPath() {
|
||||
return KotlinTestUtils.getTestsRoot(this.getClass());
|
||||
return KtTestUtil.getTestsRoot(this.getClass());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -36,6 +36,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.MockLibraryUtil
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||
import org.jetbrains.kotlin.utils.keysToMap
|
||||
import org.jetbrains.plugins.groovy.lang.psi.impl.stringValue
|
||||
import org.junit.Assert
|
||||
@@ -101,7 +102,7 @@ abstract class AbstractIdeCompiledLightClassTest : KotlinDaemonAnalyzerTestCase(
|
||||
val testName = getTestName(false)
|
||||
if (KotlinTestUtils.isAllFilesPresentTest(testName)) return
|
||||
|
||||
val filePathWithoutExtension = "${KotlinTestUtils.getTestsRoot(this::class.java)}/${getTestName(false)}"
|
||||
val filePathWithoutExtension = "${KtTestUtil.getTestsRoot(this::class.java)}/${getTestName(false)}"
|
||||
val testFile =
|
||||
File("$filePathWithoutExtension.kt").takeIf { it.exists() } ?: File("$filePathWithoutExtension.kts").takeIf { it.exists() }
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@ import com.intellij.ide.util.gotoByName.GotoClassModel2;
|
||||
import com.intellij.ide.util.gotoByName.GotoSymbolModel2;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil;
|
||||
|
||||
import static org.jetbrains.kotlin.idea.navigation.GotoCheck.checkGotoDirectives;
|
||||
|
||||
@@ -28,7 +28,7 @@ public abstract class AbstractKotlinGotoTest extends KotlinLightCodeInsightFixtu
|
||||
|
||||
@Override
|
||||
protected void setUp() {
|
||||
dirPath = KotlinTestUtils.getTestsRoot(getClass());
|
||||
dirPath = KtTestUtil.getTestsRoot(getClass());
|
||||
super.setUp();
|
||||
}
|
||||
|
||||
|
||||
@@ -23,13 +23,13 @@ import org.jetbrains.kotlin.lexer.KtTokens
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
import org.jetbrains.kotlin.psi.psiUtil.allChildren
|
||||
import org.jetbrains.kotlin.test.InTextDirectivesUtils
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.util.KtTestUtil
|
||||
import org.junit.Assert
|
||||
import java.io.File
|
||||
|
||||
abstract class AbstractParameterInfoTest : LightCodeInsightFixtureTestCase() {
|
||||
override fun getProjectDescriptor(): LightProjectDescriptor {
|
||||
val root = KotlinTestUtils.getTestsRoot(this::class.java)
|
||||
val root = KtTestUtil.getTestsRoot(this::class.java)
|
||||
if (root.contains("Lib")) {
|
||||
return SdkAndMockLibraryProjectDescriptor("$root/sharedLib", true, true, false, false)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user