From 4eb446631473094ac4962b46f475b9ecf9292c84 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 14 Sep 2017 11:32:07 +0200 Subject: [PATCH] Fix home dir definition in some compiler tests --- .../javac/AbstractDiagnosticsUsingJavacTest.kt | 10 +--------- .../AbstractDiagnosticsTestWithStdLibUsingJavac.kt | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt b/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt index a33c16df4d0..bd0ee9944c2 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt +++ b/compiler/tests-common/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsUsingJavacTest.kt @@ -16,12 +16,10 @@ package org.jetbrains.kotlin.checkers.javac -import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTest import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory import java.io.File abstract class AbstractDiagnosticsUsingJavacTest : AbstractDiagnosticsTest() { @@ -46,10 +44,4 @@ abstract class AbstractDiagnosticsUsingJavacTest : AbstractDiagnosticsTest() { environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true) super.analyzeAndCheck(testDataFile, files) } - - private fun getHomeDirectory(): String { - val resourceRoot = PathUtil.getResourcePathForClass(KotlinTestUtils::class.java) - return FileUtil.toSystemIndependentName(resourceRoot.parentFile.parentFile.parent) - } - } \ No newline at end of file diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt b/compiler/tests/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt index 898cd70c4fe..e979d2b2ba7 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/javac/AbstractDiagnosticsTestWithStdLibUsingJavac.kt @@ -16,12 +16,10 @@ package org.jetbrains.kotlin.checkers.javac -import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.checkers.AbstractDiagnosticsTestWithStdLib import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.test.InTextDirectivesUtils -import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.test.KotlinTestUtils.getHomeDirectory import java.io.File abstract class AbstractDiagnosticsTestWithStdLibUsingJavac : AbstractDiagnosticsTestWithStdLib() { @@ -46,10 +44,4 @@ abstract class AbstractDiagnosticsTestWithStdLibUsingJavac : AbstractDiagnostics environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true) super.analyzeAndCheck(testDataFile, files) } - - private fun getHomeDirectory(): String { - val resourceRoot = PathUtil.getResourcePathForClass(KotlinTestUtils::class.java) - return FileUtil.toSystemIndependentName(resourceRoot.parentFile.parentFile.parent) - } - } \ No newline at end of file