From ce424d27e8ba012c221196ebcd52830d12ce2881 Mon Sep 17 00:00:00 2001 From: Natalia Selezneva Date: Tue, 23 Oct 2018 11:24:09 +0300 Subject: [PATCH] Scratch tests: compile java files to temp directory --- .../kotlin/idea/scratch/AbstractScratchRunActionTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt index d2abf0e883d..2984596b859 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt @@ -70,16 +70,16 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { javaFiles.forEach { myFixture.copyFileToProject(it.path, FileUtil.getRelativePath(baseDir, it)!!) } kotlinFiles.forEach { myFixture.copyFileToProject(it.path, FileUtil.getRelativePath(baseDir, it)!!) } - val outputDir = myFixture.tempDirFixture.findOrCreateDir("out") - - MockLibraryUtil.compileKotlin(baseDir.path, File(outputDir.path)) + val outputDir = createTempDir(dirName) if (javaFiles.isNotEmpty()) { val options = Arrays.asList("-d", outputDir.path) KotlinTestUtils.compileJavaFiles(javaFiles, options) } - PsiTestUtil.setCompilerOutputPath(myModule, outputDir.url, false) + MockLibraryUtil.compileKotlin(baseDir.path, outputDir) + + PsiTestUtil.setCompilerOutputPath(myModule, outputDir.path, false) val mainFileName = "$dirName/${getTestName(true)}.kts" doCompilingTest(mainFileName)