diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt index 055daf8e553..d11d15d3c30 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.kt @@ -5,7 +5,6 @@ package org.jetbrains.kotlin.android.tests -import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.io.FileUtil @@ -23,6 +22,7 @@ import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.* +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import java.io.File import java.io.FileWriter @@ -303,7 +303,9 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager if (kind.withReflection) JVM8REFLECT else JVM8 } else if (kind.withReflection) REFLECT else COMMON val filesHolder = holders.getOrPut(key) { - FilesWriter(compiler, KotlinTestUtils.newConfiguration(kind, jdkKind, KotlinTestUtils.getAnnotationsJar()).apply { + FilesWriter(compiler, KotlinTestUtils.newConfiguration(kind, jdkKind, + KtTestUtil.getAnnotationsJar() + ).apply { println("Creating new configuration by $key") KotlinBaseTest.updateConfigurationByDirectivesInTestFiles(testFiles, this) }) @@ -341,7 +343,7 @@ class CodegenTestsOnAndroidGenerator private constructor(private val pathManager @Throws(IOException::class) internal fun writeAndroidSkdToLocalProperties(pathManager: PathManager) { - val sdkRoot = KotlinTestUtils.getAndroidSdkSystemIndependentPath() + val sdkRoot = KtTestUtil.getAndroidSdkSystemIndependentPath() println("Writing android sdk to local.properties: $sdkRoot") val file = File(pathManager.tmpFolder + "/local.properties") FileWriter(file).use { fw -> fw.write("sdk.dir=$sdkRoot") } diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java index 4004b564612..8c135fc9f81 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/PathManager.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.android.tests; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; @@ -69,7 +69,7 @@ public class PathManager { } public String getAndroidSdkRoot() { - return KotlinTestUtils.getAndroidSdkSystemIndependentPath(); + return KtTestUtil.getAndroidSdkSystemIndependentPath(); } public String getAndroidModuleRoot() { diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt index 3dc53a600bf..820f7e26f06 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerApiTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.daemon import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler @@ -30,13 +30,16 @@ import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.resetApplicationToNull +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream import java.net.URLClassLoader import java.nio.file.Path -import kotlin.io.path.* +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.createTempFile +import kotlin.io.path.deleteIfExists @OptIn(ExperimentalPathApi::class) class CompilerApiTest : KotlinIntegrationTestBase() { @@ -83,8 +86,8 @@ class CompilerApiTest : KotlinIntegrationTestBase() { return code to outputs } - private fun getHelloAppBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp" - private fun getSimpleScriptBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/simpleScript" + private fun getHelloAppBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/helloApp" + private fun getSimpleScriptBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/simpleScript" private fun run(baseDir: String, logName: String, vararg args: String): Int = runJava(baseDir, logName, *args) diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt index 143c22d721b..519f6843453 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/CompilerDaemonTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.daemon.client.* import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.KotlinPaths import java.io.ByteArrayOutputStream import java.io.File @@ -95,8 +95,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { assertEquals("build results differ", AbstractCliTest.removePerfOutput(res1.out), AbstractCliTest.removePerfOutput(res2.out)) } - private fun getTestBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) - private fun getHelloAppBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp" + private fun getTestBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) + private fun getHelloAppBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/helloApp" private fun run(logName: String, vararg args: String): Int = runJava(getTestBaseDir(), logName, *args) diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt index b28d713f0c1..ae0ba2d4086 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerApiTest.kt @@ -8,8 +8,8 @@ package org.jetbrains.kotlin.daemon.experimental.integration import com.intellij.openapi.application.ApplicationManager import kotlinx.coroutines.runBlocking import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.test.IgnoreAll import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.resetApplicationToNull +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import org.junit.runner.RunWith import java.io.File @@ -31,7 +32,8 @@ import java.net.URLClassLoader import java.nio.file.Path import java.util.logging.LogManager import java.util.logging.Logger -import kotlin.io.path.* +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.createTempFile private val logFiles = arrayListOf() @@ -150,8 +152,8 @@ class CompilerApiTest : KotlinIntegrationTestBase() { code to outputs } - private fun getHelloAppBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp" - private fun getSimpleScriptBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/simpleScript" + private fun getHelloAppBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/helloApp" + private fun getSimpleScriptBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/simpleScript" private fun run(baseDir: String, logName: String, vararg args: String): Int = runJava(baseDir, logName, *args) diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt index 40b3248281b..21541f86b35 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/integration/CompilerDaemonTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.daemon.common.experimental.findCallbackServerSocket import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.progress.experimental.CompilationCanceledStatus import org.jetbrains.kotlin.test.IgnoreAll -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.KotlinPaths import org.junit.runner.RunWith import java.io.ByteArrayOutputStream @@ -157,8 +157,8 @@ class CompilerDaemonTest : KotlinIntegrationTestBase() { } } - private fun getTestBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) - private fun getHelloAppBaseDir(): String = KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp" + private fun getTestBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/" + getTestName(true) + private fun getHelloAppBaseDir(): String = KtTestUtil.getTestDataPathBase() + "/integration/smoke/helloApp" private fun run(logName: String, vararg args: String): Int = runJava(getTestBaseDir(), logName, *args) diff --git a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt index 399f4d19086..b646f75b3d6 100644 --- a/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt +++ b/compiler/daemon/daemon-tests/test/org/jetbrains/kotlin/daemon/experimental/unit/ConnectionsTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.daemon.experimental.CompileServiceServerSideImpl import org.jetbrains.kotlin.daemon.loggerCompatiblePath import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.test.IgnoreAll -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith import java.io.ByteArrayOutputStream import java.io.File @@ -36,7 +36,9 @@ import java.util.* import java.util.logging.LogManager import java.util.logging.Logger import kotlin.concurrent.schedule -import kotlin.io.path.* +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.createTempFile +import kotlin.io.path.deleteIfExists @OptIn(ExperimentalPathApi::class) @RunWith(IgnoreAll::class) @@ -364,7 +366,7 @@ class ConnectionsTest : KotlinIntegrationTestBase() { CompileService.NO_SESSION, arrayOf( "-include-runtime", - File(KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/helloApp", "hello.kt").absolutePath, + File(KtTestUtil.getTestDataPathBase() + "/integration/smoke/helloApp", "hello.kt").absolutePath, "-d", jar ), diff --git a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt index 47147ad1248..5b9505f687d 100644 --- a/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt +++ b/compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/java/AbstractFirTypeEnhancementTest.kt @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType import org.jetbrains.kotlin.test.* -import org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar import org.jetbrains.kotlin.test.KotlinTestUtils.newConfiguration import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil.getAnnotationsJar import java.io.File import java.io.IOException import kotlin.reflect.jvm.javaField diff --git a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt index 98586fc2da2..fc35efe7221 100644 --- a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt +++ b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import kotlin.reflect.full.memberProperties import kotlin.reflect.jvm.isAccessible @@ -45,7 +46,7 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase( "kt", KotlinParserDefinition() ) { - override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getTestDataPath() = KtTestUtil.getHomeDirectory() private fun createFile(filePath: String, fileType: IElementType): PsiFile { val psiFactory = KtPsiFactory(myProject) diff --git a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt index a9a52efb938..327f5d7342f 100644 --- a/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt +++ b/compiler/incremental-compilation-impl/test/org/jetbrains/kotlin/incremental/AbstractIncrementalJvmCompilerRunnerTest.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.incremental.utils.TestCompilationResult import org.jetbrains.kotlin.incremental.utils.TestICReporter import org.jetbrains.kotlin.incremental.utils.TestMessageCollector -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.ByteArrayOutputStream import java.io.File import javax.tools.ToolProvider @@ -79,6 +79,6 @@ abstract class AbstractIncrementalJvmCompilerRunnerTest : AbstractIncrementalCom private val compileClasspath = listOf( kotlinStdlibJvm, - KotlinTestUtils.getAnnotationsJar() + KtTestUtil.getAnnotationsJar() ).joinToString(File.pathSeparator) { it.canonicalPath } } diff --git a/compiler/test-infrastructure-utils/build.gradle.kts b/compiler/test-infrastructure-utils/build.gradle.kts new file mode 100644 index 00000000000..f1de835837d --- /dev/null +++ b/compiler/test-infrastructure-utils/build.gradle.kts @@ -0,0 +1,27 @@ +plugins { + kotlin("jvm") + id("jps-compatible") +} + +dependencies { + testImplementation(project(":compiler:fir:entrypoint")) + testImplementation(project(":compiler:cli")) + testImplementation(intellijCoreDep()) { includeJars("intellij-core") } + + testCompileOnly(project(":kotlin-reflect-api")) + testRuntimeOnly(project(":kotlin-reflect")) + testRuntimeOnly(project(":core:descriptors.runtime")) + + testImplementation(intellijDep()) { + // This dependency is needed only for FileComparisonFailure + includeJars("idea_rt", rootProject = rootProject) + isTransitive = false + } +} + +sourceSets { + "main" { none() } + "test" { projectDefault() } +} + +testsJar() diff --git a/compiler/tests-common/tests/com/intellij/testFramework/TestDataFile.java b/compiler/test-infrastructure-utils/tests/com/intellij/testFramework/TestDataFile.java similarity index 100% rename from compiler/tests-common/tests/com/intellij/testFramework/TestDataFile.java rename to compiler/test-infrastructure-utils/tests/com/intellij/testFramework/TestDataFile.java diff --git a/compiler/tests-common/tests/com/intellij/testFramework/TestDataPath.java b/compiler/test-infrastructure-utils/tests/com/intellij/testFramework/TestDataPath.java similarity index 100% rename from compiler/tests-common/tests/com/intellij/testFramework/TestDataPath.java rename to compiler/test-infrastructure-utils/tests/com/intellij/testFramework/TestDataPath.java diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoParser.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt similarity index 99% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt index 8da47b321c6..01f783596a4 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/CodeMetaInfoRenderer.kt @@ -9,7 +9,6 @@ import com.intellij.util.containers.Stack import org.jetbrains.kotlin.checkers.utils.CheckerTestUtil import org.jetbrains.kotlin.codeMetaInfo.model.CodeMetaInfo import java.io.File -import java.lang.StringBuilder object CodeMetaInfoRenderer { fun renderTagsToText( diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/model/CodeMetaInfo.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/model/DiagnosticCodeMetaInfo.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/model/ParsedCodeMetaInfo.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/AbstractCodeMetaInfoRenderConfiguration.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/DiagnosticCodeMetaInfoRenderConfiguration.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/ParsedCodeMetaInfoRenderConfiguration.kt b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/ParsedCodeMetaInfoRenderConfiguration.kt similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/ParsedCodeMetaInfoRenderConfiguration.kt rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codeMetaInfo/renderConfigurations/ParsedCodeMetaInfoRenderConfiguration.kt diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java similarity index 100% rename from compiler/tests-common/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java rename to compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java diff --git a/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java new file mode 100644 index 00000000000..1d9b56b558b --- /dev/null +++ b/compiler/test-infrastructure-utils/tests/org/jetbrains/kotlin/test/util/KtTestUtil.java @@ -0,0 +1,196 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.test.util; + +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtilRt; +import com.intellij.openapi.vfs.CharsetToolkit; +import com.intellij.psi.PsiFileFactory; +import com.intellij.psi.impl.PsiFileFactoryImpl; +import com.intellij.testFramework.LightVirtualFile; +import com.intellij.util.PathUtil; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.idea.KotlinLanguage; +import org.jetbrains.kotlin.psi.KtFile; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; + +public class KtTestUtil { + private static String homeDir = computeHomeDirectory(); + + @NotNull + public static File tmpDirForTest(@NotNull String testClassName, @NotNull String testName) throws IOException { + return normalizeFile(FileUtil.createTempDirectory(testClassName, testName, false)); + } + + @NotNull + public static File tmpDir(String name) throws IOException { + return normalizeFile(FileUtil.createTempDirectory(name, "", false)); + } + + @NotNull + public static File tmpDirForReusableFolder(String name) throws IOException { + return normalizeFile(FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, "", true)); + } + + private static File normalizeFile(File file) throws IOException { + // Get canonical file to be sure that it's the same as inside the compiler, + // for example, on Windows, if a canonical path contains any space from FileUtil.createTempDirectory we will get + // a File with short names (8.3) in its path and it will break some normalization passes in tests. + return file.getCanonicalFile(); + } + + @NotNull + public static KtFile createFile(@NotNull @NonNls String name, @NotNull String text, @NotNull Project project) { + String shortName = name.substring(name.lastIndexOf('/') + 1); + shortName = shortName.substring(shortName.lastIndexOf('\\') + 1); + LightVirtualFile virtualFile = new LightVirtualFile(shortName, KotlinLanguage.INSTANCE, StringUtilRt.convertLineSeparators(text)); + + virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET); + PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); + //noinspection ConstantConditions + return (KtFile) factory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false); + } + + public static String doLoadFile(String myFullDataPath, String name) throws IOException { + String fullName = myFullDataPath + File.separatorChar + name; + return doLoadFile(new File(fullName)); + } + + public static String doLoadFile(@NotNull File file) throws IOException { + try { + return FileUtil.loadFile(file, CharsetToolkit.UTF8, true); + } + catch (FileNotFoundException fileNotFoundException) { + /* + * Unfortunately, the FileNotFoundException will only show the relative path in it's exception message. + * This clarifies the exception by showing the full path. + */ + String messageWithFullPath = file.getAbsolutePath() + " (No such file or directory)"; + throw new IOException( + "Ensure you have your 'Working Directory' configured correctly as the root " + + "Kotlin project directory in your test configuration\n\t" + + messageWithFullPath, + fileNotFoundException); + } + } + + public static String getFilePath(File file) { + return FileUtil.toSystemIndependentName(file.getPath()); + } + + @NotNull + public static File getJdk9Home() { + String jdk9 = System.getenv("JDK_9"); + if (jdk9 == null) { + jdk9 = System.getenv("JDK_19"); + if (jdk9 == null) { + throw new AssertionError("Environment variable JDK_9 is not set!"); + } + } + return new File(jdk9); + } + + @Nullable + public static File getJdk11Home() { + String jdk11 = System.getenv("JDK_11"); + if (jdk11 == null) { + return null; + } + return new File(jdk11); + } + + @NotNull + public static File getJdk15Home() { + String jdk15 = System.getenv("JDK_15"); + + if (jdk15 == null) { + jdk15 = System.getenv("JDK_15_0"); + } + + if (jdk15 == null) { + throw new AssertionError("Environment variable JDK_15 is not set!"); + } + return new File(jdk15); + } + + @NotNull + public static String getTestDataPathBase() { + return getHomeDirectory() + "/compiler/testData"; + } + + @NotNull + public static String getHomeDirectory() { + return homeDir; + } + + @NotNull + private static String computeHomeDirectory() { + String userDir = System.getProperty("user.dir"); + File dir = new File(userDir == null ? "." : userDir); + return FileUtil.toCanonicalPath(dir.getAbsolutePath()); + } + + public static File findMockJdkRtJar() { + return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/rt.jar"); + } + + // Differs from common mock JDK only by one additional 'nonExistingMethod' in Collection and constructor from Double in Throwable + // It's needed to test the way we load additional built-ins members that neither in black nor white lists + public static File findMockJdkRtModified() { + return new File(getHomeDirectory(), "compiler/testData/mockJDKModified/rt.jar"); + } + + public static File findAndroidApiJar() { + String androidJarProp = System.getProperty("android.jar"); + File androidJarFile = androidJarProp == null ? null : new File(androidJarProp); + if (androidJarFile == null || !androidJarFile.isFile()) { + throw new RuntimeException( + "Unable to get a valid path from 'android.jar' property (" + + androidJarProp + + "), please point it to the 'android.jar' file location"); + } + return androidJarFile; + } + + @NotNull + public static File findAndroidSdk() { + String androidSdkProp = System.getProperty("android.sdk"); + File androidSdkDir = androidSdkProp == null ? null : new File(androidSdkProp); + if (androidSdkDir == null || !androidSdkDir.isDirectory()) { + throw new RuntimeException( + "Unable to get a valid path from 'android.sdk' property (" + + androidSdkProp + + "), please point it to the android SDK location"); + } + return androidSdkDir; + } + + public static String getAndroidSdkSystemIndependentPath() { + return PathUtil.toSystemIndependentName(findAndroidSdk().getAbsolutePath()); + } + + public static File getAnnotationsJar() { + return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar"); + } + + public static void mkdirs(@NotNull File file) { + if (file.isDirectory()) { + return; + } + if (!file.mkdirs()) { + if (file.exists()) { + throw new IllegalStateException("Failed to create " + file + ": file exists and not a directory"); + } + throw new IllegalStateException("Failed to create " + file); + } + } +} diff --git a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt index cafff7cd662..66b468a6e55 100644 --- a/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt +++ b/compiler/tests-against-klib/tests/org/jetbrains/kotlin/codegen/ir/AbstractIrCompileKotlinAgainstKlibTest.kt @@ -13,8 +13,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment.Companion.cre import org.jetbrains.kotlin.codegen.AbstractBlackBoxCodegenTest import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.nio.file.Paths import java.util.* @@ -30,7 +30,7 @@ abstract class AbstractCompileKotlinAgainstKlibTest : AbstractBlackBoxCodegenTes klibName = Paths.get(outputDir.toString(), wholeFile.name.toString().removeSuffix(".kt")).toString() val classpath: MutableList = ArrayList() - classpath.add(KotlinTestUtils.getAnnotationsJar()) + classpath.add(KtTestUtil.getAnnotationsJar()) val configuration = createConfiguration( configurationKind, getTestJdkKind(files), backend, classpath, listOf(outputDir), files ) diff --git a/compiler/tests-common/build.gradle.kts b/compiler/tests-common/build.gradle.kts index 8ce16983e30..236b42857a4 100644 --- a/compiler/tests-common/build.gradle.kts +++ b/compiler/tests-common/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { testCompile(project(":kotlin-test:kotlin-test-jvm")) testCompile(projectTests(":compiler:tests-common-jvm6")) testCompile(project(":kotlin-scripting-compiler-impl")) + testCompile(projectTests(":compiler:test-infrastructure-utils")) testCompile(commonDep("junit:junit")) testCompile(androidDxJar()) { isTransitive = false } testCompile(commonDep("com.android.tools:r8")) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt index c67c91ed953..a0b65dd114d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/cfg/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTestWithStdLib import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory +import org.jetbrains.kotlin.test.util.KtTestUtil.getHomeDirectory import java.io.File abstract class AbstractDiagnosticsTestWithStdLibUsingJavac : AbstractDiagnosticsTestWithStdLib() { @@ -45,4 +45,4 @@ abstract class AbstractDiagnosticsTestWithStdLibUsingJavac : AbstractDiagnostics environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true) } -} \ No newline at end of file +} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt index eb43b0551f5..a08c193f54e 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/AbstractForeignAnnotationsNoAnnotationInClasspathTest.kt @@ -18,14 +18,14 @@ package org.jetbrains.kotlin.checkers import org.jetbrains.kotlin.codegen.CodegenTestUtil import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractForeignAnnotationsNoAnnotationInClasspathTest : AbstractForeignAnnotationsTest() { // This should be executed after setUp runs, since setUp changes the root folder // for temporary files. private val compiledJavaPath by lazy { - KotlinTestUtils.tmpDir("java-compiled-files") + KtTestUtil.tmpDir("java-compiled-files") } override fun getExtraClasspath(): List { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt index c6935bb88c3..5cd4b9a80c9 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.kt @@ -52,7 +52,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactoryImpl import org.jetbrains.kotlin.test.Directives import org.jetbrains.kotlin.test.InTextDirectivesUtils.isDirectiveDefined import org.jetbrains.kotlin.test.KotlinBaseTest -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.addIfNotNull import org.junit.Assert import java.io.File @@ -118,12 +118,24 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava { val result: MutableList = ArrayList() - result.add(KotlinTestUtils.getAnnotationsJar()) + result.add(KtTestUtil.getAnnotationsJar()) result.addAll(getExtraClasspath()) val fileText = file.readText(Charsets.UTF_8) if (InTextDirectivesUtils.isDirectiveDefined(fileText, "ANDROID_ANNOTATIONS")) { @@ -104,7 +108,7 @@ abstract class KotlinMultiFileTestWithJava ktFiles = - files.stream().map(file -> KotlinTestUtils.createFile(file.name, file.content, environment.getProject())) + files.stream().map(file -> KtTestUtil.createFile(file.name, file.content, environment.getProject())) .collect(Collectors.toList()); ModuleVisibilityManager.SERVICE.getInstance(environment.getProject()).addModule( diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt index 68bbe470618..348a67caff4 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractCustomJDKBlackBoxCodegenTest.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.util.concurrent.TimeUnit @@ -18,7 +19,7 @@ abstract class AbstractCustomJDKBlackBoxCodegenTest : AbstractBlackBoxCodegenTes override fun doTest(filePath: String) { val file = File(filePath) val expectedText = - KotlinTestUtils.doLoadFile(file) + + KtTestUtil.doLoadFile(file) + "\n" + """ fun main() { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractGenerateNotNullAssertionsTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractGenerateNotNullAssertionsTest.java index 3e9a6f3251b..e7a18772303 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractGenerateNotNullAssertionsTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractGenerateNotNullAssertionsTest.java @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; @@ -49,7 +50,7 @@ abstract public class AbstractGenerateNotNullAssertionsTest extends CodegenTestC } private void loadSource(@NotNull String fileName) { - loadFileByFullPath(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + fileName); + loadFileByFullPath(KtTestUtil.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + fileName); } protected void doTestNoAssertionsForKotlinFromBinary(String binaryDependencyFilename, String testFilename) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk15BlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk15BlackBoxCodegenTest.kt index ade7bd2b4b8..de0a07b0643 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk15BlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk15BlackBoxCodegenTest.kt @@ -5,13 +5,13 @@ package org.jetbrains.kotlin.codegen -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractJdk15BlackBoxCodegenTest : AbstractCustomJDKBlackBoxCodegenTest() { override fun getTestJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15 - override fun getJdkHome(): File = KotlinTestUtils.getJdk15Home() + override fun getJdkHome(): File = KtTestUtil.getJdk15Home() override fun getPrefix(): String = "java15/box" override fun getAdditionalJvmArgs(): List = listOf("--enable-preview") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt index 74ed94364cd..7d61b2af0a5 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractJdk9BlackBoxCodegenTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.codegen -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractJdk9BlackBoxCodegenTest : AbstractCustomJDKBlackBoxCodegenTest() { override fun getTestJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_9 - override fun getJdkHome(): File = KotlinTestUtils.getJdk9Home() + override fun getJdkHome(): File = KtTestUtil.getJdk9Home() override fun getPrefix(): String = "java9/box" -} \ No newline at end of file +} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt index b8b847fe465..349e603f1d3 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractLightAnalysisModeTest.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.resolve.jvm.AsmTypes import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisHandlerExtension import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtension -import org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar +import org.jetbrains.kotlin.test.util.KtTestUtil.getAnnotationsJar import org.jetbrains.org.objectweb.asm.Opcodes.* import java.io.File diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java index 17a1e4d30b1..e62336dfb78 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java @@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.test.*; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; import java.util.Collections; @@ -51,13 +52,13 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte getTestRootDisposable(), KotlinTestUtils.newConfiguration( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, - CollectionsKt.plus(classPath, KotlinTestUtils.getAnnotationsJar()), Collections.emptyList() + CollectionsKt.plus(classPath, KtTestUtil.getAnnotationsJar()), Collections.emptyList() ), EnvironmentConfigFiles.JVM_CONFIG_FILES); loadFiles(ArrayUtil.toStringArray(sourceFiles)); - List expected = readExpectedOccurrences(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + sourceFiles.get(0)); + List expected = readExpectedOccurrences(KtTestUtil.getTestDataPathBase() + "/codegen/" + sourceFiles.get(0)); String actual = generateToText(); Companion.checkGeneratedTextAgainstExpectedOccurrences(actual, expected, TargetBackend.ANY, true); } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 1d2aa0b83d6..ae2cb841d22 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDependenciesProvider; import org.jetbrains.kotlin.scripting.resolve.ScriptCompilationConfigurationWrapper; import org.jetbrains.kotlin.test.*; import org.jetbrains.kotlin.test.clientserver.TestProxy; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.tree.ClassNode; @@ -63,8 +64,8 @@ import java.util.stream.Collectors; import static org.jetbrains.kotlin.cli.common.output.OutputUtilsKt.writeAllTo; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*; import static org.jetbrains.kotlin.codegen.TestUtilsKt.extractUrls; -import static org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar; import static org.jetbrains.kotlin.test.clientserver.TestProcessServerKt.*; +import static org.jetbrains.kotlin.test.util.KtTestUtil.getAnnotationsJar; public abstract class CodegenTestCase extends KotlinBaseTest { private static final String DEFAULT_TEST_FILE_NAME = "a_test"; @@ -134,7 +135,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest(0), null); - ktFiles.add(KotlinTestUtils.createFile(file.name, content, project)); + ktFiles.add(KtTestUtil.createFile(file.name, content, project)); } } @@ -608,7 +609,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest testFiles = createTestFilesFromFile(file, expectedText); doMultiFileTest(file, testFiles); @@ -659,7 +660,7 @@ public abstract class CodegenTestCase extends KotlinBaseTest files = new ArrayList<>(names.length); for (String name : names) { try { - String content = KotlinTestUtils.doLoadFile(testDataPath + "/codegen/", name); - KtFile file = KotlinTestUtils.createFile(name, content, project); + String content = KtTestUtil.doLoadFile(testDataPath + "/codegen/", name); + KtFile file = KtTestUtil.createFile(name, content, project); files.add(file); } catch (IOException e) { @@ -103,7 +103,7 @@ public class CodegenTestFiles { public static CodegenTestFiles create(@NotNull String fileName, @NotNull String contentWithDiagnosticMarkup, @NotNull Project project) { // `rangesToDiagnosticNames` parameter is not-null only for diagnostic tests, it's using for lazy diagnostics String content = CheckerTestUtil.INSTANCE.parseDiagnosedRanges(contentWithDiagnosticMarkup, new ArrayList<>(), null); - KtFile file = KotlinTestUtils.createFile(fileName, content, project); + KtFile file = KtTestUtil.createFile(fileName, content, project); List ranges = AnalyzingUtils.getSyntaxErrorRanges(file); assert ranges.isEmpty() : "Syntax errors found in " + file + ": " + ranges; diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java index b526bd0d784..6b563937420 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java @@ -25,6 +25,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.StringsKt; @@ -85,7 +86,7 @@ public class CodegenTestUtil { @NotNull List additionalOptions ) { try { - File directory = KotlinTestUtils.tmpDir("java-classes"); + File directory = KtTestUtil.tmpDir("java-classes"); compileJava(fileNames, additionalClasspath, additionalOptions, directory); return directory; } @@ -118,7 +119,7 @@ public class CodegenTestUtil { List classpath = new ArrayList<>(); classpath.add(ForTestCompileRuntime.runtimeJarForTests().getPath()); classpath.add(ForTestCompileRuntime.reflectJarForTests().getPath()); - classpath.add(KotlinTestUtils.getAnnotationsJar().getPath()); + classpath.add(KtTestUtil.getAnnotationsJar().getPath()); classpath.addAll(additionalClasspath); List options = new ArrayList<>(Arrays.asList( diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractDebugTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractDebugTest.kt index 555355b3ad4..360fc31124b 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractDebugTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/codegen/debugInformation/AbstractDebugTest.kt @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.clientserver.TestProcessServer import org.jetbrains.kotlin.test.clientserver.TestProxy import org.jetbrains.kotlin.test.clientserver.getGeneratedClass +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.After import org.junit.Before import java.io.File -import java.lang.IllegalStateException import java.net.URLClassLoader import kotlin.properties.Delegates @@ -158,7 +158,7 @@ abstract class AbstractDebugTest : CodegenTestCase() { GenerationUtils.compileFiles(myFiles.psiFiles, myEnvironment, classBuilderFactory) classFileFactory = generationState.factory - val tempDirForTest = KotlinTestUtils.tmpDir("debuggerTest") + val tempDirForTest = KtTestUtil.tmpDir("debuggerTest") val classesDir = File(tempDirForTest, "classes") try { classFileFactory.writeAllTo(classesDir) @@ -298,4 +298,4 @@ abstract class AbstractDebugTest : CodegenTestCase() { abstract fun storeStep(loggedItems: ArrayList, event: Event) abstract fun checkResult(wholeFile: File, loggedItems: List) -} \ No newline at end of file +} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt index 05169864ad2..ca2cbf49a4c 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/AbstractFirDiagnosticsWithLightTreeTest.kt @@ -12,14 +12,14 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirLightDiagnostic import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import kotlin.math.abs abstract class AbstractFirDiagnosticsWithLightTreeTest : AbstractFirDiagnosticsTest() { override fun doTest(filePath: String) { val file = createTestFileFromPath(filePath) - val expectedText = KotlinTestUtils.doLoadFile(file) + val expectedText = KtTestUtil.doLoadFile(file) if (InTextDirectivesUtils.isDirectiveDefined(expectedText, "// IGNORE_LIGHT_TREE")) return super.doTest(filePath) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt index f47f5c000c7..d323f75eb95 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/fir/FirTestUtils.kt @@ -10,7 +10,7 @@ import junit.framework.TestCase import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.Companion.DIAGNOSTIC_IN_TESTDATA_PATTERN import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.Companion.SPEC_LINKED_TESTDATA_PATTERN import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.Companion.SPEC_NOT_LINED_TESTDATA_PATTERN -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF import java.io.File @@ -53,11 +53,11 @@ fun compareAndMergeFirFileAndOldFrontendFile( } private fun loadTestData(file: File, vararg patternsToBeRemoved: Regex): String { - var text = KotlinTestUtils.doLoadFile(file) + var text = KtTestUtil.doLoadFile(file) patternsToBeRemoved.forEach { text = text.replace(it, "") } return StringUtil.convertLineSeparators(text.trim()).trimTrailingWhitespacesAndAddNewlineAtEOF() } fun loadTestDataWithDiagnostics(file: File) = loadTestData(file, SPEC_LINKED_TESTDATA_PATTERN, SPEC_NOT_LINED_TESTDATA_PATTERN) -fun loadTestDataWithoutDiagnostics(file: File) = loadTestData(file, DIAGNOSTIC_IN_TESTDATA_PATTERN, SPEC_LINKED_TESTDATA_PATTERN) \ No newline at end of file +fun loadTestDataWithoutDiagnostics(file: File) = loadTestData(file, DIAGNOSTIC_IN_TESTDATA_PATTERN, SPEC_LINKED_TESTDATA_PATTERN) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index ad81712d034..937f3296b05 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -22,7 +22,6 @@ import com.intellij.execution.process.OSProcessHandler; import com.intellij.execution.process.ProcessAdapter; import com.intellij.execution.process.ProcessEvent; import com.intellij.execution.process.ProcessOutputTypes; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; @@ -35,6 +34,7 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; @@ -88,7 +88,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { content = normalizePath(content, testDataDir, "[TestData]"); content = normalizePath(content, tmpdir, "[Temp]"); content = normalizePath(content, getCompilerLib(), "[CompilerLib]"); - content = normalizePath(content, new File(KotlinTestUtils.getHomeDirectory()), "[KotlinProjectHome]"); + content = normalizePath(content, new File(KtTestUtil.getHomeDirectory()), "[KotlinProjectHome]"); content = content.replaceAll(Pattern.quote(KotlinCompilerVersion.VERSION), "[KotlinVersion]"); content = content.replaceAll("\\(JRE .+\\)", "(JRE [JREVersion])"); content = StringUtil.convertLineSeparators(content); @@ -177,4 +177,4 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { @Override public void processTerminated(ProcessEvent event) {} } -} \ No newline at end of file +} diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt index 8c13fecda66..fa8e35a6c8d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar +import org.jetbrains.kotlin.test.util.KtTestUtil.getAnnotationsJar import java.io.File import java.util.* diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt index 915e0118b9f..5d05ccfbacb 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt @@ -27,21 +27,24 @@ import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.javac.JavacWrapper import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.renderer.* +import org.jetbrains.kotlin.renderer.AnnotationArgumentsRenderingPolicy +import org.jetbrains.kotlin.renderer.DescriptorRenderer +import org.jetbrains.kotlin.renderer.DescriptorRendererModifier +import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations +import org.jetbrains.kotlin.test.KotlinTestUtils.newConfiguration import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile import org.junit.Assert - import java.io.File import java.io.IOException import java.lang.annotation.Retention -import org.jetbrains.kotlin.test.KotlinTestUtils.* -import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile - abstract class AbstractCompileJavaAgainstKotlinTest : TestCaseWithTmpdir() { @Throws(IOException::class) @@ -80,7 +83,8 @@ abstract class AbstractCompileJavaAgainstKotlinTest : TestCaseWithTmpdir() { if (!compiledSuccessfully) return - val configuration = newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK, getAnnotationsJar(), out) + val configuration = newConfiguration(ConfigurationKind.ALL, TestJdkKind.FULL_JDK, + KtTestUtil.getAnnotationsJar(), out) configuration.put(JVMConfigurationKeys.USE_PSI_CLASS_FILES_READING, true) val environment = KotlinCoreEnvironment.createForTests(testRootDisposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) setupLanguageVersionSettingsForCompilerTests(ktFile.readText(), environment) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt index bdaaf0c659a..14339751282 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt @@ -33,9 +33,11 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererModifier import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.KotlinTestUtils.* +import org.jetbrains.kotlin.test.KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations +import org.jetbrains.kotlin.test.KotlinTestUtils.newConfiguration import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile import org.junit.Assert import java.io.File @@ -67,13 +69,14 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() { val environment = KotlinCoreEnvironment.createForTests( testRootDisposable, - newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, getAnnotationsJar(), out), + newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, + KtTestUtil.getAnnotationsJar(), out), EnvironmentConfigFiles.JVM_CONFIG_FILES ) environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true) environment.configuration.put(JVMConfigurationKeys.OUTPUT_DIRECTORY, out) - environment.registerJavac(emptyList(), bootClasspath = listOf(findMockJdkRtJar())) + environment.registerJavac(emptyList(), bootClasspath = listOf(KtTestUtil.findMockJdkRtJar())) val analysisResult = JvmResolveUtil.analyze(environment) val packageView = analysisResult.moduleDescriptor.getPackage(LoadDescriptorUtil.TEST_PACKAGE_FQNAME) @@ -95,13 +98,17 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() { environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true) environment.configuration.put(JVMConfigurationKeys.COMPILE_JAVA, true) val ktFiles = kotlinFiles.map { kotlinFile: File -> - createFile(kotlinFile.name, FileUtil.loadFile(kotlinFile, true), environment.project) + KtTestUtil.createFile( + kotlinFile.name, + FileUtil.loadFile(kotlinFile, true), + environment.project + ) } environment.registerJavac( javaFiles = javaFiles, kotlinFiles = ktFiles, arguments = if (aptMode) arrayOf() else arrayOf("-proc:none"), - bootClasspath = listOf(findMockJdkRtJar()) + bootClasspath = listOf(KtTestUtil.findMockJdkRtJar()) ) ModuleVisibilityManager.SERVICE.getInstance(environment.project).addModule( ModuleBuilder("module for test", tmpdir.absolutePath, "test") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt index f55f166d6a4..100ea799eb3 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15Test.kt @@ -5,14 +5,14 @@ package org.jetbrains.kotlin.jvm.compiler -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractLoadJava15Test : AbstractLoadJavaTest() { override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15 - override fun getJdkHomeForJavac(): File = KotlinTestUtils.getJdk15Home() + override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk15Home() override fun getAdditionalJavacArgs(): List = ADDITIONAL_JAVAC_ARGS_FOR_15 } -val ADDITIONAL_JAVAC_ARGS_FOR_15 = listOf("--release", "15", "--enable-preview") \ No newline at end of file +val ADDITIONAL_JAVAC_ARGS_FOR_15 = listOf("--release", "15", "--enable-preview") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt index 65f174495d0..5b5028ab17c 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJava15WithPsiClassReadingTest.kt @@ -5,12 +5,12 @@ package org.jetbrains.kotlin.jvm.compiler -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractLoadJava15WithPsiClassReadingTest : AbstractLoadJavaWithPsiClassReadingTest() { override fun getJdkKind(): TestJdkKind = TestJdkKind.FULL_JDK_15 - override fun getJdkHomeForJavac(): File = KotlinTestUtils.getJdk15Home() + override fun getJdkHomeForJavac(): File = KtTestUtil.getJdk15Home() override fun getAdditionalJavacArgs(): List = ADDITIONAL_JAVAC_ARGS_FOR_15 } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index 059b070975f..2855bf494d9 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.kotlin.test.*; import org.jetbrains.kotlin.test.util.DescriptorValidator; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.Assert; import java.io.File; @@ -39,7 +40,8 @@ import java.util.*; import java.util.regex.Pattern; import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.*; -import static org.jetbrains.kotlin.test.KotlinTestUtils.*; +import static org.jetbrains.kotlin.test.KotlinTestUtils.compileKotlinWithJava; +import static org.jetbrains.kotlin.test.KotlinTestUtils.newConfiguration; import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesAllowed; import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.*; @@ -89,7 +91,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { @NotNull private List getClasspath(File... files) { List classpath = new ArrayList<>(getExtraClasspath()); - classpath.add(getAnnotationsJar()); + classpath.add(KtTestUtil.getAnnotationsJar()); classpath.addAll(Arrays.asList(files)); return classpath; } @@ -240,7 +242,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { ); registerJavacIfNeeded(environment); configureEnvironment(environment); - KtFile ktFile = KotlinTestUtils.createFile(kotlinSrc.getPath(), FileUtil.loadFile(kotlinSrc, true), environment.getProject()); + KtFile ktFile = KtTestUtil.createFile(kotlinSrc.getPath(), FileUtil.loadFile(kotlinSrc, true), environment.getProject()); ModuleDescriptor module = GenerationUtils.compileFiles(Collections.singletonList(ktFile), environment).getModule(); PackageViewDescriptor packageView = module.getPackage(TEST_PACKAGE_FQNAME); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java index 149e68e72ca..0aae9989fa1 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java @@ -47,6 +47,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; @@ -111,7 +112,7 @@ public class LoadDescriptorUtil { ) { List javaBinaryRoots = new ArrayList<>(); // TODO: use the same additional binary roots as those were used for compilation - javaBinaryRoots.add(KotlinTestUtils.getAnnotationsJar()); + javaBinaryRoots.add(KtTestUtil.getAnnotationsJar()); javaBinaryRoots.add(ForTestCompileRuntime.jvmAnnotationsForTests()); javaBinaryRoots.addAll(additionalClasspath); @@ -156,7 +157,7 @@ public class LoadDescriptorUtil { List classpath = new ArrayList<>(); classpath.add(ForTestCompileRuntime.runtimeJarForTests()); - classpath.add(KotlinTestUtils.getAnnotationsJar()); + classpath.add(KtTestUtil.getAnnotationsJar()); for (File test : javaFiles) { String content = FilesKt.readText(test, Charsets.UTF_8); @@ -189,7 +190,7 @@ public class LoadDescriptorUtil { private static List createKtFiles(@NotNull List kotlinFiles, @NotNull KotlinCoreEnvironment environment) { return CollectionsKt.map(kotlinFiles, kotlinFile -> { try { - return KotlinTestUtils.createFile(kotlinFile.getName(), FileUtil.loadFile(kotlinFile, true), environment.getProject()); + return KtTestUtil.createFile(kotlinFile.getName(), FileUtil.loadFile(kotlinFile, true), environment.getProject()); } catch (IOException e) { throw ExceptionUtilsKt.rethrow(e); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java index 0ca2cf943ee..0d9b4bb7b47 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/ExtensibleResolveTestCase.java @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.JVMConfigurationKeys; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.test.*; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; import java.util.List; @@ -43,7 +44,7 @@ public abstract class ExtensibleResolveTestCase extends KotlinTestWithEnvironmen protected void doTest(@NonNls String filePath) throws Exception { File file = new File(filePath); - String text = KotlinTestUtils.doLoadFile(file); + String text = KtTestUtil.doLoadFile(file); List files = TestFiles.createTestFiles("file.kt", text, new TestFiles.TestFileFactoryNoModules() { @NotNull @Override diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 6c63f80fe26..1fda6a24be0 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -43,6 +43,7 @@ import org.jetbrains.kotlin.resolve.lazy.descriptors.PackageDescriptorUtilKt; import org.jetbrains.kotlin.resolve.scopes.MemberScope; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; import java.io.IOException; @@ -340,7 +341,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest @NotNull protected KtFile getFile(@NotNull String content) { - KtFile ktFile = KotlinTestUtils.createFile("dummy.kt", content, getProject()); + KtFile ktFile = KtTestUtil.createFile("dummy.kt", content, getProject()); analysisResult = KotlinTestUtils.analyzeFile(ktFile, getEnvironment()); return ktFile; @@ -361,7 +362,7 @@ public abstract class AbstractAnnotationDescriptorResolveTest extends KotlinTest protected static String getContent(@NotNull String annotationText) throws IOException { File file = new File(PATH); - return KotlinTestUtils.doLoadFile(file).replaceAll("ANNOTATION", annotationText); + return KtTestUtil.doLoadFile(file).replaceAll("ANNOTATION", annotationText); } public static String renderAnnotations(Annotations annotations) { diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt index d7e70600959..a62ebc80ef6 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/calls/AbstractResolvedCallsTest.kt @@ -43,13 +43,14 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.Receiver import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractResolvedCallsTest : KotlinTestWithEnvironment() { override fun createEnvironment(): KotlinCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.ALL) fun doTest(filePath: String) { - val originalText = KotlinTestUtils.doLoadFile(File(filePath))!! + val originalText = KtTestUtil.doLoadFile(File(filePath))!! val (text, carets) = extractCarets(originalText) setupLanguageVersionSettingsForCompilerTests(originalText, environment) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt index 74caf625775..5ef4406b9d0 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.tests.di.createContainerForTests import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.types.KotlinType @@ -61,12 +62,16 @@ abstract class AbstractConstraintSystemTest : KotlinTestWithEnvironment() { } private val testDataPath: String - get() = KotlinTestUtils.getTestDataPathBase() + "/constraintSystem/" + get() = KtTestUtil.getTestDataPathBase() + "/constraintSystem/" private fun analyzeDeclarations(): ConstraintSystemTestData { val fileName = "declarations.kt" - val psiFile = KotlinTestUtils.createFile(fileName, KotlinTestUtils.doLoadFile(testDataPath, fileName), project) + val psiFile = KtTestUtil.createFile( + fileName, + KtTestUtil.doLoadFile(testDataPath, fileName), + project + ) val bindingContext = JvmResolveUtil.analyzeAndCheckForErrors(psiFile, environment).bindingContext return ConstraintSystemTestData(bindingContext, project, typeResolver) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/CompilerTestUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/CompilerTestUtil.kt index 38206c3b802..9f368d1db1d 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/CompilerTestUtil.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/CompilerTestUtil.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.test import org.jetbrains.kotlin.cli.common.CLITool import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream @@ -53,7 +54,7 @@ object CompilerTestUtil { extraOptions: List = emptyList(), extraClasspath: List = emptyList() ): File { - val destination = File(KotlinTestUtils.tmpDir("testLibrary"), "$libraryName.jar") + val destination = File(KtTestUtil.tmpDir("testLibrary"), "$libraryName.jar") val args = mutableListOf().apply { add(src.path) add("-d") diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt index f41d9d4ce5a..d7b27140cef 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinBaseTest.kt @@ -18,6 +18,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.JvmTarget.Companion.fromString import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.lang.reflect.Field import java.util.* @@ -32,7 +33,7 @@ abstract class KotlinBaseTest : KtUsefulTestCase() @Throws(java.lang.Exception::class) protected open fun doTest(filePath: String) { val file = File(filePath) - val expectedText = KotlinTestUtils.doLoadFile(file) + val expectedText = KtTestUtil.doLoadFile(file) doMultiFileTest(file, createTestFilesFromFile(file, expectedText)) } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index a45ce8992f6..a5390e30c57 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -12,19 +12,13 @@ import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.ShutDownTracker; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.openapi.util.text.StringUtilRt; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFileFactory; -import com.intellij.psi.impl.PsiFileFactoryImpl; import com.intellij.rt.execution.junit.FileComparisonFailure; -import com.intellij.testFramework.LightVirtualFile; import com.intellij.testFramework.TestDataFile; -import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import junit.framework.TestCase; import kotlin.Unit; @@ -32,7 +26,6 @@ import kotlin.collections.CollectionsKt; import kotlin.collections.SetsKt; import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.analyzer.AnalysisResult; @@ -43,8 +36,8 @@ import org.jetbrains.kotlin.checkers.CompilerTestLanguageVersionSettingsKt; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.config.ContentRootsKt; import org.jetbrains.kotlin.cli.common.config.KotlinSourceRoot; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; @@ -52,7 +45,6 @@ import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil; import org.jetbrains.kotlin.lexer.KtTokens; import org.jetbrains.kotlin.name.Name; @@ -61,12 +53,12 @@ import org.jetbrains.kotlin.psi.KtPsiFactoryKt; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.test.util.JetTestUtilsKt; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.junit.Assert; import javax.tools.*; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.StringWriter; import java.lang.annotation.Annotation; @@ -96,8 +88,6 @@ public class KotlinTestUtils { private static final boolean AUTOMATICALLY_UNMUTE_PASSED_TESTS = false; private static final boolean AUTOMATICALLY_MUTE_FAILED_TESTS = false; - private static final List filesToDelete = new ArrayList<>(); - private static final Pattern DIRECTIVE_PATTERN = Pattern.compile("^//\\s*[!]?([A-Z_]+)(:[ \\t]*(.*))?$", Pattern.MULTILINE); private KotlinTestUtils() { @@ -125,7 +115,7 @@ public class KotlinTestUtils { @NotNull TestJdkKind jdkKind ) { return KotlinCoreEnvironment.createForTests( - disposable, newConfiguration(configurationKind, jdkKind, getAnnotationsJar()), EnvironmentConfigFiles.JVM_CONFIG_FILES + disposable, newConfiguration(configurationKind, jdkKind, KtTestUtil.getAnnotationsJar()), EnvironmentConfigFiles.JVM_CONFIG_FILES ); } @@ -134,156 +124,9 @@ public class KotlinTestUtils { return createEnvironmentWithJdkAndNullabilityAnnotationsFromIdea(disposable, ConfigurationKind.ALL, TestJdkKind.FULL_JDK); } - @NotNull - public static String getTestDataPathBase() { - return getHomeDirectory() + "/compiler/testData"; - } - - private static String homeDir = computeHomeDirectory(); - - @NotNull - public static String getHomeDirectory() { - return homeDir; - } - - @NotNull - private static String computeHomeDirectory() { - String userDir = System.getProperty("user.dir"); - File dir = new File(userDir == null ? "." : userDir); - return FileUtil.toCanonicalPath(dir.getAbsolutePath()); - } - - public static File findMockJdkRtJar() { - return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/rt.jar"); - } - - // Differs from common mock JDK only by one additional 'nonExistingMethod' in Collection and constructor from Double in Throwable - // It's needed to test the way we load additional built-ins members that neither in black nor white lists - public static File findMockJdkRtModified() { - return new File(getHomeDirectory(), "compiler/testData/mockJDKModified/rt.jar"); - } - - public static File findAndroidApiJar() { - String androidJarProp = System.getProperty("android.jar"); - File androidJarFile = androidJarProp == null ? null : new File(androidJarProp); - if (androidJarFile == null || !androidJarFile.isFile()) { - throw new RuntimeException( - "Unable to get a valid path from 'android.jar' property (" + - androidJarProp + - "), please point it to the 'android.jar' file location"); - } - return androidJarFile; - } - - @NotNull - public static File findAndroidSdk() { - String androidSdkProp = System.getProperty("android.sdk"); - File androidSdkDir = androidSdkProp == null ? null : new File(androidSdkProp); - if (androidSdkDir == null || !androidSdkDir.isDirectory()) { - throw new RuntimeException( - "Unable to get a valid path from 'android.sdk' property (" + - androidSdkProp + - "), please point it to the android SDK location"); - } - return androidSdkDir; - } - - public static String getAndroidSdkSystemIndependentPath() { - return PathUtil.toSystemIndependentName(findAndroidSdk().getAbsolutePath()); - } - - public static File getAnnotationsJar() { - return new File(getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar"); - } - - public static void mkdirs(@NotNull File file) { - if (file.isDirectory()) { - return; - } - if (!file.mkdirs()) { - if (file.exists()) { - throw new IllegalStateException("Failed to create " + file + ": file exists and not a directory"); - } - throw new IllegalStateException("Failed to create " + file); - } - } - - @NotNull - public static File tmpDirForTest(@NotNull String testClassName, @NotNull String testName) throws IOException { - return normalizeFile(FileUtil.createTempDirectory(testClassName, testName, false)); - } - @NotNull public static File tmpDirForTest(TestCase test) throws IOException { - return tmpDirForTest(test.getClass().getSimpleName(), test.getName()); - } - - @NotNull - public static File tmpDir(String name) throws IOException { - return normalizeFile(FileUtil.createTempDirectory(name, "", false)); - } - - @NotNull - public static File tmpDirForReusableFolder(String name) throws IOException { - return normalizeFile(FileUtil.createTempDirectory(new File(System.getProperty("java.io.tmpdir")), name, "", true)); - } - - private static File normalizeFile(File file) throws IOException { - // Get canonical file to be sure that it's the same as inside the compiler, - // for example, on Windows, if a canonical path contains any space from FileUtil.createTempDirectory we will get - // a File with short names (8.3) in its path and it will break some normalization passes in tests. - return file.getCanonicalFile(); - } - - private static void deleteOnShutdown(File file) { - if (filesToDelete.isEmpty()) { - ShutDownTracker.getInstance().registerShutdownTask(() -> { - for (File victim : filesToDelete) { - FileUtil.delete(victim); - } - }); - } - - filesToDelete.add(file); - } - - @NotNull - public static KtFile createFile(@NotNull @NonNls String name, @NotNull String text, @NotNull Project project) { - String shortName = name.substring(name.lastIndexOf('/') + 1); - shortName = shortName.substring(shortName.lastIndexOf('\\') + 1); - LightVirtualFile virtualFile = new LightVirtualFile(shortName, KotlinLanguage.INSTANCE, StringUtilRt.convertLineSeparators(text)); - - virtualFile.setCharset(CharsetToolkit.UTF8_CHARSET); - PsiFileFactoryImpl factory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); - //noinspection ConstantConditions - return (KtFile) factory.trySetupPsiForFile(virtualFile, KotlinLanguage.INSTANCE, true, false); - } - - public static String doLoadFile(String myFullDataPath, String name) throws IOException { - String fullName = myFullDataPath + File.separatorChar + name; - return doLoadFile(new File(fullName)); - } - - public static String doLoadFile(@NotNull File file) throws IOException { - try { - return FileUtil.loadFile(file, CharsetToolkit.UTF8, true); - } - catch (FileNotFoundException fileNotFoundException) { - /* - * Unfortunately, the FileNotFoundException will only show the relative path in it's exception message. - * This clarifies the exception by showing the full path. - */ - String messageWithFullPath = file.getAbsolutePath() + " (No such file or directory)"; - throw new IOException( - "Ensure you have your 'Working Directory' configured correctly as the root " + - "Kotlin project directory in your test configuration\n\t" + - messageWithFullPath, - fileNotFoundException); - } - } - - public static String getFilePath(File file) { - return FileUtil.toSystemIndependentName(file.getPath()); + return KtTestUtil.tmpDirForTest(test.getClass().getSimpleName(), test.getName()); } @NotNull @@ -346,15 +189,15 @@ public class KotlinTestUtils { CompilerConfiguration configuration = newConfiguration(); JvmContentRootsKt.addJavaSourceRoots(configuration, javaSource); if (jdkKind == TestJdkKind.MOCK_JDK) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, findMockJdkRtJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, KtTestUtil.findMockJdkRtJar()); configuration.put(JVMConfigurationKeys.NO_JDK, true); } else if (jdkKind == TestJdkKind.MODIFIED_MOCK_JDK) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, findMockJdkRtModified()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, KtTestUtil.findMockJdkRtModified()); configuration.put(JVMConfigurationKeys.NO_JDK, true); } else if (jdkKind == TestJdkKind.ANDROID_API) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, findAndroidApiJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, KtTestUtil.findAndroidApiJar()); configuration.put(JVMConfigurationKeys.NO_JDK, true); } else if (jdkKind == TestJdkKind.FULL_JDK_6) { @@ -363,10 +206,10 @@ public class KotlinTestUtils { configuration.put(JVMConfigurationKeys.JDK_HOME, new File(jdk6)); } else if (jdkKind == TestJdkKind.FULL_JDK_9) { - configuration.put(JVMConfigurationKeys.JDK_HOME, getJdk9Home()); + configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk9Home()); } else if (jdkKind == TestJdkKind.FULL_JDK_15) { - configuration.put(JVMConfigurationKeys.JDK_HOME, getJdk15Home()); + configuration.put(JVMConfigurationKeys.JDK_HOME, KtTestUtil.getJdk15Home()); } else if (SystemInfo.IS_AT_LEAST_JAVA9) { configuration.put(JVMConfigurationKeys.JDK_HOME, new File(System.getProperty("java.home"))); @@ -390,41 +233,6 @@ public class KotlinTestUtils { return configuration; } - @NotNull - public static File getJdk9Home() { - String jdk9 = System.getenv("JDK_9"); - if (jdk9 == null) { - jdk9 = System.getenv("JDK_19"); - if (jdk9 == null) { - throw new AssertionError("Environment variable JDK_9 is not set!"); - } - } - return new File(jdk9); - } - - @Nullable - public static File getJdk11Home() { - String jdk11 = System.getenv("JDK_11"); - if (jdk11 == null) { - return null; - } - return new File(jdk11); - } - - @NotNull - public static File getJdk15Home() { - String jdk15 = System.getenv("JDK_15"); - - if (jdk15 == null) { - jdk15 = System.getenv("JDK_15_0"); - } - - if (jdk15 == null) { - throw new AssertionError("Environment variable JDK_15 is not set!"); - } - return new File(jdk15); - } - public static void resolveAllKotlinFiles(KotlinCoreEnvironment environment) throws IOException { List roots = ContentRootsKt.getKotlinSourceRoots(environment.getConfiguration()); if (roots.isEmpty()) return; @@ -685,7 +493,7 @@ public class KotlinTestUtils { } public static boolean compileJavaFilesExternallyWithJava9(@NotNull Collection files, @NotNull List options) { - return compileJavaFilesExternally(files, options, getJdk9Home()); + return compileJavaFilesExternally(files, options, KtTestUtil.getJdk9Home()); } public static boolean compileJavaFilesExternally(@NotNull Collection files, @NotNull List options, @NotNull File jdkHome) { @@ -825,7 +633,7 @@ public class KotlinTestUtils { } catch (Throwable e) { if (!isIgnored && AUTOMATICALLY_MUTE_FAILED_TESTS) { - String text = doLoadFile(testDataFile); + String text = KtTestUtil.doLoadFile(testDataFile); String directive = ignoreDirective + targetBackend.name() + "\n"; String newText; @@ -864,7 +672,7 @@ public class KotlinTestUtils { if (isIgnored) { if (AUTOMATICALLY_UNMUTE_PASSED_TESTS) { - String text = doLoadFile(testDataFile); + String text = KtTestUtil.doLoadFile(testDataFile); String directive = ignoreDirective + targetBackend.name(); String newText = Pattern.compile("^" + directive + "\n", Pattern.MULTILINE).matcher(text).replaceAll(""); if (!newText.equals(text)) { @@ -1069,7 +877,7 @@ public class KotlinTestUtils { private static void assertTestClassPresentByMetadata(@NotNull Class outerClass, @NotNull File testDataDir) { for (Class nestedClass : outerClass.getDeclaredClasses()) { TestMetadata testMetadata = nestedClass.getAnnotation(TestMetadata.class); - if (testMetadata != null && testMetadata.value().equals(getFilePath(testDataDir))) { + if (testMetadata != null && testMetadata.value().equals(KtTestUtil.getFilePath(testDataDir))) { return; } } diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt index d5c57b4bfa5..b08bdb94603 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.preloading.ClassPreloadingUtils import org.jetbrains.kotlin.preloading.Preloader +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.junit.Assert import org.junit.Assert.assertEquals @@ -52,7 +53,7 @@ object MockLibraryUtil { useJava9: Boolean = false ): File { return compileLibraryToJar( - sourcesPath, KotlinTestUtils.tmpDirForReusableFolder("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath + sourcesPath, KtTestUtil.tmpDirForReusableFolder("testLibrary-" + jarName), jarName, addSources, allowKotlinSources, extraOptions, extraClasspath , useJava9)} @JvmStatic @@ -96,7 +97,7 @@ object MockLibraryUtil { if (javaFiles.isNotEmpty()) { val classpath = mutableListOf() classpath += ForTestCompileRuntime.runtimeJarForTests().path - classpath += KotlinTestUtils.getAnnotationsJar().path + classpath += KtTestUtil.getAnnotationsJar().path classpath += extraClasspath // Probably no kotlin files were present, so dir might not have been created after kotlin compiler @@ -127,7 +128,7 @@ object MockLibraryUtil { @JvmStatic fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List = emptyList()): File { - val contentDir = KotlinTestUtils.tmpDirForReusableFolder("testLibrary-" + jarName) + val contentDir = KtTestUtil.tmpDirForReusableFolder("testLibrary-" + jarName) val outDir = File(contentDir, "out") val outputFile = File(outDir, jarName + ".js") diff --git a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/AbstractDiagnosticsTestSpec.kt b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/AbstractDiagnosticsTestSpec.kt index 76309160719..45babdd43ee 100644 --- a/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/AbstractDiagnosticsTestSpec.kt +++ b/compiler/tests-spec/tests/org/jetbrains/kotlin/spec/checkers/AbstractDiagnosticsTestSpec.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.spec.utils.parsers.CommonParser import org.jetbrains.kotlin.spec.utils.validators.DiagnosticTestTypeValidator import org.jetbrains.kotlin.spec.utils.validators.SpecTestValidationException import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import java.io.File import java.util.regex.Matcher @@ -41,7 +41,7 @@ abstract class AbstractDiagnosticsTestSpec : org.jetbrains.kotlin.checkers.Abstr val helperContent = FileUtil.loadFile(File("$HELPERS_PATH/$filename"), true) - KotlinTestUtils.createFile(filename, helperContent, project) + KtTestUtil.createFile(filename, helperContent, project) } } } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index 4a635f2ce13..4043a7eec5e 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.asJava.classes.KtLightClass; import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; import java.util.Collections; @@ -40,7 +41,7 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase { @Override protected void extraConfiguration(@NotNull CompilerConfiguration configuration) { - JvmContentRootsKt.addJvmClasspathRoot(configuration, KotlinTestUtils.getAnnotationsJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, KtTestUtil.getAnnotationsJar()); } public void testExtraAnnotations() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt index 1ecc167fa79..7d1706ef646 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/LauncherScriptTest.kt @@ -20,9 +20,10 @@ import com.intellij.openapi.util.SystemInfo import com.intellij.openapi.util.text.StringUtil import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.addToStdlib.cast -import java.io.* +import java.io.File import java.util.concurrent.TimeUnit class LauncherScriptTest : TestCaseWithTmpdir() { @@ -75,7 +76,7 @@ class LauncherScriptTest : TestCaseWithTmpdir() { else args.cast() private val testDataDirectory: String - get() = KotlinTestUtils.getTestDataPathBase() + "/launcher" + get() = KtTestUtil.getTestDataPathBase() + "/launcher" fun testKotlincSimple() { runProcess( diff --git a/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt index 57d307c7715..f353617c62f 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/WrongBytecodeVersionTest.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.org.objectweb.asm.* import java.io.File @@ -31,11 +32,11 @@ class WrongBytecodeVersionTest : KtUsefulTestCase() { private val incompatibleVersion = JvmBytecodeBinaryVersion(42, 0, 0).toArray() private fun doTest(relativeDirectory: String, version: IntArray = incompatibleVersion) { - val directory = KotlinTestUtils.getTestDataPathBase() + relativeDirectory + val directory = KtTestUtil.getTestDataPathBase() + relativeDirectory val librarySource = File(directory, "A.kt") val usageSource = File(directory, "B.kt") - val tmpdir = KotlinTestUtils.tmpDir(this::class.java.simpleName) + val tmpdir = KtTestUtil.tmpDir(this::class.java.simpleName) val environment = KotlinTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations(testRootDisposable) LoadDescriptorUtil.compileKotlinToDirAndGetModule(listOf(librarySource), tmpdir, environment) diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt index e0e25beab9d..7d6b0deff2e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/KotlinCliJavaFileManagerTest.kt @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() { @@ -182,7 +183,7 @@ class KotlinCliJavaFileManagerTest : KotlinTestWithEnvironment() { } override fun createEnvironment(): KotlinCoreEnvironment { - javaFilesDir = KotlinTestUtils.tmpDir("java-file-manager-test") + javaFilesDir = KtTestUtil.tmpDir("java-file-manager-test") val configuration = KotlinTestUtils.newConfiguration( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, emptyList(), listOf(javaFilesDir) diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt index edeb43ee2da..b886bb410d8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/JvmModuleProtoBufTest.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.resolve.CompilerDeserializationConfiguration import org.jetbrains.kotlin.test.CompilerTestUtil import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File class JvmModuleProtoBufTest : KtUsefulTestCase() { @@ -35,8 +36,8 @@ class JvmModuleProtoBufTest : KtUsefulTestCase() { loadWith: LanguageVersion = LanguageVersion.LATEST_STABLE, extraOptions: List = emptyList() ) { - val directory = KotlinTestUtils.getTestDataPathBase() + relativeDirectory - val tmpdir = KotlinTestUtils.tmpDir(this::class.simpleName) + val directory = KtTestUtil.getTestDataPathBase() + relativeDirectory + val tmpdir = KtTestUtil.tmpDir(this::class.simpleName) val moduleName = "main" CompilerTestUtil.executeCompilerAssertSuccessful( diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java index c919987f708..bffde6c6c83 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.StringsKt; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; @@ -156,7 +156,7 @@ public class OuterClassGenTest extends CodegenTestCase { private void doTest(@NotNull String classFqName, @NotNull String javaClassName, @NotNull String testDataFile) { File javaOut = CodegenTestUtil.compileJava( - Collections.singletonList(KotlinTestUtils.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + testDataFile + ".java"), + Collections.singletonList(KtTestUtil.getTestDataPathBase() + "/codegen/" + getPrefix() + "/" + testDataFile + ".java"), Collections.emptyList(), Collections.emptyList() ); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt index ae2b3bb36b8..75dad52e20a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotate import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.org.objectweb.asm.Opcodes import java.io.File import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration @@ -132,7 +133,7 @@ class ScriptGenTest : CodegenTestCase() { add(ScriptingConfigurationKeys.SCRIPT_DEFINITIONS, NO_PARAM_SCRIPT_DEFINITION) put(JVMConfigurationKeys.RETAIN_OUTPUT_IN_MEMORY, true) - addKotlinSourceRoots(sourcePaths.map { "${KotlinTestUtils.getTestDataPathBase()}/codegen/$it" }) + addKotlinSourceRoots(sourcePaths.map { "${KtTestUtil.getTestDataPathBase()}/codegen/$it" }) addJvmClasspathRoots(additionalDependencies) } loadScriptingPlugin(configuration) diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerFileLimitTest.kt b/compiler/tests/org/jetbrains/kotlin/integration/CompilerFileLimitTest.kt index c826714a839..f14e2fb3568 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerFileLimitTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerFileLimitTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.integration import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import java.io.File @@ -112,5 +112,5 @@ class CompilerFileLimitTest : CompilerSmokeTestBase() { } - private fun tempDir(markerName: String) = KotlinTestUtils.tmpDir("${CompilerFileLimitTest::class.simpleName}$markerName") + private fun tempDir(markerName: String) = KtTestUtil.tmpDir("${CompilerFileLimitTest::class.simpleName}$markerName") } diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java index 1d0ce394385..986ba11a99f 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTestBase.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.integration; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.StringsKt; import java.io.File; @@ -30,7 +30,7 @@ import java.util.Collections; public abstract class CompilerSmokeTestBase extends KotlinIntegrationTestBase { @NotNull protected String getTestDataDir() { - return KotlinTestUtils.getTestDataPathBase() + "/integration/smoke/" + getTestName(true); + return KtTestUtil.getTestDataPathBase() + "/integration/smoke/" + getTestName(true); } protected int run(String logName, String... args) throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java index 8a75ae16396..91036cd9264 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.Assert; import java.io.File; @@ -39,7 +39,7 @@ public class CompileEnvironmentTest extends TestCase { File stdlib = ForTestCompileRuntime.runtimeJarForTests(); ExitCode exitCode = new K2JVMCompiler().exec( System.out, - KotlinTestUtils.getTestDataPathBase() + "/compiler/smoke/Smoke.kt", + KtTestUtil.getTestDataPathBase() + "/compiler/smoke/Smoke.kt", "-d", out.getAbsolutePath(), "-no-stdlib", "-classpath", stdlib.getAbsolutePath() diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt index b9f63fd9298..f39a36da96b 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/Java9ModulesIntegrationTest.kt @@ -9,6 +9,7 @@ import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.util.concurrent.TimeUnit import java.util.jar.Manifest @@ -27,7 +28,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { val paths = (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(separator = File.pathSeparator) { it.path } val kotlinOptions = mutableListOf( - "-jdk-home", KotlinTestUtils.getJdk9Home().path, + "-jdk-home", KtTestUtil.getJdk9Home().path, "-jvm-target", "1.8", "-Xmodule-path=$paths" ) @@ -63,7 +64,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { private fun runModule(className: String, modulePath: List): ModuleRunResult { val command = listOf( - File(KotlinTestUtils.getJdk9Home(), "bin/java").path, + File(KtTestUtil.getJdk9Home(), "bin/java").path, "-p", (modulePath + ForTestCompileRuntime.runtimeJarForTests()).joinToString(File.pathSeparator, transform = File::getPath), "-m", className ) @@ -170,7 +171,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { val kotlinOptions = mutableListOf( "$testDataDirectory/someOtherDirectoryWithTheActualModuleInfo/module-info.java", - "-jdk-home", KotlinTestUtils.getJdk9Home().path, + "-jdk-home", KtTestUtil.getJdk9Home().path, "-Xmodule-path=${a.path}" ) compileLibrary( @@ -192,7 +193,7 @@ class Java9ModulesIntegrationTest : AbstractKotlinCompilerIntegrationTest() { // Use the name other from 'library' to prevent it from being loaded as an automatic module if module-info.class is not found val libraryJar = createMultiReleaseJar( - KotlinTestUtils.getJdk9Home(), File(tmpdir, "multi-release-library.jar"), libraryOut, libraryOut9 + KtTestUtil.getJdk9Home(), File(tmpdir, "multi-release-library.jar"), libraryOut, libraryOut9 ) module("main", listOf(libraryJar)) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt index 53b8b55cd82..ebe3e34f39e 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaPackageAnnotationsTest.kt @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.JavaTypeEnhancementState import java.io.File @@ -41,7 +42,7 @@ class LoadJavaPackageAnnotationsTest : KtUsefulTestCase() { private fun doTest(useJavac: Boolean, configurator: (CompilerConfiguration) -> Unit) { val configuration = KotlinTestUtils.newConfiguration( - ConfigurationKind.ALL, TestJdkKind.FULL_JDK, KotlinTestUtils.getAnnotationsJar() + ConfigurationKind.ALL, TestJdkKind.FULL_JDK, KtTestUtil.getAnnotationsJar() ).apply { if (useJavac) { put(JVMConfigurationKeys.USE_JAVAC, true) diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MemoryOptimizationsTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MemoryOptimizationsTest.kt index 6bc6bc314e8..73ae8a8ad93 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MemoryOptimizationsTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MemoryOptimizationsTest.kt @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.types.FlexibleType import org.jetbrains.kotlin.types.TypeConstructorSubstitution import org.jetbrains.kotlin.types.lowerIfFlexible @@ -75,8 +76,8 @@ class MemoryOptimizationsTest : KtUsefulTestCase() { ) val moduleDescriptor = JvmResolveUtil.analyze( - KotlinTestUtils.createFile("main.kt", text, environment.project), - environment + KtTestUtil.createFile("main.kt", text, environment.project), + environment ).moduleDescriptor val aClass = diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt index 4f7c10a5eef..7425678e775 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/TypeQualifierAnnotationResolverTest.kt @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.JavaTypeEnhancementState import java.io.File @@ -88,8 +89,8 @@ class TypeQualifierAnnotationResolverTest : KtUsefulTestCase() { val configuration = KotlinTestUtils.newConfiguration( ConfigurationKind.ALL, TestJdkKind.FULL_JDK, listOf( - KotlinTestUtils.getAnnotationsJar(), - MockLibraryUtil.compileJavaFilesLibraryToJar( + KtTestUtil.getAnnotationsJar(), + MockLibraryUtil.compileJavaFilesLibraryToJar( FOREIGN_ANNOTATIONS_SOURCES_PATH, "foreign-annotations" ) diff --git a/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt index 5f364118145..460783b9d7d 100644 --- a/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/multiplatform/AbstractMultiPlatformIntegrationTest.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.cli.metadata.K2MetadataCompiler import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF import java.io.File import java.nio.file.Files @@ -40,7 +41,7 @@ abstract class AbstractMultiPlatformIntegrationTest : KtUsefulTestCase() { val common2Src = File(root, "common2.kt").takeIf(File::exists) val jvm2Src = File(root, "jvm2.kt").takeIf(File::exists) - val tmpdir = KotlinTestUtils.tmpDir(getTestName(true)) + val tmpdir = KtTestUtil.tmpDir(getTestName(true)) val optionalStdlibCommon = if (InTextDirectivesUtils.isDirectiveDefined(commonSrc.readText(), "WITH_RUNTIME")) diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java index 7a3548a21eb..0ae37e545d7 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java @@ -31,8 +31,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.KtNodeTypes; import org.jetbrains.kotlin.TestsCompilerError; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.testFramework.KtParsingTestCase; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.lang.annotation.Annotation; import java.lang.reflect.Method; @@ -42,7 +42,7 @@ public abstract class AbstractParsingTest extends KtParsingTestCase { @Override protected String getTestDataPath() { - return KotlinTestUtils.getHomeDirectory(); + return KtTestUtil.getHomeDirectory(); } public AbstractParsingTest() { diff --git a/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java b/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java index da339cdb9db..facb9be4042 100644 --- a/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/psi/KtPsiUtilTest.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.KtPsiUtilKt; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.junit.Assert; import java.io.File; @@ -40,8 +41,8 @@ public class KtPsiUtilTest extends KotlinTestWithEnvironment { @NotNull private KtFile loadPsiFile(@NotNull String name) { try { - String text = KotlinTestUtils.doLoadFile(KotlinTestUtils.getTestDataPathBase(), name); - return KotlinTestUtils.createFile(name + ".kt", text, getProject()); + String text = KtTestUtil.doLoadFile(KtTestUtil.getTestDataPathBase(), name); + return KtTestUtil.createFile(name + ".kt", text, getProject()); } catch (IOException e) { throw new RuntimeException(e); @@ -84,7 +85,7 @@ public class KtPsiUtilTest extends KotlinTestWithEnvironment { } public void testIsLocalClass() throws IOException { - String text = FileUtil.loadFile(new File(KotlinTestUtils.getTestDataPathBase() + "/psiUtil/isLocalClass.kt"), true); + String text = FileUtil.loadFile(new File(KtTestUtil.getTestDataPathBase() + "/psiUtil/isLocalClass.kt"), true); KtClass aClass = KtPsiFactoryKt.KtPsiFactory(getProject()).createClass(text); @SuppressWarnings("unchecked") diff --git a/compiler/tests/org/jetbrains/kotlin/reflection/ReflectionIntegrationTest.kt b/compiler/tests/org/jetbrains/kotlin/reflection/ReflectionIntegrationTest.kt index 9d863be6c7e..5a6fade3c05 100644 --- a/compiler/tests/org/jetbrains/kotlin/reflection/ReflectionIntegrationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/reflection/ReflectionIntegrationTest.kt @@ -9,6 +9,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.kotlin.test.CompilerTestUtil import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.util.concurrent.TimeUnit @@ -20,7 +21,7 @@ class ReflectionIntegrationTest : KtUsefulTestCase() { fun testClassLoaderForBuiltIns() { val tmpdir = KotlinTestUtils.tmpDirForTest(this) - val root = KotlinTestUtils.getTestDataPathBase() + "/reflection/classLoaderForBuiltIns" + val root = KtTestUtil.getTestDataPathBase() + "/reflection/classLoaderForBuiltIns" KotlinTestUtils.compileJavaFiles( listOf(File("$root/Main.java")), listOf("-d", tmpdir.absolutePath) diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt index deff8df2965..61c3e62f00a 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.types.TypeSubstitutor @@ -38,7 +39,7 @@ import java.util.* class CapturedTypeApproximationTest : KotlinTestWithEnvironment() { private val testDataPath: String - get() = KotlinTestUtils.getTestDataPathBase() + "/capturedTypeApproximation/" + get() = KtTestUtil.getTestDataPathBase() + "/capturedTypeApproximation/" override fun createEnvironment(): KotlinCoreEnvironment = createEnvironmentWithMockJdk(ConfigurationKind.JDK_ONLY) @@ -46,7 +47,8 @@ class CapturedTypeApproximationTest : KotlinTestWithEnvironment() { assert(substitutions.size in 1..2) { "Captured type approximation test requires substitutions for (T) or (T, R)" } val oneTypeVariable = substitutions.size == 1 - val declarationsText = KotlinTestUtils.doLoadFile(File(testDataPath + "/declarations.kt")) + val declarationsText = + KtTestUtil.doLoadFile(File(testDataPath + "/declarations.kt")) fun analyzeTestFile(testType: String) = run { val test = declarationsText.replace("#TestType#", testType) diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt index 28255e020b4..e6b58f2401c 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/js/JsVersionRequirementTest.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.serialization.AbstractVersionRequirementTest import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File class JsVersionRequirementTest : AbstractVersionRequirementTest() { @@ -37,7 +38,13 @@ class JsVersionRequirementTest : AbstractVersionRequirementTest() { analysisFlags: Map, Any?> ) { val environment = createEnvironment(languageVersion) - val ktFiles = files.map { file -> KotlinTestUtils.createFile(file.name, file.readText(), environment.project) } + val ktFiles = files.map { file -> + KtTestUtil.createFile( + file.name, + file.readText(), + environment.project + ) + } val trace = BindingTraceContext() val analysisResult = TopDownAnalyzerFacadeForJS.analyzeFilesWithGivenTrace( ktFiles, trace, createModule(environment), environment.configuration diff --git a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java index c5f4f508cb0..8a1e71357b0 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java @@ -43,7 +43,7 @@ public class RecursiveDescriptorProcessorTest extends KotlinTestWithEnvironment File ktFile = new File("compiler/testData/recursiveProcessor/declarations.kt"); File txtFile = new File("compiler/testData/recursiveProcessor/declarations.txt"); String text = FileUtil.loadFile(ktFile, true); - KtFile jetFile = KotlinTestUtils.createFile("declarations.kt", text, getEnvironment().getProject()); + KtFile jetFile = KtTestUtil.createFile("declarations.kt", text, getEnvironment().getProject()); AnalysisResult result = KotlinTestUtils.analyzeFile(jetFile, getEnvironment()); PackageViewDescriptor testPackage = result.getModuleDescriptor().getPackage(FqName.topLevel(Name.identifier("test"))); diff --git a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt index 2464d77580e..71844faf698 100644 --- a/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt +++ b/core/descriptors.runtime/tests/org/jetbrains/kotlin/jvm/runtime/AbstractJvmRuntimeDescriptorLoaderTest.kt @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl import org.jetbrains.kotlin.test.* import org.jetbrains.kotlin.test.TestFiles.TestFileFactoryNoModules import org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.Configuration import org.jetbrains.kotlin.utils.Printer @@ -133,7 +134,7 @@ abstract class AbstractJvmRuntimeDescriptorLoaderTest : TestCaseWithTmpdir() { for (root in environment.configuration.getList(CLIConfigurationKeys.CONTENT_ROOTS)) { LOG.info("root: $root") } - val ktFile = KotlinTestUtils.createFile(file.path, text, environment.project) + val ktFile = KtTestUtil.createFile(file.path, text, environment.project) GenerationUtils.compileFileTo(ktFile, environment, tmpdir) } } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt index f5aad1e0d61..8881cbf99de 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestClassModelTestAllFilesPresentMethodGenerator.kt @@ -6,11 +6,11 @@ package org.jetbrains.kotlin.generators.impl import com.intellij.openapi.util.text.StringUtil -import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.generators.model.SimpleTestClassModel -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.addToStdlib.runIf @@ -36,7 +36,7 @@ object SimpleTestClassModelTestAllFilesPresentMethodGenerator : MethodGenerator< val assertTestsPresentStr = if (classModel.targetBackend === TargetBackend.ANY) { String.format( "KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File(\"%s\"), Pattern.compile(\"%s\"), %s, %s%s);", - KotlinTestUtils.getFilePath(classModel.rootFile), + KtTestUtil.getFilePath(classModel.rootFile), StringUtil.escapeStringCharacters(classModel.filenamePattern.pattern()), excludedArgument, classModel.recursive, @@ -45,7 +45,7 @@ object SimpleTestClassModelTestAllFilesPresentMethodGenerator : MethodGenerator< } else { String.format( "KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File(\"%s\"), Pattern.compile(\"%s\"), %s, %s.%s, %s%s);", - KotlinTestUtils.getFilePath(classModel.rootFile), + KtTestUtil.getFilePath(classModel.rootFile), StringUtil.escapeStringCharacters(classModel.filenamePattern.pattern()), excludedArgument, TargetBackend::class.java.simpleName, classModel.targetBackend.toString(), classModel.recursive, exclude ) diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt index bd0cb8b5983..99fe9c60836 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SimpleTestMethodGenerator.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.generators.impl -import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.generators.model.RunTestMethodModel import org.jetbrains.kotlin.generators.model.SimpleTestMethodModel -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.Printer object SimpleTestMethodGenerator : MethodGenerator() { @@ -22,7 +22,7 @@ object SimpleTestMethodGenerator : MethodGenerator() { override fun generateBody(method: SimpleTestMethodModel, p: Printer) { with(method) { - val filePath = KotlinTestUtils.getFilePath(file) + if (file.isDirectory) "/" else "" + val filePath = KtTestUtil.getFilePath(file) + if (file.isDirectory) "/" else "" p.println(RunTestMethodModel.METHOD_NAME, "(\"", filePath, "\");") } } diff --git a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt index 21fcadf6fbb..e4a7efe7d4b 100644 --- a/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt +++ b/generators/test-generator/tests/org/jetbrains/kotlin/generators/impl/SingleClassTestModelAllFilesPresentedMethodGenerator.kt @@ -6,11 +6,11 @@ package org.jetbrains.kotlin.generators.impl import com.intellij.openapi.util.text.StringUtil -import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.generators.MethodGenerator +import org.jetbrains.kotlin.generators.model.MethodModel import org.jetbrains.kotlin.generators.model.SingleClassTestModel -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.Printer object SingleClassTestModelAllFilesPresentedMethodGenerator : MethodGenerator() { @@ -37,13 +37,13 @@ object SingleClassTestModelAllFilesPresentedMethodGenerator : MethodGenerator runWriteAction { file.delete(this) } @@ -376,4 +377,4 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { } } -} \ No newline at end of file +} diff --git a/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt.203 b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt.203 index c0030ff88f5..0ca946ac6a6 100644 --- a/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt.203 +++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt.203 @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.parsing.KotlinParserDefinition.Companion.STD_SCRIPT_ import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.junit.Assert import java.io.File @@ -294,7 +295,7 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { return File(testDataPath, "idea/scripting-support/testData/scratch/custom/test_scratch.kts").readText() } - override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getTestDataPath() = KtTestUtil.getHomeDirectory() override fun getProjectDescriptor(): com.intellij.testFramework.LightProjectDescriptor { @@ -311,7 +312,7 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(getTestRootDisposable(), KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(getTestRootDisposable(), KtTestUtil.getHomeDirectory()) PluginTestCaseBase.addJdk(myFixture.projectDisposable) { PluginTestCaseBase.fullJdk() } } @@ -373,4 +374,4 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { } } -} \ No newline at end of file +} diff --git a/idea/scripting-support/test/org/jetbrains/kotlin/idea/script/AbstractScriptTemplatesFromDependenciesTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/script/AbstractScriptTemplatesFromDependenciesTest.kt index 819e38c4209..3578e27102f 100644 --- a/idea/scripting-support/test/org/jetbrains/kotlin/idea/script/AbstractScriptTemplatesFromDependenciesTest.kt +++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/script/AbstractScriptTemplatesFromDependenciesTest.kt @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.JUnit3RunnerWithInnersForJPS -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.jarRoot import org.jetbrains.kotlin.test.util.projectLibrary @@ -137,7 +137,7 @@ abstract class AbstractScriptTemplatesFromDependenciesTest : HeavyPlatformTestCa } private fun packJar(dir: File): File { - val contentDir = KotlinTestUtils.tmpDirForReusableFolder("folderForLibrary-${getTestName(true)}") + val contentDir = KtTestUtil.tmpDirForReusableFolder("folderForLibrary-${getTestName(true)}") return MockLibraryUtil.createJarFile(contentDir, dir, "templates") } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt index 8441be022bc..5351dfe921e 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/asJava/LightClassesClasspathSortingTest.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.caches.lightClasses.KtLightClassForDecompiledDe import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.SdkAndMockLibraryProjectDescriptor import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith import java.io.File import kotlin.test.assertNotNull @@ -58,6 +58,6 @@ class LightClassesClasspathSortingTest : KotlinLightCodeInsightFixtureTestCase() } override fun getTestDataPath(): String { - return KotlinTestUtils.getHomeDirectory() + "/idea/testData/decompiler/lightClassesOrder/" + return KtTestUtil.getHomeDirectory() + "/idea/testData/decompiler/lightClassesOrder/" } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java index c29cb5722e4..79e2f5c2518 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJavaAgainstKotlinCheckerTest.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; @@ -131,6 +131,6 @@ public abstract class AbstractJavaAgainstKotlinCheckerTest extends KotlinDaemonA @Override protected String getTestDataPath() { - return KotlinTestUtils.getHomeDirectory() + "/"; + return KtTestUtil.getHomeDirectory() + "/"; } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java index e2b0879a114..b1aacfbfb90 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java @@ -7,18 +7,18 @@ package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase { @Override protected void setUp() throws Exception { - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()); super.setUp(); } @Override protected void tearDown() throws Exception { super.tearDown(); - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()); + VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java.203 b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java.203 index 029612bac65..0eff566e641 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java.203 +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinDaemonAnalyzerTestCase.java.203 @@ -7,12 +7,12 @@ package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase { @Override protected void setUp() throws Exception { - VfsRootAccess.allowRootAccess(getTestRootDisposable(), KotlinTestUtils.getHomeDirectory()); + VfsRootAccess.allowRootAccess(getTestRootDisposable(), KtTestUtil.getHomeDirectory()); super.setUp(); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt index 628d8bef1d2..009f6e82862 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.navigation.NavigationTestUtils import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractNavigationTest : KotlinLightCodeInsightFixtureTestCase() { @@ -33,7 +33,7 @@ abstract class AbstractNavigationTest : KotlinLightCodeInsightFixtureTestCase() try { ConfigLibraryUtil.configureLibrariesByDirective(module, PlatformTestUtil.getCommunityPath(), fileText) - myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.parent}" + myFixture.testDataPath = "${KtTestUtil.getHomeDirectory()}/${mainFile.parent}" val mainFileName = mainFile.name val mainFileBaseName = mainFileName.substring(0, mainFileName.indexOf('.')) diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt index 6553aa4ecce..ee96354dd53 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtProperty import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith import kotlin.reflect.KMutableProperty0 @@ -262,6 +262,6 @@ class KotlinShortNamesCacheTest : KotlinLightCodeInsightFixtureTestCase() { } override fun getTestDataPath(): String { - return KotlinTestUtils.getHomeDirectory() + "/idea/testData/cache/" + return KtTestUtil.getHomeDirectory() + "/idea/testData/cache/" } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt index 8eef5ef4b81..0bf97db23ff 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt @@ -26,13 +26,12 @@ import org.jetbrains.kotlin.idea.caches.project.ModuleTestSourceInfo import org.jetbrains.kotlin.idea.framework.CommonLibraryKind import org.jetbrains.kotlin.idea.framework.JSLibraryKind import org.jetbrains.kotlin.idea.framework.platform -import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.* import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.jarRoot import org.jetbrains.kotlin.test.util.projectLibrary @@ -484,11 +483,11 @@ class IdeaModuleInfoTest : ModuleTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()) } override fun tearDown() { - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()) super.tearDown() } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt.203 b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt.203 index 0425a029acc..bc23654473a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt.203 +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/IdeaModuleInfoTest.kt.203 @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.getProjectJdkTableSafe import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.jarRoot import org.jetbrains.kotlin.test.util.projectLibrary @@ -483,6 +483,6 @@ class IdeaModuleInfoTest : ModuleTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(testRootDisposable, KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(testRootDisposable, KtTestUtil.getHomeDirectory()) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt index 79926663e02..953e051cded 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/Java9MultiModuleHighlightingTest.kt @@ -8,9 +8,9 @@ package org.jetbrains.kotlin.idea.caches.resolve import com.intellij.openapi.module.Module import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind.FULL_JDK_9 +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith @RunWith(JUnit3WithIdeaConfigurationRunner::class) @@ -28,7 +28,7 @@ class Java9MultiModuleHighlightingTest : AbstractMultiModuleHighlightingTest() { // -Xallow-kotlin-package to avoid "require kotlin.stdlib" in module-info.java val library = MockLibraryUtil.compileJvmLibraryToJar( testDataPath + "${getTestName(true)}/library", "library", - extraOptions = listOf("-jdk-home", KotlinTestUtils.getJdk9Home().path, "-Xallow-kotlin-package"), + extraOptions = listOf("-jdk-home", KtTestUtil.getJdk9Home().path, "-Xallow-kotlin-package"), useJava9 = true ) diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt index 302b854d8bd..d3768c15995 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractInspectionTest.kt @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.versions.bundledRuntimeVersion import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.plugins.groovy.GroovyFileType import java.io.File @@ -74,7 +75,7 @@ abstract class AbstractInspectionTest : KotlinLightCodeInsightFixtureTestCase() } with(myFixture) { - testDataPath = "${KotlinTestUtils.getHomeDirectory()}/$srcDir" + testDataPath = "${KtTestUtil.getHomeDirectory()}/$srcDir" val afterFiles = srcDir.listFiles { it -> it.name == "inspectionData" }?.single()?.listFiles { it -> it.extension == "after" } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt index 949752da78d..635b752c9f8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/postfix/AbstractPostfixTemplateProviderTest.kt @@ -9,14 +9,14 @@ import com.intellij.codeInsight.template.impl.TemplateManagerImpl import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractPostfixTemplateProviderTest : KotlinLightCodeInsightFixtureTestCase() { override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE - override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getTestDataPath() = KtTestUtil.getHomeDirectory() override fun setUp() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt index 7b4f64b7cd9..3ff0daa73cb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt @@ -22,9 +22,9 @@ import junit.framework.TestCase import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState import org.jetbrains.kotlin.idea.framework.KotlinSdkType import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.* -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.nio.file.Path @@ -34,12 +34,12 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()) } @Throws(Exception::class) override fun tearDown() { - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()) PathMacros.getInstance().removeMacro(TEMP_DIR_MACRO_KEY) super.tearDown() diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.201 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.201 index 41cd2d4a754..ea5d0592859 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.201 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.201 @@ -22,9 +22,9 @@ import junit.framework.TestCase import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState import org.jetbrains.kotlin.idea.framework.KotlinSdkType import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.* -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.nio.file.Path @@ -34,12 +34,12 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()) } @Throws(Exception::class) override fun tearDown() { - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()) PathMacros.getInstance().removeMacro(TEMP_DIR_MACRO_KEY) super.tearDown() diff --git a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.203 b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.203 index 1a020148c6f..48327df9b66 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.203 +++ b/idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.203 @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.idea.test.PluginTestCaseBase.* import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.nio.file.Path @@ -36,7 +37,7 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() { override fun setUp() { super.setUp() - VfsRootAccess.allowRootAccess(testRootDisposable, KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(testRootDisposable, KtTestUtil.getHomeDirectory()) } @Throws(Exception::class) diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt index 2af06628a7b..a5d4b7f64c5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/CodeFragmentCompletionInLibraryTest.kt @@ -21,12 +21,12 @@ import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFunction import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith import java.io.File private val LIBRARY_SRC_PATH = - KotlinTestUtils.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" + KtTestUtil.getHomeDirectory() + "/idea/idea-completion/testData/codeFragmentInLibrarySource/customLibrary/" @RunWith(JUnit3WithIdeaConfigurationRunner::class) class CodeFragmentCompletionInLibraryTest : AbstractJvmBasicCompletionTest() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index 1d98e481ee1..7b3768690d0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.addIfNotNull import org.junit.Assert import java.io.File @@ -66,7 +67,7 @@ abstract class AbstractClsStubBuilderTest : LightCodeInsightFixtureTestCase() { } private fun getClassFileToDecompile(sourcePath: String, isUseStringTable: Boolean, classFileName: String?): VirtualFile { - val outDir = KotlinTestUtils.tmpDir("libForStubTest-" + sourcePath) + val outDir = KtTestUtil.tmpDir("libForStubTest-" + sourcePath) val extraOptions = ArrayList() extraOptions.add("-Xallow-kotlin-package") diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt index 564ba58ec03..caf70e0ec68 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/AbstractLoadJavaClsStubTest.kt @@ -20,10 +20,10 @@ import org.jetbrains.kotlin.idea.decompiler.classFile.KtClsFile import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil import org.jetbrains.kotlin.psi.stubs.elements.KtFileStubBuilder import org.jetbrains.kotlin.test.ConfigurationKind -import org.jetbrains.kotlin.test.KotlinTestUtils.getAnnotationsJar import org.jetbrains.kotlin.test.KotlinTestUtils.newConfiguration import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil.getAnnotationsJar import org.junit.Assert import java.io.File @@ -37,7 +37,9 @@ abstract class AbstractLoadJavaClsStubTest : TestCaseWithTmpdir() { private fun doTestCompiledKotlin(ktFileName: String, configurationKind: ConfigurationKind, useTypeTableInSerializer: Boolean) { val ktFile = File(ktFileName) - val configuration = newConfiguration(configurationKind, TestJdkKind.MOCK_JDK, getAnnotationsJar()) + val configuration = newConfiguration(configurationKind, TestJdkKind.MOCK_JDK, + getAnnotationsJar() + ) if (useTypeTableInSerializer) { configuration.put(JVMConfigurationKeys.USE_TYPE_TABLE, true) } @@ -88,4 +90,4 @@ abstract class AbstractLoadJavaClsStubTest : TestCaseWithTmpdir() { } } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index 978ac733ebd..15dea4e4db9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -9,7 +9,7 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.decompiler.textBuilder.findTestLibraryRoot import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith import java.io.File @@ -27,6 +27,6 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { } override fun getProjectDescriptor(): LightProjectDescriptor { - return KotlinJdkAndLibraryProjectDescriptor(File(KotlinTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) + return KotlinJdkAndLibraryProjectDescriptor(File(KtTestUtil.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index f6d03c000d7..383996c28f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.decompiler.common.INCOMPATIBLE_ABI_VERSION_GENE import org.jetbrains.kotlin.idea.decompiler.stubBuilder.findClassFileByName import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import org.junit.runner.RunWith import java.io.File @@ -23,7 +23,7 @@ import java.io.File class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest() { override fun getProjectDescriptor(): LightProjectDescriptor { - return KotlinJdkAndLibraryProjectDescriptor(File(KotlinTestUtils.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) + return KotlinJdkAndLibraryProjectDescriptor(File(KtTestUtil.getTestDataPathBase() + "/cli/jvm/wrongAbiVersionLib/bin")) } fun testSyntheticClassIsInvisibleWrongAbiVersion() = doTestNoPsiFilesAreBuiltForSyntheticClasses() diff --git a/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt index d47bf27bba9..e2535f6dfda 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/externalAnnotations/ExternalAnnotationTest.kt @@ -18,13 +18,14 @@ import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.test.JUnit3WithIdeaConfigurationRunner import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.runner.RunWith import java.io.File @RunWith(JUnit3WithIdeaConfigurationRunner::class) class ExternalAnnotationTest : KotlinLightCodeInsightFixtureTestCase() { - override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getTestDataPath() = KtTestUtil.getHomeDirectory() fun testNotNullMethod() { KotlinTestUtils.runTest(::doTest, TargetBackend.ANY, "idea/testData/externalAnnotations/notNullMethod.kt") diff --git a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt index 92f8edf204b..b7469364446 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/hierarchy/AbstractHierarchyWithLibTest.kt @@ -14,7 +14,7 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractHierarchyWithLibTest : AbstractHierarchyTest() { @@ -24,7 +24,7 @@ abstract class AbstractHierarchyWithLibTest : AbstractHierarchyTest() { val filesToConfigure = filesToConfigure val file = filesToConfigure.first() val directive = InTextDirectivesUtils.findLinesWithPrefixesRemoved( - File("${KotlinTestUtils.getHomeDirectory()}/$folderName/$file").readText(), + File("${KtTestUtil.getHomeDirectory()}/$folderName/$file").readText(), "// BASE_CLASS: " ).singleOrNull() ?: error("File should contain BASE_CLASS directive") @@ -48,4 +48,4 @@ abstract class AbstractHierarchyWithLibTest : AbstractHierarchyTest() { } override fun getProjectDescriptor(): LightProjectDescriptor = ProjectDescriptorWithStdlibSources.INSTANCE -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java index 130960e956e..8beb9597e29 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.test.*; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; import java.lang.reflect.Field; @@ -76,7 +77,7 @@ public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnviro File file = new File(filePath); String fileName = file.getName(); - String fileData = KotlinTestUtils.doLoadFile(file); + String fileData = KtTestUtil.doLoadFile(file); Directives directives = KotlinTestUtils.parseDirectives(fileData); int diagnosticNumber = getDiagnosticNumber(directives); final Set> diagnosticFactories = getDiagnosticFactories(directives); @@ -86,7 +87,7 @@ public abstract class AbstractDiagnosticMessageTest extends KotlinTestWithEnviro LanguageVersion version = explicitLanguageVersion == null ? null : LanguageVersion.fromVersionString(explicitLanguageVersion); Map specificFeatures = parseLanguageFeatures(fileData); - KtFile psiFile = KotlinTestUtils.createFile(fileName, KotlinTestUtils.doLoadFile(getTestDataPath(), fileName), getProject()); + KtFile psiFile = KtTestUtil.createFile(fileName, KtTestUtil.doLoadFile(getTestDataPath(), fileName), getProject()); AnalysisResult analysisResult = analyze(psiFile, version, specificFeatures); BindingContext bindingContext = analysisResult.getBindingContext(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/index/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt b/idea/tests/org/jetbrains/kotlin/idea/index/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt index 084aecd9834..f67fb94a6d1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/index/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/index/AbstractKotlinTypeAliasByExpansionShortNameIndexTest.kt @@ -9,7 +9,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.stubindex.KotlinTypeAliasByExpansionShortNameIndex import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import kotlin.reflect.KMutableProperty0 @@ -17,7 +17,7 @@ abstract class AbstractKotlinTypeAliasByExpansionShortNameIndexTest : KotlinLigh override fun getTestDataPath(): String { - return KotlinTestUtils.getHomeDirectory() + "/" + return KtTestUtil.getHomeDirectory() + "/" } private lateinit var scope: GlobalSearchScope @@ -63,4 +63,4 @@ abstract class AbstractKotlinTypeAliasByExpansionShortNameIndexTest : KotlinLigh } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt b/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt index b3d8d879577..68954543ccb 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/internal/AbstractBytecodeToolWindowTest.kt @@ -14,11 +14,11 @@ import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractBytecodeToolWindowTest : KotlinLightCodeInsightFixtureTestCase() { - override fun getTestDataPath() = KotlinTestUtils.getHomeDirectory() + override fun getTestDataPath() = KtTestUtil.getHomeDirectory() override fun getProjectDescriptor() = KotlinWithJdkAndRuntimeLightProjectDescriptor.INSTANCE fun doTest(testPath: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt b/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt index 8684871c9aa..9e217b23915 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/kdoc/AbstractKDocTypingTest.kt @@ -8,10 +8,10 @@ package org.jetbrains.kotlin.idea.kdoc import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil abstract class AbstractKDocTypingTest : KotlinLightCodeInsightFixtureTestCase() { - override fun getTestDataPath(): String = KotlinTestUtils.getHomeDirectory() + override fun getTestDataPath(): String = KtTestUtil.getHomeDirectory() override fun getProjectDescriptor() = KotlinLightProjectDescriptor.INSTANCE protected fun doTest(fileName: String) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt index ec95a8f297e..d4369635b1b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/navigation/AbstractKotlinGotoImplementationTest.kt @@ -9,7 +9,7 @@ import com.intellij.openapi.projectRoots.Sdk import com.intellij.testFramework.LightCodeInsightTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.test.invalidateLibraryCache -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File @Suppress("DEPRECATION") @@ -20,7 +20,7 @@ abstract class AbstractKotlinGotoImplementationTest : LightCodeInsightTestCase() invalidateLibraryCache(project) } - override fun getTestDataPath(): String = KotlinTestUtils.getHomeDirectory() + File.separator + override fun getTestDataPath(): String = KtTestUtil.getHomeDirectory() + File.separator override fun getProjectJDK(): Sdk = PluginTestCaseBase.mockJdk() @@ -29,4 +29,4 @@ abstract class AbstractKotlinGotoImplementationTest : LightCodeInsightTestCase() val gotoData = NavigationTestUtils.invokeGotoImplementations(editor, file) NavigationTestUtils.assertGotoDataMatching(editor, gotoData) } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt index a17c57cc847..64abb375043 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiModuleTest.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.psi.KtFile 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 @@ -107,7 +108,7 @@ abstract class AbstractQuickFixMultiModuleTest : AbstractMultiModuleTest(), Quic } private fun compareToExpected(directory: String) { - val projectDirectory = File("${KotlinTestUtils.getHomeDirectory()}/$directory") + val projectDirectory = File("${KtTestUtil.getHomeDirectory()}/$directory") val afterFiles = projectDirectory.walkTopDown().filter { it.path.endsWith(".after") }.toList() for (editedFile in project.allKotlinFiles()) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt index 69cf503f057..20950c76ebd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/AbstractMemberPullPushTest.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.idea.refactoring.memberInfo.KtPsiClassWrapper import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.NotNullableUserDataProperty import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.findElementsByCommentPrefix import java.io.File @@ -30,7 +31,7 @@ abstract class AbstractMemberPullPushTest : KotlinLightCodeInsightFixtureTestCas val afterFile = File("$path.after") val conflictFile = File("$path.messages") - fixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.parent}" + fixture.testDataPath = "${KtTestUtil.getHomeDirectory()}/${mainFile.parent}" val mainFileName = mainFile.name val mainFileBaseName = FileUtil.getNameWithoutExtension(mainFileName) @@ -87,4 +88,4 @@ internal fun > chooseMembers(members: List): List { it.isToAbstract = info.toAbstract } return members.filter { it.isChecked } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt index 9e57011e789..8d3e291827b 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt @@ -57,6 +57,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.findElementByCommentPrefix import java.io.File import java.util.* @@ -325,7 +326,7 @@ abstract class AbstractExtractionTest : KotlinLightCodeInsightFixtureTestCase() ScriptConfigurationManager.updateScriptDependenciesSynchronously(ktFile) } - fixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.parent}" + fixture.testDataPath = "${KtTestUtil.getHomeDirectory()}/${mainFile.parent}" val mainFileName = mainFile.name diff --git a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt index e409d3dbcbe..9f647284ec9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.platform.jvm.JvmPlatforms -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCase() { @@ -29,11 +29,11 @@ abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCa super.setUp() consoleRunner = KotlinConsoleKeeper.getInstance(project).run(module)!! ScriptConfigurationManager.updateScriptDependenciesSynchronously(consoleRunner!!.consoleFile) - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()) } override fun tearDown() { - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()) consoleRunner?.dispose() consoleRunner = null super.tearDown() @@ -69,4 +69,4 @@ abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCa private object FullJdkProjectDescriptor : KotlinWithJdkAndRuntimeLightProjectDescriptor() { override fun getSdk() = PluginTestCaseBase.fullJdk() -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt.203 b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt.203 index 3c42d35a47b..c3fc6c4bc9d 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt.203 +++ b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt.203 @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescrip import org.jetbrains.kotlin.idea.test.PluginTestCaseBase import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.platform.jvm.JvmPlatforms -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCase() { @@ -29,7 +29,7 @@ abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCa super.setUp() consoleRunner = KotlinConsoleKeeper.getInstance(project).run(module)!! ScriptConfigurationManager.updateScriptDependenciesSynchronously(consoleRunner!!.consoleFile) - VfsRootAccess.allowRootAccess(testRootDisposable, KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(testRootDisposable, KtTestUtil.getHomeDirectory()) } override fun tearDown() { @@ -68,4 +68,4 @@ abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCa private object FullJdkProjectDescriptor : KotlinWithJdkAndRuntimeLightProjectDescriptor() { override fun getSdk() = PluginTestCaseBase.fullJdk() -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt index 38268c8b98e..6ca4de3e15e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.TestMetadata +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.projectLibrary import org.jetbrains.kotlin.utils.PathUtil @@ -345,7 +346,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { private fun compileLibToDir(srcDir: File, vararg classpath: String): File { //TODO: tmpDir would be enough, but there is tricky fail under AS otherwise - val outDir = KotlinTestUtils.tmpDirForReusableFolder("${getTestName(false)}${srcDir.name}Out") + val outDir = KtTestUtil.tmpDirForReusableFolder("${getTestName(false)}${srcDir.name}Out") val javaSourceFiles = FileUtil.findFilesByMask(Pattern.compile(".+\\.java$"), srcDir) if (javaSourceFiles.isNotEmpty()) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt.203 b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt.203 index 910649bcf3a..41627db1fdc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt.203 +++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt.203 @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.TestMetadata +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.addDependency import org.jetbrains.kotlin.test.util.projectLibrary import org.jetbrains.kotlin.utils.PathUtil @@ -345,7 +346,7 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() { private fun compileLibToDir(srcDir: File, vararg classpath: String): File { //TODO: tmpDir would be enough, but there is tricky fail under AS otherwise - val outDir = KotlinTestUtils.tmpDirForReusableFolder("${getTestName(false)}${srcDir.name}Out") + val outDir = KtTestUtil.tmpDirForReusableFolder("${getTestName(false)}${srcDir.name}Out") val javaSourceFiles = FileUtil.findFilesByMask(Pattern.compile(".+\\.java$"), srcDir) if (javaSourceFiles.isNotEmpty()) { diff --git a/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt index 5cb218c8ddb..1d786f0423e 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/slicer/AbstractSlicerTest.kt @@ -10,7 +10,7 @@ import com.intellij.slicer.SliceRootNode import com.intellij.util.PathUtil import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() { @@ -25,7 +25,7 @@ abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() { name.startsWith("$namePrefix.") && PathUtil.getFileExtension(name).let { it == "kt" || it == "java" } }!! - myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${rootDir.path}" + myFixture.testDataPath = "${KtTestUtil.getHomeDirectory()}/${rootDir.path}" val extraPsiFiles = extraFiles.map { myFixture.configureByFile(it.name) } val file = myFixture.configureByFile(mainFile.name) as KtFile @@ -40,4 +40,4 @@ abstract class AbstractSlicerTest : KotlinLightCodeInsightFixtureTestCase() { doTest(path, sliceProvider, rootNode) } } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt index 56023fd85d5..f74071338f3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt @@ -32,10 +32,10 @@ import org.jetbrains.kotlin.idea.facet.getOrCreateFacet import org.jetbrains.kotlin.idea.facet.initializeIfNeeded import org.jetbrains.kotlin.idea.test.* import org.jetbrains.kotlin.platform.TargetPlatform -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import java.io.File @@ -47,7 +47,7 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { override fun setUp() { super.setUp() enableKotlinOfficialCodeStyle(project) - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()) } fun module(name: String, jdk: TestJdkKind = TestJdkKind.MOCK_JDK, hasTestRoot: Boolean = false): Module { @@ -67,7 +67,7 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { } override fun tearDown() = runAll( - ThrowableRunnable { VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) }, + ThrowableRunnable { VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()) }, ThrowableRunnable { disableKotlinOfficialCodeStyle(project) }, ThrowableRunnable { super.tearDown() }, ) @@ -201,4 +201,4 @@ private fun Module.createFacetWithAdditionalSetup( } modelsProvider.commit() } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt.203 b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt.203 index 174f3a97417..d6a1fd8f938 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt.203 +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractMultiModuleTest.kt.203 @@ -32,10 +32,10 @@ import org.jetbrains.kotlin.idea.facet.getOrCreateFacet import org.jetbrains.kotlin.idea.facet.initializeIfNeeded import org.jetbrains.kotlin.idea.test.* import org.jetbrains.kotlin.platform.TargetPlatform -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import java.io.File @@ -47,7 +47,7 @@ abstract class AbstractMultiModuleTest : DaemonAnalyzerTestCase() { override fun setUp() { super.setUp() enableKotlinOfficialCodeStyle(project) - VfsRootAccess.allowRootAccess(testRootDisposable, KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(testRootDisposable, KtTestUtil.getHomeDirectory()) } fun module(name: String, jdk: TestJdkKind = TestJdkKind.MOCK_JDK, hasTestRoot: Boolean = false): Module { @@ -200,4 +200,4 @@ private fun Module.createFacetWithAdditionalSetup( } modelsProvider.commit() } -} \ No newline at end of file +} diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 2f0384c0c2f..c1f0315ba5c 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -19,6 +19,7 @@ import org.jetbrains.kotlin.idea.test.dumpTextWithErrors import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.util.regex.Pattern @@ -93,7 +94,7 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli val funBody = text.lines().joinToString(separator = "\n", transform = { " $it" }) val textToFormat = if (inFunContext) "fun convertedTemp() {\n$funBody\n}" else text - val convertedFile = KotlinTestUtils.createFile("converted", textToFormat, project) + val convertedFile = KtTestUtil.createFile("converted", textToFormat, project) WriteCommandAction.runWriteCommandAction(project) { CodeStyleManager.getInstance(project)!!.reformat(convertedFile) } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index 6834019ece6..d87a1f23983 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -22,11 +22,11 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess import com.intellij.pom.java.LanguageLevel import com.intellij.testFramework.LightPlatformTestCase +import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.DEBUG_LOG_ENABLE_PerModulePackageCache import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.invalidateLibraryCache import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.DEBUG_LOG_ENABLE_PerModulePackageCache +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixtureTestCase() { @@ -40,7 +40,7 @@ abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixture LanguageLevelProjectExtension.getInstance(project).languageLevel = LanguageLevel.JDK_1_8 } - VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(KtTestUtil.getHomeDirectory()) invalidateLibraryCache(project) @@ -49,7 +49,7 @@ abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixture } override fun tearDown() { - VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.disallowRootAccess(KtTestUtil.getHomeDirectory()) project.DEBUG_LOG_ENABLE_PerModulePackageCache = false super.tearDown() diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt.203 b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt.203 index aa87f659f90..14657633ef1 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt.203 +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt.203 @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.idea.caches.PerModulePackageCacheService.Companion.D import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.idea.test.invalidateLibraryCache import org.jetbrains.kotlin.idea.util.application.runWriteAction -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixtureTestCase() { @@ -40,7 +40,7 @@ abstract class AbstractJavaToKotlinConverterTest : KotlinLightCodeInsightFixture LanguageLevelProjectExtension.getInstance(project).languageLevel = LanguageLevel.JDK_1_8 } - VfsRootAccess.allowRootAccess(getTestRootDisposable(), KotlinTestUtils.getHomeDirectory()) + VfsRootAccess.allowRootAccess(getTestRootDisposable(), KtTestUtil.getHomeDirectory()) invalidateLibraryCache(project) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3e158535610..780a2148ae0 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -69,6 +69,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.ClassReader @@ -962,7 +963,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { } fun testJre9() { - val jdk9Path = KotlinTestUtils.getJdk9Home().absolutePath + val jdk9Path = KtTestUtil.getJdk9Home().absolutePath val jdk = myModel.global.addSdk(JDK_NAME, jdk9Path, "9", JpsJavaSdkType.INSTANCE) jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + jdk9Path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 index e78ecb115c4..10af39dca01 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 @@ -69,6 +69,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.ClassReader @@ -962,7 +963,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { } fun testJre9() { - val jdk9Path = KotlinTestUtils.getJdk9Home().absolutePath + val jdk9Path = KtTestUtil.getJdk9Home().absolutePath val jdk = myModel.global.addSdk(JDK_NAME, jdk9Path, "9", JpsJavaSdkType.INSTANCE) jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + jdk9Path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) diff --git a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 62ad269e3c1..244a538fdde 100644 --- a/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.kotlin.build.JvmSourceRoot import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestCaseWithTmpdir +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import java.io.File @@ -32,7 +32,7 @@ import java.io.File */ class ClasspathOrderTest : TestCaseWithTmpdir() { companion object { - private val sourceDir = File(KotlinTestUtils.getTestDataPathBase() + "/classpathOrder").absoluteFile + private val sourceDir = File(KtTestUtil.getTestDataPathBase() + "/classpathOrder").absoluteFile } fun testClasspathOrderForCLI() { diff --git a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java index 12dffa74f97..616ac6e287d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/integration/AntTaskJsTest.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.test.NashornJsTestChecker; import org.jetbrains.kotlin.js.test.V8JsTestChecker; -import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import java.io.File; import java.io.IOException; @@ -25,7 +25,7 @@ public class AntTaskJsTest extends AbstractAntTaskTest { @NotNull private String getTestDataDir() { - return KotlinTestUtils.getTestDataPathBase() + "/integration/ant/js/" + getTestName(true); + return KtTestUtil.getTestDataPathBase() + "/integration/ant/js/" + getTestName(true); } @NotNull diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt index ba506fbf626..8c787e88f85 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/AbstractJsLineNumberTest.kt @@ -30,7 +30,11 @@ import org.jetbrains.kotlin.js.test.utils.LineOutputToStringVisitor import org.jetbrains.kotlin.js.util.TextOutputImpl import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.serialization.js.ModuleKind -import org.jetbrains.kotlin.test.* +import org.jetbrains.kotlin.test.Directives +import org.jetbrains.kotlin.test.KotlinBaseTest +import org.jetbrains.kotlin.test.KotlinTestWithEnvironment +import org.jetbrains.kotlin.test.TestFiles +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.DFS import java.io.ByteArrayOutputStream import java.io.Closeable @@ -134,14 +138,14 @@ abstract class AbstractJsLineNumberTest : KotlinTestWithEnvironment() { } private inner class TestFileFactoryImpl : TestFiles.TestFileFactory, Closeable { - private val tmpDir = KotlinTestUtils.tmpDir("js-tests") + private val tmpDir = KtTestUtil.tmpDir("js-tests") private val defaultModule = TestModule(BasicBoxTest.TEST_MODULE, emptyList(), emptyList()) override fun createFile(module: TestModule?, fileName: String, text: String, directives: Directives): TestFile? { val currentModule = module ?: defaultModule val temporaryFile = File(tmpDir, "${currentModule.name}/$fileName") - KotlinTestUtils.mkdirs(temporaryFile.parentFile) + KtTestUtil.mkdirs(temporaryFile.parentFile) temporaryFile.writeText(text, Charsets.UTF_8) return TestFile(temporaryFile.absolutePath, text, currentModule, directives) diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt index 91d9ee82cbf..8360f5f456e 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt @@ -52,6 +52,7 @@ import org.jetbrains.kotlin.serialization.js.JsSerializerProtocol import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil import org.jetbrains.kotlin.serialization.js.ModuleKind import org.jetbrains.kotlin.test.* +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.DFS import org.jetbrains.kotlin.utils.JsMetadataVersion import org.jetbrains.kotlin.utils.KotlinJavascriptMetadata @@ -108,7 +109,7 @@ abstract class BasicBoxTest( val outputDir = getOutputDir(file) val dceOutputDir = getOutputDir(file, testGroupOutputDirForMinification) val pirOutputDir = getOutputDir(file, testGroupOutputDirForPir) - var fileContent = KotlinTestUtils.doLoadFile(file) + var fileContent = KtTestUtil.doLoadFile(file) if (coroutinesPackage.isNotEmpty()) { fileContent = fileContent.replace("COROUTINES_PACKAGE", coroutinesPackage) } @@ -936,7 +937,7 @@ abstract class BasicBoxTest( private inner class TestFileFactoryImpl(val coroutinesPackage: String) : TestFiles.TestFileFactory, Closeable { var testPackage: String? = null - val tmpDir = KotlinTestUtils.tmpDir("js-tests") + val tmpDir = KtTestUtil.tmpDir("js-tests") val defaultModule = TestModule(TEST_MODULE, emptyList(), emptyList()) var languageVersionSettings: LanguageVersionSettings? = null @@ -962,7 +963,7 @@ abstract class BasicBoxTest( } val temporaryFile = File(tmpDir, "${currentModule.name}/$fileName") - KotlinTestUtils.mkdirs(temporaryFile.parentFile) + KtTestUtil.mkdirs(temporaryFile.parentFile) temporaryFile.writeText(text, Charsets.UTF_8) // TODO Deduplicate logic copied from CodegenTestCase.updateConfigurationByDirectivesInTestFiles diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt index bc67960b279..3ee83a7dbbb 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicWasmBoxTest.kt @@ -27,9 +27,9 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtNamedFunction import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.test.Directives -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestWithEnvironment -import org.jetbrains.kotlin.test.* +import org.jetbrains.kotlin.test.TestFiles +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.Closeable import java.io.File import java.lang.Boolean.getBoolean @@ -54,7 +54,7 @@ abstract class BasicWasmBoxTest( val file = File(filePath) val outputDir = getOutputDir(file) - val fileContent = KotlinTestUtils.doLoadFile(file) + val fileContent = KtTestUtil.doLoadFile(file) TestFileFactoryImpl().use { testFactory -> val inputFiles: MutableList = TestFiles.createTestFiles(file.name, fileContent, testFactory, true) @@ -180,14 +180,14 @@ abstract class BasicWasmBoxTest( val languageVersionSettings = parseLanguageVersionSettings(directives) val temporaryFile = File(tmpDir, "WASM_TEST/$fileName") - KotlinTestUtils.mkdirs(temporaryFile.parentFile) + KtTestUtil.mkdirs(temporaryFile.parentFile) temporaryFile.writeText(text, Charsets.UTF_8) return TestFile(temporaryFile.absolutePath, languageVersionSettings) } var testPackage: String? = null - val tmpDir = KotlinTestUtils.tmpDir("wasm-tests") + val tmpDir = KtTestUtil.tmpDir("wasm-tests") override fun close() { FileUtil.delete(tmpDir) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 5f32b0f5f83..56b5f2dd6ce 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -3,6 +3,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.api.logging.LogLevel import org.jetbrains.kotlin.gradle.util.* import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assume import org.junit.Test import java.io.File @@ -548,7 +549,7 @@ abstract class AbstractKotlinAndroidGradleTests : BaseGradleIT() { override fun defaultBuildOptions() = super.defaultBuildOptions().copy( - androidHome = KotlinTestUtils.findAndroidSdk(), + androidHome = KtTestUtil.findAndroidSdk(), androidGradlePluginVersion = androidGradlePluginVersion ) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index 4a5f06b3ea6..ffe9d8974ba 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.gradle import org.jetbrains.kotlin.gradle.util.AGPVersion +import org.jetbrains.kotlin.gradle.util.createTempDir import org.jetbrains.kotlin.gradle.util.modify -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized import java.io.File -import org.jetbrains.kotlin.gradle.util.createTempDir import kotlin.test.assertEquals private val DEFAULT_GRADLE_VERSION = GradleVersionRequired.AtLeast("5.6.4") @@ -37,7 +37,7 @@ class BuildCacheRelocationIT : BaseGradleIT() { override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().copy( withBuildCache = true, - androidHome = KotlinTestUtils.findAndroidSdk() + androidHome = KtTestUtil.findAndroidSdk() ) @Parameterized.Parameter @@ -205,4 +205,4 @@ class BuildCacheRelocationIT : BaseGradleIT() { .map { it.relativeTo(dir) to it.readBytes().contentHashCode() } .toList() } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt index 59344b3df39..e9b489e9077 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.gradle import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.util.AGPVersion -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { @@ -16,7 +16,7 @@ class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { override fun defaultBuildOptions() = super.defaultBuildOptions().copy( - androidHome = KotlinTestUtils.findAndroidSdk(), + androidHome = KtTestUtil.findAndroidSdk(), androidGradlePluginVersion = androidGradlePluginVersion, configurationCache = true, configurationCacheProblems = ConfigurationCacheProblems.FAIL diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt index b02ff0a0061..eb64ae5deea 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3AndroidIT.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.gradle import org.jetbrains.kotlin.gradle.util.* -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Assert import org.junit.Test import java.io.File @@ -95,7 +95,7 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() { override fun defaultBuildOptions() = super.defaultBuildOptions().copy( - androidHome = KotlinTestUtils.findAndroidSdk(), + androidHome = KtTestUtil.findAndroidSdk(), androidGradlePluginVersion = androidGradlePluginVersion ) @@ -263,4 +263,4 @@ abstract class Kapt3AndroidIT : Kapt3BaseIT() { """.trimIndent() } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt index dcaec936d7d..b33ef668bd3 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginIT.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.gradle.plugin.MULTIPLE_KOTLIN_PLUGINS_SPECIFIC_PROJE import org.jetbrains.kotlin.gradle.scripting.internal.ScriptingGradleSubplugin import org.jetbrains.kotlin.gradle.tasks.USING_JVM_INCREMENTAL_COMPILATION_MESSAGE import org.jetbrains.kotlin.gradle.util.* -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test import java.io.File import java.nio.file.FileSystemException @@ -1053,7 +1053,7 @@ class KotlinGradleIT : BaseGradleIT() { ":lib1:compileDebugUnitTestKotlin", options = defaultBuildOptions().copy( androidGradlePluginVersion = AGPVersion.v3_2_0, - androidHome = KotlinTestUtils.findAndroidSdk(), + androidHome = KtTestUtil.findAndroidSdk(), ), ) { assertSuccessful() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt index f6b50ef7ce8..b2cfa6a6936 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinSpecificDependenciesIT.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.gradle import org.jetbrains.kotlin.gradle.internals.KOTLIN_TEST_MULTIPLATFORM_MODULE_NAME import org.jetbrains.kotlin.gradle.util.AGPVersion import org.jetbrains.kotlin.gradle.util.modify -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import kotlin.test.Test import kotlin.test.assertFalse import kotlin.test.assertTrue @@ -19,7 +19,7 @@ class KotlinSpecificDependenciesIT : BaseGradleIT() { get() = GradleVersionRequired.FOR_MPP_SUPPORT override fun defaultBuildOptions(): BuildOptions = - super.defaultBuildOptions().copy(androidGradlePluginVersion = AGPVersion.v3_6_0, androidHome = KotlinTestUtils.findAndroidSdk()) + super.defaultBuildOptions().copy(androidGradlePluginVersion = AGPVersion.v3_6_0, androidHome = KtTestUtil.findAndroidSdk()) private fun Project.prepare() { // call this when reusing a project after a test, too, in order to remove any added dependencies setupWorkingDir() @@ -326,4 +326,4 @@ private fun BaseGradleIT.Project.checkPrintedItems( checkAnyItemsContains.forEach { pattern -> assertTrue { items.any { pattern in it } } } checkNoItemContains.forEach { pattern -> assertFalse { items.any { pattern in it } } } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt index ae78f872008..8f549f79cc6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt @@ -9,7 +9,7 @@ import org.gradle.api.logging.configuration.WarningMode import org.jetbrains.kotlin.gradle.util.AGPVersion import org.jetbrains.kotlin.gradle.util.checkBytecodeContains import org.jetbrains.kotlin.gradle.util.modify -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test import java.io.File import kotlin.test.assertTrue @@ -222,7 +222,7 @@ class SubpluginsIT : BaseGradleIT() { ":app:compileDebugKotlin", options = defaultBuildOptions().copy( androidGradlePluginVersion = AGPVersion.v3_4_1, - androidHome = KotlinTestUtils.findAndroidSdk() + androidHome = KtTestUtil.findAndroidSdk() ) ) { assertSuccessful() @@ -263,4 +263,4 @@ class SubpluginsIT : BaseGradleIT() { } } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt index a3cdee047c5..b2506bb7f85 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinAndroidExtensionIT.kt @@ -6,9 +6,8 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT -import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.jetbrains.kotlin.gradle.util.AGPVersion -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFalse @@ -19,7 +18,7 @@ class KotlinAndroidExtensionIT : BaseGradleIT() { override fun defaultBuildOptions(): BuildOptions { return super.defaultBuildOptions().copy( androidGradlePluginVersion = AGPVersion.v3_1_0, - androidHome = KotlinTestUtils.findAndroidSdk() + androidHome = KtTestUtil.findAndroidSdk() ) } @@ -52,4 +51,4 @@ class KotlinAndroidExtensionIT : BaseGradleIT() { assertNull(model) } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt index 43b598f00b4..ccdca174a42 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt @@ -6,9 +6,8 @@ package org.jetbrains.kotlin.gradle.model import org.jetbrains.kotlin.gradle.BaseGradleIT -import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.jetbrains.kotlin.gradle.util.AGPVersion -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertFalse @@ -19,7 +18,7 @@ class KotlinProjectIT : BaseGradleIT() { override fun defaultBuildOptions(): BuildOptions { return super.defaultBuildOptions().copy( androidGradlePluginVersion = AGPVersion.v3_1_0, - androidHome = KotlinTestUtils.findAndroidSdk() + androidHome = KtTestUtil.findAndroidSdk() ) } @@ -294,4 +293,4 @@ class KotlinProjectIT : BaseGradleIT() { assertEquals(expectedFriendSourceSets.toList(), friendSourceSets.toList()) } } -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts index a9c098b3a0a..b5bed7e668b 100644 --- a/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts +++ b/libraries/tools/kotlin-gradle-plugin-test-utils-embeddable/build.gradle.kts @@ -13,9 +13,12 @@ plugins { `java` } val packedJars by configurations.creating -val projectsToInclude = listOf(":compiler:tests-common", - ":compiler:incremental-compilation-impl", - ":kotlin-build-common") +val projectsToInclude = listOf( + ":compiler:test-infrastructure-utils", + ":compiler:tests-common", + ":compiler:incremental-compilation-impl", + ":kotlin-build-common" +) dependencies { for (projectName in projectsToInclude) { diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt index 48793cda63c..9e4e4b0f1ef 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt +++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpCompilerTestDataTest.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.kotlinp.test import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.Parameterized @@ -21,7 +21,7 @@ class KotlinpCompilerTestDataTest(private val file: File) { @Test fun doTest() { - val tmpdir = KotlinTestUtils.tmpDirForTest(this::class.java.simpleName, file.nameWithoutExtension) + val tmpdir = KtTestUtil.tmpDirForTest(this::class.java.simpleName, file.nameWithoutExtension) val disposable = TestDisposable() try { diff --git a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt index 1ed8c5975af..1c78787b7a4 100644 --- a/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt +++ b/libraries/tools/kotlinp/test/org/jetbrains/kotlin/kotlinp/test/KotlinpTestUtils.kt @@ -20,6 +20,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import kotlin.test.fail @@ -76,7 +77,7 @@ private fun compile(file: File, disposable: Disposable, tmpdir: File, forEachOut AbstractLoadJavaTest.updateConfigurationWithDirectives(content, configuration) val environment = KotlinCoreEnvironment.createForTests(disposable, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES) setupLanguageVersionSettingsForCompilerTests(content, environment) - val ktFile = KotlinTestUtils.createFile(file.name, content, environment.project) + val ktFile = KtTestUtil.createFile(file.name, content, environment.project) GenerationUtils.compileFileTo(ktFile, environment, tmpdir) for (outputFile in tmpdir.walkTopDown().sortedBy { it.nameWithoutExtension }) { diff --git a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt index eff9561f99a..098f985a000 100644 --- a/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt +++ b/native/commonizer/tests/org/jetbrains/kotlin/descriptors/commonizer/AbstractCommonizationFromSourcesTest.kt @@ -17,14 +17,15 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.languageVersionSettings -import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import org.jetbrains.kotlin.descriptors.commonizer.SourceModuleRoot.Companion.SHARED_TARGET_NAME import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.ClassCollector import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.FunctionCollector import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.collectMembers import org.jetbrains.kotlin.descriptors.commonizer.mergedtree.collectNonEmptyPackageMemberScopes import org.jetbrains.kotlin.descriptors.commonizer.utils.* -import org.jetbrains.kotlin.descriptors.commonizer.utils.MockBuiltInsProvider import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl @@ -34,8 +35,9 @@ import org.jetbrains.kotlin.platform.CommonPlatforms import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtPsiFactory import org.jetbrains.kotlin.resolve.scopes.MemberScope -import org.jetbrains.kotlin.test.KotlinTestUtils.* +import org.jetbrains.kotlin.test.KotlinTestUtils.newConfiguration import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import kotlin.contracts.ExperimentalContracts import kotlin.test.fail @@ -55,7 +57,7 @@ abstract class AbstractCommonizationFromSourcesTest : KtUsefulTestCase() { ) val testDir = testDirectoryName - return File(getHomeDirectory()) + return File(KtTestUtil.getHomeDirectory()) .resolve("native/commonizer/testData") .resolve(testCaseDir) .resolve(testDir) @@ -312,7 +314,7 @@ private class AnalyzedModules( val psiFiles: List = moduleRoot.location.walkTopDown() .filter { it.isFile } - .map { psiFactory.createFile(it.name, doLoadFile(it)) } + .map { psiFactory.createFile(it.name, KtTestUtil.doLoadFile(it)) } .toList() val module = CommonResolverForModuleFactory.analyzeFiles( diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt index bce74a76ab9..be4efb47d82 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt @@ -6,10 +6,10 @@ package org.jetbrains.kotlin.nj2k import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil abstract class AbstractNewJavaToKotlinCopyPasteConversionTest : AbstractJavaToKotlinCopyPasteConversionTest() { - override val BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/nj2k/testData/copyPaste" + override val BASE_PATH = KtTestUtil.getHomeDirectory() + "/nj2k/testData/copyPaste" override fun isNewJ2K(): Boolean = true -} \ No newline at end of file +} diff --git a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt index 27abd0ae3de..05dda7c0ddc 100755 --- a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt +++ b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/AbstractAndroidBoxTest.kt @@ -15,6 +15,7 @@ import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.net.URL import java.util.regex.Pattern @@ -94,7 +95,7 @@ abstract class AbstractAndroidBoxTest : AbstractBlackBoxCodegenTest() { myFiles = CodegenTestFiles.create( myEnvironment!!.project, ArrayUtil.toStringArray(files), - KotlinTestUtils.getHomeDirectory() + "/plugins/android-extensions/android-extensions-compiler/testData" + KtTestUtil.getHomeDirectory() + "/plugins/android-extensions/android-extensions-compiler/testData" ) blackBox(true) } diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt index 908d63451b5..ee2a0d826bf 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt @@ -33,7 +33,10 @@ import org.jetbrains.kotlin.cli.common.messages.MessageRenderer import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot -import org.jetbrains.kotlin.codegen.* +import org.jetbrains.kotlin.codegen.ClassBuilderMode +import org.jetbrains.kotlin.codegen.CodegenTestFiles +import org.jetbrains.kotlin.codegen.GenerationUtils +import org.jetbrains.kotlin.codegen.OriginCollectingClassBuilderFactory import org.jetbrains.kotlin.extensions.StorageComponentContainerContributor import org.jetbrains.kotlin.kapt.base.test.JavaKaptContextTest import org.jetbrains.kotlin.kapt3.Kapt3ComponentRegistrar.KaptComponentContributor @@ -52,6 +55,7 @@ import org.jetbrains.kotlin.resolve.jvm.extensions.PartialAnalysisHandlerExtensi import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstance @@ -85,7 +89,7 @@ abstract class AbstractKotlinKapt3Test : KotlinKapt3TestBase() { val project = myEnvironment.project val psiManager = PsiManager.getInstance(project) - val tmpDir = KotlinTestUtils.tmpDir("kaptTest") + val tmpDir = KtTestUtil.tmpDir("kaptTest") val ktFiles = ArrayList(files.size) for (file in files.sorted()) { @@ -119,7 +123,7 @@ abstract class AbstractKotlinKapt3Test : KotlinKapt3TestBase() { projectBaseDir = project.basePath?.let { File(it) } compileClasspath.addAll(PathUtil.getJdkClassesRootsFromCurrentJre() + PathUtil.kotlinPathsForIdeaPlugin.stdlibPath) - sourcesOutputDir = KotlinTestUtils.tmpDir("kaptRunner") + sourcesOutputDir = KtTestUtil.tmpDir("kaptRunner") classesOutputDir = sourcesOutputDir stubsOutputDir = sourcesOutputDir incrementalDataOutputDir = sourcesOutputDir @@ -353,4 +357,4 @@ private fun addAnnotationProcessingRuntimeLibrary(environment: KotlinCoreEnviron val runtimeLibrary = File(PathUtil.kotlinPathsForCompiler.libPath, "kotlin-annotation-processing-runtime.jar") updateClasspath(listOf(JvmClasspathRoot(runtimeLibrary))) } -} \ No newline at end of file +} diff --git a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt index 8f1e45e1913..32ea35b60e6 100644 --- a/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt +++ b/plugins/kapt3/kapt3-compiler/test/org/jetbrains/kotlin/kapt3/test/java9TestUtils.kt @@ -18,9 +18,8 @@ package org.jetbrains.kotlin.kapt3.test import com.intellij.openapi.application.PathManager import com.intellij.openapi.util.SystemInfoRt -import org.jetbrains.kotlin.kapt3.base.util.isJava11OrLater import org.jetbrains.kotlin.kapt3.base.util.isJava9OrLater -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import java.io.File import java.net.URL import java.net.URLClassLoader @@ -31,12 +30,12 @@ interface CustomJdkTestLauncher { // Already under Java 9 if (isJava9OrLater()) return - doTestCustomJdk(mainClass, arg, KotlinTestUtils.getJdk9Home()) + doTestCustomJdk(mainClass, arg, KtTestUtil.getJdk9Home()) } fun doTestWithJdk11(mainClass: Class<*>, arg: String) { if (isJava9OrLater()) return - KotlinTestUtils.getJdk11Home()?.let { doTestCustomJdk(mainClass, arg, it) } + KtTestUtil.getJdk11Home()?.let { doTestCustomJdk(mainClass, arg, it) } } private fun doTestCustomJdk(mainClass: Class<*>, arg: String, javaHome: File) { @@ -79,4 +78,4 @@ interface CustomJdkTestLauncher { else -> emptyList() } -} \ No newline at end of file +} diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt index 7df13884b2b..e974386b3ea 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/AbstractParcelizeBoxTest.kt @@ -10,8 +10,8 @@ import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot import org.jetbrains.kotlin.codegen.CodegenTestCase import org.jetbrains.kotlin.codegen.getClassFiles import org.jetbrains.kotlin.parcelize.ParcelizeComponentRegistrar -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TargetBackend +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.ClassWriter import org.jetbrains.org.objectweb.asm.ClassWriter.COMPUTE_FRAMES @@ -178,10 +178,10 @@ abstract class AbstractParcelizeBoxTest : CodegenTestCase() { override fun setupEnvironment(environment: KotlinCoreEnvironment) { ParcelizeComponentRegistrar.registerParcelizeComponents(environment.project) addParcelizeRuntimeLibrary(environment) - environment.updateClasspath(listOf(JvmClasspathRoot(KotlinTestUtils.findAndroidApiJar()))) + environment.updateClasspath(listOf(JvmClasspathRoot(KtTestUtil.findAndroidApiJar()))) } override fun updateJavaClasspath(javaClasspath: MutableList) { - javaClasspath += KotlinTestUtils.findAndroidApiJar().absolutePath + javaClasspath += KtTestUtil.findAndroidApiJar().absolutePath } } diff --git a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt index 7ddf6213d8e..f1270eec9f0 100644 --- a/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt +++ b/plugins/parcelize/parcelize-compiler/tests/org/jetbrains/kotlin/parcelize/test/testUtils.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.parcelize.test import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment import org.jetbrains.kotlin.cli.jvm.config.JvmClasspathRoot -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import java.io.File @@ -18,5 +18,5 @@ fun addParcelizeRuntimeLibrary(environment: KotlinCoreEnvironment) { } fun addAndroidJarLibrary(environment: KotlinCoreEnvironment) { - environment.updateClasspath(listOf(JvmClasspathRoot(KotlinTestUtils.findAndroidApiJar()))) -} \ No newline at end of file + environment.updateClasspath(listOf(JvmClasspathRoot(KtTestUtil.findAndroidApiJar()))) +} diff --git a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt index f42ed6a7f68..af3d4f183c9 100644 --- a/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt +++ b/plugins/parcelize/parcelize-ide/tests/org/jetbrains/kotlin/pacelize/ide/test/parcelizeTestUtil.kt @@ -7,10 +7,10 @@ package org.jetbrains.kotlin.pacelize.ide.test import com.intellij.openapi.module.Module import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil -import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.util.KtTestUtil fun addParcelizeLibraries(module: Module) { - val androidJar = KotlinTestUtils.findAndroidApiJar() + val androidJar = KtTestUtil.findAndroidApiJar() ConfigLibraryUtil.addLibrary(module, "androidJar", androidJar.parentFile.absolutePath, arrayOf(androidJar.name)) ConfigLibraryUtil.addLibrary(module, "parcelizeRuntime", "dist/kotlinc/lib", arrayOf("parcelize-runtime.jar")) ConfigLibraryUtil.addLibrary(module, "androidExtensionsRuntime", "dist/kotlinc/lib", arrayOf("android-extensions-runtime.jar")) @@ -20,4 +20,4 @@ fun removeParcelizeLibraries(module: Module) { ConfigLibraryUtil.removeLibrary(module, "androidJar") ConfigLibraryUtil.removeLibrary(module, "parcelizeRuntime") ConfigLibraryUtil.removeLibrary(module, "androidExtensionsRuntime") -} \ No newline at end of file +} diff --git a/settings.gradle b/settings.gradle index bc420b33a01..ba13c605ba9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -326,6 +326,8 @@ include ":compiler:fir:cones", ":compiler:fir:entrypoint", ":compiler:fir:analysis-tests" +include ":compiler:test-infrastructure-utils" + include ":idea:idea-frontend-fir:idea-fir-low-level-api" include ":idea:idea-fir-performance-tests"