From 84872e064fa2ea868debc2eb1e6d693c26974b45 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 15 Jul 2019 16:38:44 +0300 Subject: [PATCH] New J2K: use test data for nj2k conversion tests from nj2k tests data instead of old one --- .../copy/AbstractJavaToKotlinCopyPasteConversionTest.kt | 2 +- .../copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt | 2 +- .../nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt | 3 +++ .../nj2k/AbstractTextJavaToKotlinCopyPasteConversionTest.kt | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt index 04231874add..afc7482c119 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractJavaToKotlinCopyPasteConversionTest.kt @@ -17,7 +17,7 @@ import java.io.File import kotlin.test.assertEquals abstract class AbstractJavaToKotlinCopyPasteConversionTest : AbstractJ2kCopyPasteTest() { - private val BASE_PATH = PluginTestCaseBase.getTestDataPathBase() + "/copyPaste/conversion" + protected open val BASE_PATH = PluginTestCaseBase.getTestDataPathBase() + "/copyPaste/conversion" private var oldEditorOptions: KotlinEditorOptions? = null diff --git a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt index e3381e62b15..c5f09524e31 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/conversion/copy/AbstractTextJavaToKotlinCopyPasteConversionTest.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File abstract class AbstractTextJavaToKotlinCopyPasteConversionTest : AbstractJ2kCopyPasteTest() { - private val BASE_PATH = PluginTestCaseBase.getTestDataPathBase() + "/copyPaste/plainTextConversion" + protected open val BASE_PATH = PluginTestCaseBase.getTestDataPathBase() + "/copyPaste/plainTextConversion" private var oldEditorOptions: KotlinEditorOptions? = null diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt index b77316883b3..bce74a76ab9 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractNewJavaToKotlinCopyPasteConversionTest.kt @@ -6,7 +6,10 @@ package org.jetbrains.kotlin.nj2k import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest +import org.jetbrains.kotlin.test.KotlinTestUtils abstract class AbstractNewJavaToKotlinCopyPasteConversionTest : AbstractJavaToKotlinCopyPasteConversionTest() { + override val BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/nj2k/testData/copyPaste" + override fun isNewJ2K(): Boolean = true } \ No newline at end of file diff --git a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractTextJavaToKotlinCopyPasteConversionTest.kt b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractTextJavaToKotlinCopyPasteConversionTest.kt index 273b01f977e..6beef7a4929 100644 --- a/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractTextJavaToKotlinCopyPasteConversionTest.kt +++ b/nj2k/tests/org/jetbrains/kotlin/nj2k/AbstractTextJavaToKotlinCopyPasteConversionTest.kt @@ -6,7 +6,10 @@ package org.jetbrains.kotlin.nj2k import org.jetbrains.kotlin.idea.conversion.copy.AbstractTextJavaToKotlinCopyPasteConversionTest +import org.jetbrains.kotlin.test.KotlinTestUtils abstract class AbstractTextNewJavaToKotlinCopyPasteConversionTest : AbstractTextJavaToKotlinCopyPasteConversionTest() { + override val BASE_PATH = KotlinTestUtils.getHomeDirectory() + "/nj2k/testData/copyPastePlainText" + override fun isNewJ2K(): Boolean = true } \ No newline at end of file